Skip to content

Commit

Permalink
Merge pull request #2405 from GluuFederation/gluu-core-bom_issues_38_…
Browse files Browse the repository at this point in the history 
…4.5.3

Gluu core bom issues 38 4.5.3
  • Loading branch information
@yurem
yurem authored Dec 6, 2023
2 parents f60c381 + c95c854 commit d8f2150
Show file tree
Hide file tree
Showing 12 changed files with 202 additions and 40 deletions.
8 changes: 4 additions & 4 deletions server/src/main/webapp/WEB-INF/incl/authentication/customAuthenticationForm.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
iconAwesome="fa-suitcase" collapsible="false">
<div class="nav-tabs-custom" style="margin-bottom: 0px;">
<ul class="nav nav-tabs" id="customAuthenticationFormtab">
<li class="active"><a href="#manage-ldap" data-toggle="tab">#{msgs['manageAuthentication.manageLDAPAuthentication']}</a></li>
<li><a href="#authentication-recaptcha" data-toggle="tab">#{msgs['manageAuthentication.manageAuthenticationRecaptcha']}</a></li>
<li><a href="#authentication-method" data-toggle="tab">#{msgs['manageAuthentication.defaultAuthentication']}</a></li>
<li><a href="#cas" data-toggle="tab">#{msgs['manageAuthentication.casProtocol']}</a></li>
<li><a href="#manage-ldap" data-bs-toggle="tab" class="active">#{msgs['manageAuthentication.manageLDAPAuthentication']}</a></li>
<li><a href="#authentication-recaptcha" data-bs-toggle="tab">#{msgs['manageAuthentication.manageAuthenticationRecaptcha']}</a></li>
<li><a href="#authentication-method" data-bs-toggle="tab">#{msgs['manageAuthentication.defaultAuthentication']}</a></li>
<li><a href="#cas" data-bs-toggle="tab">#{msgs['manageAuthentication.casProtocol']}</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="manage-ldap">
Expand Down
20 changes: 10 additions & 10 deletions server/src/main/webapp/WEB-INF/incl/client/clientForm.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,24 +95,24 @@
<div class="nav-tabs-custom"
style="margin-bottom: 0px; overflow: auto;">
<ul class="nav nav-tabs" id="oidctab">
<li class="active"><a href="#standardSettings"
class="StandardTab" data-toggle="tab">#{msgs['clientForm.tab.standard']}</a></li>
<li><a href="#standardSettings"
class="StandardTab" data-bs-toggle="tab" class="active">#{msgs['clientForm.tab.standard']}</a></li>
<li><a href="#token" class="Token"
data-toggle="tab">#{msgs['clientForm.tab.token']}</a></li>
data-bs-toggle="tab">#{msgs['clientForm.tab.token']}</a></li>
<li><a href="#logout" class="Logout"
data-toggle="tab">Logout</a></li>
data-bs-toggle="tab">Logout</a></li>
<li><a href="#softwareinfo" class="softwareinfo"
data-toggle="tab">Software Info</a></li>
data-bs-toggle="tab">Software Info</a></li>
<li><a href="#ciba" class="ciba"
data-toggle="tab">CIBA / UMA</a></li>
data-bs-toggle="tab">CIBA / UMA</a></li>
<li><a href="#encryptionsigningSettings"
class="EncryptionTab" data-toggle="tab">#{msgs['clientForm.tab.encryption']}</a></li>
class="EncryptionTab" data-bs-toggle="tab">#{msgs['clientForm.tab.encryption']}</a></li>
<!-- <li><a href="#clientAttributes" class="ClientAttributesTab"
data-toggle="tab">Client Attributes</a></li>-->
data-bs-toggle="tab">Client Attributes</a></li>-->
<li><a href="#advancedSettings" class="AdvancedTab"
data-toggle="tab">#{msgs['clientForm.tab.advanced']}</a></li>
data-bs-toggle="tab">#{msgs['clientForm.tab.advanced']}</a></li>
<li><a href="#customScripts" class="CustomScriptsTab"
data-toggle="tab">#{msgs['clientForm.tab.customscripts']}</a></li>
data-bs-toggle="tab">#{msgs['clientForm.tab.customscripts']}</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active box box-primary"
Expand Down
154 changes: 154 additions & 0 deletions server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,155 @@ select {
min-height: 550px;
}

.row {
display: -ms-flexbox;
display: block !important;
-ms-flex-wrap: wrap;
flex-wrap: wrap;
margin-right: -15px;
margin-left: -15px;
}

.nav-tabs-custom>.nav-tabs>li>a.active {
border-top-color: #3c8dbc !important;
}

.nav-tabs-custom>.nav-tabs>li>a {
border-top: 3px solid transparent;
margin-bottom: -2px;
margin-right: 5px;
}
.navbar {
position: relative;
display: -ms-flexbox;
display: block !important;
padding: 0.5rem 1rem;
}
.nav-tabs-custom>.nav-tabs>li>a, .nav-tabs-custom>.nav-tabs>li>a:hover {
background: transparent;
margin: inherit !important;
}
a {
text-decoration: none !important;
}
.collapse.in {
display: block !important;
}
.collapse {
display: none !important;
}
.navbar-nav {
--bs-nav-link-padding-x: 0;
--bs-nav-link-padding-y: 0.5rem;
--bs-nav-link-font-weight: ;
--bs-nav-link-color: var(--bs-navbar-color);
--bs-nav-link-hover-color: var(--bs-navbar-hover-color);
--bs-nav-link-disabled-color: var(--bs-navbar-disabled-color);
display: flex;
flex-direction: unset !important;
padding-left: 0;
margin-bottom: 0;
list-style: none;
}

.table {
--bs-table-color-type: initial;
--bs-table-bg-type: initial;
--bs-table-color-state: initial;
--bs-table-bg-state: initial;
--bs-table-color: unset !important;
--bs-table-bg: unset !important;
--bs-table-border-color: var(--bs-border-color);
--bs-table-accent-bg: transparent;
--bs-table-striped-color: var(--bs-emphasis-color);
--bs-table-striped-bg: rgba(var(--bs-emphasis-color-rgb), 0.05);
--bs-table-active-color: var(--bs-emphasis-color);
--bs-table-active-bg: rgba(var(--bs-emphasis-color-rgb), 0.1);
--bs-table-hover-color: var(--bs-emphasis-color);
--bs-table-hover-bg: rgba(var(--bs-emphasis-color-rgb), 0.075);
width: 100%;
margin-bottom: 1rem;
vertical-align: top;
border-color: var(--bs-table-border-color);
}

.row {
--bs-gutter-x: 1.5rem;
--bs-gutter-y: 0;
display: flex;
flex-wrap: wrap;
margin-top: calc(-1 * var(--bs-gutter-y));
}
body {
font-family: 'Source Sans Pro','Helvetica Neue',Helvetica,Arial,sans-serif;
font-weight: 500;
overflow-x: hidden;
overflow-y: auto;
}
body {
margin: 0;
font-family: Arial, Verdana, sans-serif;
font-size: 14px !important;
font-weight: var(--bs-body-font-weight);
line-height: var(--bs-body-line-height);
color: var(--bs-body-color);
text-align: var(--bs-body-text-align);
background-color: var(--bs-body-bg);
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: transparent;
}

.card {
--bs-card-spacer-y: 1rem;
--bs-card-spacer-x: 1rem;
--bs-card-title-spacer-y: 0.5rem;
--bs-card-title-color: ;
--bs-card-subtitle-color: ;
--bs-card-border-width: none !important;
--bs-card-border-color: var(--bs-border-color-translucent);
--bs-card-border-radius: var(--bs-border-radius);
--bs-card-box-shadow: ;
--bs-card-inner-border-radius: calc(var(--bs-border-radius) - (var(--bs-border-width)));
--bs-card-cap-padding-y: 0.5rem;
--bs-card-cap-padding-x: 1rem;
--bs-card-cap-bg: rgba(var(--bs-body-color-rgb), 0.03);
--bs-card-cap-color: ;
--bs-card-height: ;
--bs-card-color: ;
--bs-card-bg: var(--bs-body-bg);
--bs-card-img-overlay-padding: 1rem;
--bs-card-group-margin: 0.75rem;
position: relative;
display: flex;
flex-direction: column;
min-width: 0;
height: var(--bs-card-height);
color: var(--bs-body-color);
word-wrap: break-word;
background-color: var(--bs-card-bg);
background-clip: border-box;
border: var(--bs-card-border-width) solid var(--bs-card-border-color);
border-radius: var(--bs-card-border-radius);
}

.card-header {
background: #fff;
border-top-left-radius: 4px !important;
border-top-right-radius: 4px !important;
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
border: 1px solid #ccc;
padding: 15px 12px !important;
}
.row>* {
flex-shrink: 0;
width: 100%;
max-width: 100%;
padding-right: unset !important;
padding-left: unset !important;
margin-top: var(--bs-gutter-y);
}

</style>
</h:head>
<h:body styleClass="skin-green">
Expand Down Expand Up @@ -250,6 +399,10 @@ select {
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/js/bootstrap.min.js"
type="text/javascript"></script>

<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/bootstrap/js/bootstrap.bundle.min.js"
type="text/javascript"></script>
<script
src="#{oxTrustConfigurationService.cssLocation}/../theme/dist/js/app.min.js"
type="text/javascript"></script>
Expand All @@ -269,6 +422,7 @@ select {
$.blockUI.defaults.message = $('div.gluuBusyIndicator')
$.blockUI.defaults.fadeIn = 0
$.blockUI.defaults.fadeOut = 0

</script>
<div class="footer"></div>
</h:body>
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/webapp/WEB-INF/incl/layout/topmenu.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</li>
<!-- User Account: style can be found in dropdown.less -->
<li class="dropdown user user-menu"><a href="#"
class="dropdown-toggle" data-toggle="dropdown"><span
class="dropdown-toggle" data-bs-toggle="dropdown"><span
class="hidden-xs"><i class="fa fa-user"></i> <h:outputText
style="font-size: 18px; color: whitesmoke;"
value=" #{gluufn:getPersonDisplayName(identity.user)}" /></span>
Expand Down
10 changes: 5 additions & 5 deletions server/src/main/webapp/WEB-INF/incl/organization/cacheRefreshForm.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@
<div class="nav-tabs-custom"
style="margin-bottom: 0px; overflow: auto;">
<ul class="nav nav-tabs" id="cacheRefreshFormtab">
<li class="active"><a href="#cache-refresh"
data-toggle="tab">#{msgs['organization.cacheRefresh']}</a></li>
<li><a href="#key-attributes" data-toggle="tab">#{msgs['organization.customerBackend']}</a></li>
<li><a href="#ldap-servers" data-toggle="tab">#{msgs['organization.sourceBackend']}</a></li>
<li><a href="#Inum" data-toggle="tab">#{msgs['organization.inumLDAPServer']}</a></li>
<li><a href="#cache-refresh"
data-bs-toggle="tab">#{msgs['organization.cacheRefresh']}</a></li>
<li><a href="#key-attributes" data-bs-toggle="tab" class="active">#{msgs['organization.customerBackend']}</a></li>
<li><a href="#ldap-servers" data-bs-toggle="tab">#{msgs['organization.sourceBackend']}</a></li>
<li><a href="#Inum" data-bs-toggle="tab">#{msgs['organization.inumLDAPServer']}</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="cache-refresh">
Expand Down
8 changes: 4 additions & 4 deletions server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@
iconAwesome="fa-university" collapsible="false">
<div class="nav-tabs-custom" style="margin-bottom: 0px;">
<ul class="nav nav-tabs" id="organizationFormtab">
<li class="active"><a href="#sys-config" data-toggle="tab">#{msgs['organizationForm.systemConfiguration']}</a></li>
<li><a href="#smtp-server" data-toggle="tab">#{msgs['organizationForm.smtpServerConfiguration']}</a></li>
<li><a href="#ox-trust" data-toggle="tab">Organization
<li><a href="#sys-config" data-bs-toggle="tab" class="active">#{msgs['organizationForm.systemConfiguration']}</a></li>
<li><a href="#smtp-server" data-bs-toggle="tab">#{msgs['organizationForm.smtpServerConfiguration']}</a></li>
<li><a href="#ox-trust" data-bs-toggle="tab">Organization
Settings</a></li>
<li><a href="#libs" data-toggle="tab">Extra libraries</a></li>
<li><a href="#libs" data-bs-toggle="tab">Extra libraries</a></li>
</ul>
<div class="tab-content">
<div class="tab-pane active" id="sys-config">
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/webapp/WEB-INF/incl/radius/serverConfigForm.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
<div class="nav-tabs-custom"
style="margin-bottom: 0px; overflow: auto;">
<ul class="nav nav-tabs">
<li class="active"><a href="#basic-settings"
data-toggle="tab">#{msgs['radius.config.tab.basic']}</a></li>
<li><a href="#openid-settings" data-toggle="tab">#{msgs['radius.config.tab.openid']}</a>
<li><a href="#basic-settings"
data-bs-toggle="tab" class="active">#{msgs['radius.config.tab.basic']}</a></li>
<li><a href="#openid-settings" data-bs-toggle="tab">#{msgs['radius.config.tab.openid']}</a>
</li>
</ul>
<div class="tab-content">
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/webapp/attribute/attributeExport.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
<div class="nav-tabs-custom" style="margin-bottom: 0px;">
<ul class="nav nav-tabs">

<li class="active">
<a data-toggle="tab" href="#attribuiteInventory">#{msgs['attribute.export']} </a>
<li>
<a data-bs-toggle="tab" href="#attribuiteInventory" class="active">#{msgs['attribute.export']} </a>
</li>
</ul>
<div class="tab-content">
Expand Down
14 changes: 7 additions & 7 deletions server/src/main/webapp/configuration/updateConfiguration.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,18 @@
<div class="nav-tabs-custom" style="margin-bottom: 0px;">
<ul class="nav nav-tabs" id="jsonconfigurationformtab">

<li class="active"><a data-toggle="tab"
href="#oxtrust-config">#{msgs['updateConfiguration.oxTrustConfiguration']}</a>
<li><a data-bs-toggle="tab"
href="#oxtrust-config" class="active">#{msgs['updateConfiguration.oxTrustConfiguration']}</a>
</li>
<li><a data-toggle="tab" href="#oxauth-config">#{msgs['updateConfiguration.oxAuthConfiguration']}</a>
<li><a data-bs-toggle="tab" href="#oxauth-config">#{msgs['updateConfiguration.oxAuthConfiguration']}</a>
</li>
<li><a data-toggle="tab" href="#fido2-config">#{msgs['updateConfiguration.fido2Configuration']}</a>
<li><a data-bs-toggle="tab" href="#fido2-config">#{msgs['updateConfiguration.fido2Configuration']}</a>
</li>
<li><a data-toggle="tab" href="#cached-config">#{msgs['updateConfiguration.memcachedConfiguration']}</a>
<li><a data-bs-toggle="tab" href="#cached-config">#{msgs['updateConfiguration.memcachedConfiguration']}</a>
</li>
<li><a data-toggle="tab" href="#store-config">#{msgs['updateConfiguration.storeConfiguration']}</a>
<li><a data-bs-toggle="tab" href="#store-config">#{msgs['updateConfiguration.storeConfiguration']}</a>
</li>
<li><a data-toggle="tab"
<li><a data-bs-toggle="tab"
href="#oxtrust-import-person-config">#{msgs['updateConfiguration.oxTrustImportConfiguration']}</a>
</li>

Expand Down
8 changes: 4 additions & 4 deletions server/src/main/webapp/logviewer/viewLogFile.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@
<div class="col-xs-12">
<div class="nav-tabs-custom" style="margin-bottom: 0px;">
<ul class="nav nav-tabs" id="logViewFormtab">
<li class="active"><a data-toggle="tab"
href="#logged-files">#{msgs['logViewer.allowedLogFiles']}</a>
<li><a data-bs-toggle="tab"
href="#logged-files" class="active">#{msgs['logViewer.allowedLogFiles']}</a>
</li>
<li><a data-toggle="tab" href="#config">#{msgs['logViewer.configuration']}</a>
<li><a data-bs-toggle="tab" href="#config">#{msgs['logViewer.configuration']}</a>
</li>
<li><a data-toggle="tab" href="#tail">#{msgs['logViewer.tailOfLogFile']}</a>
<li><a data-bs-toggle="tab" href="#tail">#{msgs['logViewer.tailOfLogFile']}</a>
</li>
</ul>
<div class="tab-content">
Expand Down
7 changes: 7 additions & 0 deletions static/src/main/resources/META-INF/resources/theme/bootstrap/js/bootstrap.bundle.min.js
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions static/src/main/resources/META-INF/resources/theme/bootstrap/js/bootstrap.bundle.min.js.map
View file

Large diffs are not rendered by default.

0 comments on commit d8f2150

Please sign in to comment.