Merge remote-tracking branch 'origin/master'

Evolveum · May 2, 2022 · dc3a115 · dc3a115
2 parents 845b6c3 + 4b535e0
commit dc3a115
Show file tree

Hide file tree

Showing 14 changed files with 821 additions and 692 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/midpoint-theme.scss b/gui/admin-gui/src/frontend/scss/midpoint-theme.scss
@@ -72,6 +72,10 @@ body.custom-hold-transition {
   bottom: 55px !important;
 }
 
+#wicketDebugBar img {
+  vertical-align: unset;
+}
+
 div.wicket-debug-buttons {
   border: 1px solid #000000;
   background-color: #ffffff;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageAdminLTE.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<!--
+  ~ Copyright (c) 2010-2022 Evolveum
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+
+<html xmlns:wicket="http://wicket.apache.org" lang="en" class="no-js">
+<head>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <wicket:header-items/>
+    <title>
+        <span wicket:id="title"/>
+    </title>
+    <link rel="shortcut icon" type="image/x-icon" href="favicon.ico"/>
+
+    <link href="css/fonts.css" type="text/css" rel="stylesheet"/>
+    <link href="css/font-evosome.css" type="text/css" rel="stylesheet"/>
+
+    <link type="text/css" rel="stylesheet" href="static/vendors-theme.css"/>
+    <link type="text/css" rel="stylesheet" href="static/midpoint-theme.css"/>
+
+    <wicket:link>
+        <script src="../../../../../../webjars/password-score/689ddae/dist/js/password-score.js" type="text/javascript" ></script>
+        <script src="../../../../../../webjars/password-score/689ddae/dist/js/password-score-options.js" type="text/javascript" ></script>
+    </wicket:link>
+
+</head>
+
+<body wicket:id="body" class="sidebar-mini control-sidebar-slide-open sidebar-mini-md sidebar-mini-xs" style="height: auto;">
+
+    <wicket:child/>
+
+    <div class="wicket-debug-buttons" wicket:id="debugBar">
+        <a wicket:id="dumpPageTree">Dump page tree to console</a>
+    </div>
+    <div wicket:id="debugPanel" style="z-index: 10000;"/>
+
+    <script type="text/javascript" src="static/vendors.bundle.js"></script>
+    <script type="text/javascript" src="static/midpoint.bundle.js"></script>
+</body>
+</html>