Merge pull request #2404 from GluuFederation/revert-2403-gluu-core-bo…

…m_issues_38_4.5.3 Revert "Merge pull request #2402 from GluuFederation/gluu-core-bom_issues_38"
GluuFederation · Nov 29, 2023 · e47424d · e47424d
2 parents 55d5d4b + 6af14b4
commit e47424d
Show file tree

Hide file tree

Showing 11 changed files with 8,138 additions and 15,325 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,35 +217,6 @@ 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;
-}
-
         </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,16 +32,6 @@
 		.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>
@@ -85,7 +75,7 @@
           if (event.which == '13') {
           event.preventDefault();
          }
-     });
+     });   
     </h:outputScript>
 	<h:form id="organizationForm" autocomplete="off">
 		<div class="row" style="margin: 1px;">

diff --git a/server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml b/server/src/main/webapp/WEB-INF/incl/script/customScriptListForm.xhtml
@@ -84,7 +84,7 @@
 											<h5 class="mb-0">
 												<a class="accordion-toggle in" data-toggle="collapse"
 													href="#collapseOne#{gluufn:hashCode(_customScript.name)}"
-													aria-expanded="true" aria-controls="collapseOne#{gluufn:hashCode(_customScript.name)}">
+													aria-expanded="true" aria-controls="collapseOne">
 													#{(_customScript.name == null) ?
 													msgs['customScript.newscript'] : _customScript.name } </a>
 											</h5>
@@ -94,6 +94,7 @@
 										<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"

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: 1260px; height: 385px;" width="703" />
+												style="width: 703px; height: 185px;" width="703" />
 										</div>
 									</div>
 								</div>