Page base cleanup - cutting out the sidebar panel

Evolveum · Nov 24, 2020 · 8463683 · 8463683
1 parent b7b9af0
commit 8463683
Show file tree

Hide file tree

Showing 32 changed files with 1,179 additions and 1,319 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/BasePanel.java
@@ -6,6 +6,9 @@
  */
 package com.evolveum.midpoint.gui.api.component;
 
+import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.task.api.TaskManager;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;

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
@@ -24,6 +24,7 @@
         <link href="../../../../../../webjars/AdminLTE/2.4.18/bower_components/font-awesome/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
         <link href="../../../../../../webjars/AdminLTE/2.4.18/bower_components/Ionicons/css/ionicons.min.css" rel="stylesheet" type="text/css" />
         <link href="../../../../../../webjars/AdminLTE/2.4.18/bower_components/datatables.net-bs/css/dataTables.bootstrap.css" rel="stylesheet" type="text/css" />
+<!--        <link href="../../../../../../webjars/AdminLTE/2.4.18/dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" />-->
     </wicket:link>
 
     <link href="wro/admin-lte.css" type="text/css" rel="stylesheet"/>
@@ -49,7 +50,7 @@
     <link type="text/css" rel="stylesheet" href="wro/midpoint-theme.css"/>
 </head>
 
-<body wicket:id="body" class="">
+<body wicket:id="body">
     <div wicket:id="mainPopup"/>
     <div class="wrapper">
         <header wicket:id="mainHeader" class="main-header" style="max-height:550px;">
@@ -106,13 +107,15 @@
             </nav>
         </header>
         <wicket:enclosure child="sidebarMenu">
-            <aside class="main-sidebar">
-                <!-- sidebar: style can be found in sidebar.less -->
-                <section class="sidebar" style="height: auto;">
-                    <wicket:container wicket:id="sidebarMenu"/>
-                </section>
-                <!-- /.sidebar -->
-            </aside>
+<!--            <aside class="main-sidebar">-->
+<!--                &lt;!&ndash; sidebar: style can be found in sidebar.less &ndash;&gt;-->
+<!--                <section class="sidebar" style="height: auto;">-->
+<!--                    <wicket:container wicket:id="sidebarMenu"/>-->
+<!--                </section>-->
+<!--                &lt;!&ndash; /.sidebar &ndash;&gt;-->
+<!--            </aside>-->
+            <aside class="main-sidebar" wicket:id="sidebarMenu"/>
+
         </wicket:enclosure>
         <div class="content-wrapper" style="min-height: 916px; overflow: auto; overflow-x: hidden;">
             <!-- Main content -->

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
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -771,7 +771,6 @@ public static boolean isAuthorized(Collection<String> actions) {
         }
         Roles roles = new Roles(AuthorizationConstants.AUTZ_ALL_URL);
         roles.add(AuthorizationConstants.AUTZ_GUI_ALL_URL);
-        roles.add(AuthorizationConstants.AUTZ_GUI_ALL_DEPRECATED_URL);
         roles.addAll(actions);
         return ((AuthenticatedWebApplication) AuthenticatedWebApplication.get()).hasAnyRole(roles);
     }
@@ -4351,7 +4350,7 @@ public static void claimWorkItemActionPerformed(CaseWorkItemType workItemToClaim
 
         pageBase.showResult(mainResult);
 
-        pageBase.resetWorkItemCountModel();
+//        pageBase.resetWorkItemCountModel();
         target.add(pageBase);
 
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.html
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (c) 2020 Evolveum
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:wicket="http://wicket.apache.org">
+    <body>
+        <wicket:panel>
+            <wicket:enclosure child="menu">
+
+                    <!-- sidebar: style can be found in sidebar.less -->
+                    <section class="sidebar" style="height: auto;">
+                        <wicket:container wicket:id="menu"/>
+                    </section>
+                    <!-- /.sidebar -->
+<!--                </aside>-->
+            </wicket:enclosure>
+        </wicket:panel>
+    </body>
+</html>
+