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

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

Hide file tree

Showing 11 changed files with 15,317 additions and 8,147 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
@@ -217,6 +217,15 @@ select {
 	min-height: 550px;
 }
 
+.row {
+    display: -ms-flexbox;
+    display: block !important;
+    -ms-flex-wrap: wrap;
+    flex-wrap: wrap;
+    margin-right: -15px;
+    margin-left: -15px;
+}
+
         </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
@@ -32,6 +32,16 @@
 		.configurationSheet{
 			border: 1px solid #999;
 		}
+
+		.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;
+		}
     </h:outputStylesheet>
 
 	<h:outputStylesheet>
@@ -75,15 +85,15 @@
           if (event.which == '13') {
           event.preventDefault();
          }
-     });   
+     });
     </h:outputScript>
 	<h:form id="organizationForm" autocomplete="off">
 		<div class="row" style="margin: 1px;">
 			<b:panel title="Organization" look="primary"
 				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 class="active show" 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,15 +76,16 @@
 										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-toggle="collapse"
+												<a class="accordion-toggle in" data-bs-toggle="collapse"
 													href="#collapseOne#{gluufn:hashCode(_customScript.name)}"
-													aria-expanded="true" aria-controls="collapseOne">
+													aria-expanded="true" aria-controls="collapseOne#{gluufn:hashCode(_customScript.name)}">
 													#{(_customScript.name == null) ?
 													msgs['customScript.newscript'] : _customScript.name } </a>
 											</h5>
@@ -282,6 +283,7 @@
 											</h:panelGroup>
 										</div>
 									 </h:panelGroup>
+										</div>
 									</rich:dataGrid>
 									<h:panelGroup layout="block" styleClass="addConfig">
 										<a4j:commandLink styleClass="btn btn-primary addConfigButton"

diff --git a/server/src/main/webapp/home.xhtml b/server/src/main/webapp/home.xhtml
@@ -141,7 +141,7 @@
 										<div class="chart-responsive">
 											<!-- Authentication Requests Chart Canvas -->
 											<canvas height="185" id="authenticationRequestsChart"
-												style="width: 703px; height: 185px;" width="703" />
+												style="width: 1260px; height: 385px;" width="703" />
 										</div>
 									</div>
 								</div>