adminlte upgrade to 2.4.18

Evolveum · May 7, 2020 · 75f2df5 · 75f2df5
1 parent a1f5e31
commit 75f2df5
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -106,8 +106,8 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.webjars.bower</groupId>
-            <artifactId>adminlte</artifactId>
+            <groupId>org.webjars</groupId>
+            <artifactId>AdminLTE</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.html
@@ -20,10 +20,10 @@
     <link href="css/font-evosome.css" type="text/css" rel="stylesheet"/>
 
     <wicket:link>
-        <link href="../../../../../../webjars/adminlte/2.3.11/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+<!--        <link href="../../../../../../webjars/adminlte/2.4.18/dist/css/alt/AdminLTE-without-plugins.css" rel="stylesheet" type="text/css" />-->
         <link href="../../../../../../webjars/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
         <link href="../../../../../../webjars/ionicons/3.0.0/dist/css/ionicons.min.css" rel="stylesheet" type="text/css" />
-        <link href="../../../../../../webjars/adminlte/2.3.11/plugins/datatables/dataTables.bootstrap.css" rel="stylesheet" type="text/css" />
+<!--        <link href="../../../../../../webjars/adminlte/2.3.11/plugins/datatables/dataTables.bootstrap.css" rel="stylesheet" type="text/css" />-->
     </wicket:link>
 
     <link href="wro/admin-lte.css" type="text/css" rel="stylesheet"/>
@@ -64,7 +64,7 @@
             <!-- Header Navbar: style can be found in header.less -->
             <nav wicket:id="navigation" role="navigation" class="navbar navbar-static-top">
                 <!-- Sidebar toggle button-->
-                <a wicket:id="menuToggle" role="button" data-toggle="offcanvas" class="sidebar-toggle" href="#">
+                <a wicket:id="menuToggle" role="button" data-toggle="push-menu" class="sidebar-toggle" href="#">
                     <span class="sr-only"><wicket:message key="PageTemplate.toggleNavigation"/></span>
                 </a>
 
@@ -145,10 +145,11 @@
     </div>
 
     <wicket:link>
-        <script src="../../../../../../webjars/adminlte/2.3.11/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-        <script src="../../../../../../webjars/adminlte/2.3.11/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
-        <script src='../../../../../../webjars/adminlte/2.3.11/plugins/fastclick/fastclick.js'></script>
-        <script src="../../../../../../webjars/adminlte/2.3.11/dist/js/app.min.js" type="text/javascript"></script>
+<!--        <script src="../../../../../../webjars/adminlte/2.3.11/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>-->
+<!--        <script src="../../../../../../webjars/adminlte/2.3.11/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>-->
+<!--        <script src='../../../../../../webjars/adminlte/2.3.11/plugins/fastclick/fastclick.js'></script>-->
+        <script src="../../../../../../webjars/AdminLTE/2.4.18/dist/js/adminlte.min.js" type="text/javascript"></script>
+        <script src="../../../../../../webjars/AdminLTE/2.4.18/dist/js/adminlte.min.js" type="text/javascript"></script>
     </wicket:link>
 
     <script type="text/javascript" src="js/bootstrap-select/bootstrap-select.js"></script>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
@@ -775,7 +775,7 @@ public void renderHead(IHeaderResponse response) {
             skinCssString = info.getSkin();
         }
 
-        String skinCssPath = String.format("../../../../../../webjars/adminlte/2.3.11/dist/css/skins/%s.min.css", skinCssString);
+        String skinCssPath = String.format("../../../../../../webjars/AdminLTE/2.4.18/dist/css/skins/%s.min.css", skinCssString);
         response.render(CssHeaderItem.forReference(
                 new CssResourceReference(
                         PageBase.class, skinCssPath)

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.html
@@ -8,7 +8,7 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
     <!-- sidebar menu: : style can be found in sidebar.less -->
-    <ul class="sidebar-menu" wicket:id="sidebar">
+    <ul class="sidebar-menu" data-widget="tree" wicket:id="sidebar">
         <wicket:container wicket:id="menuItems">
             <li class="header">
                 <span wicket:id="name"></span>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageDialog.html
@@ -13,10 +13,10 @@
     <link href="css/fonts.css" type="text/css" rel="stylesheet"/>
 
     <wicket:link>
-        <link href="../../../../../webjars/adminlte/2.3.11/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
+<!--        <link href="../../../../../webjars/adminlte/2.3.11/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />-->
         <link href="../../../../../webjars/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
         <link href="../../../../../webjars/ionicons/3.0.0/dist/css/ionicons.min.css" rel="stylesheet" type="text/css" />
-        <link href="../../../../../webjars/adminlte/2.3.11/plugins/datatables/dataTables.bootstrap.css" rel="stylesheet" type="text/css" />
+<!--        <link href="../../../../../webjars/adminlte/2.3.11/plugins/datatables/dataTables.bootstrap.css" rel="stylesheet" type="text/css" />-->
     </wicket:link>
 
     <link href="wro/admin-lte.css" type="text/css" rel="stylesheet"/>
@@ -45,10 +45,10 @@
     <wicket:child/>
 
     <wicket:link>
-        <script src="../../../../../webjars/adminlte/2.3.11/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
-        <script src="../../../../../webjars/adminlte/2.3.11/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>
-        <script src='../../../../../webjars/adminlte/2.3.11/plugins/fastclick/fastclick.js'></script>
-        <script src="../../../../../webjars/adminlte/2.3.11/dist/js/app.min.js" type="text/javascript"></script>
+<!--        <script src="../../../../../webjars/adminlte/2.3.11/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>-->
+<!--        <script src="../../../../../webjars/adminlte/2.3.11/plugins/slimScroll/jquery.slimscroll.min.js" type="text/javascript"></script>-->
+<!--        <script src='../../../../../webjars/adminlte/2.3.11/plugins/fastclick/fastclick.js'></script>-->
+        <script src="../../../../../../webjars/AdminLTE/2.4.18/dist/js/adminlte.min.js" type="text/javascript"></script>
     </wicket:link>
 
     <script type="text/javascript" src="js/bootstrap-select/bootstrap-select.js"></script>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
@@ -276,7 +276,7 @@ public void init() {
 
         getJavaScriptLibrarySettings().setJQueryReference(
                 new PackageResourceReference(MidPointApplication.class,
-                        "../../../../../webjars/adminlte/2.3.11/plugins/jQuery/jquery-2.2.3.min.js"));
+                        "../../../../../webjars/AdminLTE/2.4.18/plugins/jQueryUI/jquery-ui.js")); //todo no jquery.js is found
 
         getComponentInstantiationListeners().add(new SpringComponentInjector(this, applicationContext, true));
 

diff --git a/pom.xml b/pom.xml
@@ -1370,9 +1370,9 @@
 
             <!-- webjars -->
             <dependency>
-                <groupId>org.webjars.bower</groupId>
-                <artifactId>adminlte</artifactId>
-                <version>2.3.11</version>
+                <groupId>org.webjars</groupId>
+                <artifactId>AdminLTE</artifactId>
+                <version>2.4.18</version>
             </dependency>
             <dependency>
                 <groupId>org.webjars</groupId>