feat(gluu-core-bom): update jquery and bootstrap for oxtrust

gluu-core-bom/issues/38
GluuFederation · Nov 27, 2023 · f33d32b · f33d32b
1 parent 02914ab
commit f33d32b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 9 deletions.
diff --git a/server/src/main/resources/META-INF/resources/bootstrap.min.js b/server/src/main/resources/META-INF/resources/bootstrap.min.js
diff --git a/server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml b/server/src/main/webapp/WEB-INF/incl/layout/newtemplate.xhtml
@@ -226,6 +226,26 @@ select {
     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;
+}
+
         </style>
     </h:head>
     <h:body styleClass="skin-green">

diff --git a/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml b/server/src/main/webapp/WEB-INF/incl/organization/organizationForm.xhtml
@@ -93,7 +93,7 @@
 				iconAwesome="fa-university" collapsible="false">
 				<div class="nav-tabs-custom" style="margin-bottom: 0px;">
 					<ul class="nav nav-tabs" id="organizationFormtab">
-						<li><a class="active show" href="#sys-config" data-toggle="tab">#{msgs['organizationForm.systemConfiguration']}</a></li>
+						<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
 								Settings</a></li>

diff --git a/server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml b/server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml
@@ -76,14 +76,13 @@
 										styleClass="allScriptFor#{_scriptType.displayName}"
 										columns="1" value="#{_customScripts}" var="_customScript"
 										style="width: 100%;">
-										<div id="accordion">
 									<h:panelGroup rendered="#{_action.isShowCurrentScript(_customScript)}">
 										<h:panelGroup layout="block"
 											styleClass="#{(_customScript.enabled) ?  'card-header active' : 'card-header'}"
 											style="#{(_customScript.enabled and _action.hasCustomScriptError(_customScript)) ?  'background: red' : ''}"
 											id="headingOne">
 											<h5 class="mb-0">
-												<a class="accordion-toggle in" data-bs-toggle="collapse"
+												<a class="accordion-toggle in" data-toggle="collapse"
 													href="#collapseOne#{gluufn:hashCode(_customScript.name)}"
 													aria-expanded="true" aria-controls="collapseOne#{gluufn:hashCode(_customScript.name)}">
 													#{(_customScript.name == null) ?
@@ -95,7 +94,6 @@
 										<div id="collapseOne#{gluufn:hashCode(_customScript.name)}"
 											class="#{_customScript.dn != null ? 'collapse' : 'collapse in'}"
 											role="tabpanel" aria-labelledby="headingOne"
-											data-parent="#accordion"
 											expanded="#{_customScript.dn == null}">
 											<h:panelGroup layout="block" class="card-body">
 												<a4j:commandLink value="Delete Script" immediate="true"
@@ -283,7 +281,6 @@
 											</h:panelGroup>
 										</div>
 									 </h:panelGroup>
-										</div>
 									</rich:dataGrid>
 									<h:panelGroup layout="block" styleClass="addConfig">
 										<a4j:commandLink styleClass="btn btn-primary addConfigButton"