MID-6271 login page fixed styles

Evolveum · May 9, 2022 · 0aac870 · 0aac870
1 parent 8cd1c86
commit 0aac870
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 29 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/AbstractPageLogin.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/AbstractPageLogin.html
@@ -10,6 +10,22 @@
         "http://www.w3.org/TR/html4/loose.dtd">
 <html xmlns:wicket="http://wicket.apache.org">
 <body>
+<wicket:head>
+    <script type="text/javascript">
+        $(".focus-username").focus();
+    </script>
+    <wicket:remove>This css is used to hide sidebar menu</wicket:remove>
+    <style type="text/css">
+        .content-wrapper, .right-side, .main-footer, .main-header {
+            margin-left: 0px !important;
+
+            -moz-transition: none !important;;
+            -webkit-transition: none !important;;
+            -o-transition: color 0 ease-in !important;;
+            transition: none !important;;
+        }
+    </style>
+</wicket:head>
 <wicket:extend>
     <div class="row">
         <div class="col-md-offset-2 col-md-8 col-lg-offset-4 col-lg-4">
@@ -24,22 +40,6 @@
             </div>
         </div>
     </div>
-
-    <script type="text/javascript">
-        $(".focus-username").focus();
-    </script>
-
-    <wicket:remove>This css is used to hide sidebar menu</wicket:remove>
-    <style type="text/css">
-        .content-wrapper, .right-side, .main-footer {
-            margin-left: 0px;
-
-            -moz-transition: none;
-            -webkit-transition: none;
-            -o-transition: color 0 ease-in;
-            transition: none;
-        }
-    </style>
 </wicket:extend>
 </body>
 </html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/AbstractPageLogin.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/AbstractPageLogin.java
@@ -13,6 +13,8 @@
 import com.evolveum.midpoint.authentication.api.util.AuthUtil;
 import com.evolveum.midpoint.authentication.api.config.MidpointAuthentication;
 
+import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -51,12 +53,7 @@ protected void onInitialize() {
     private void initLayer() {
         String sequenceName = getSequenceName();
         Label sequence = new Label(ID_SEQUENCE, createStringResource("AbstractPageLogin.authenticationSequence", sequenceName));
-        sequence.add(new VisibleEnableBehaviour() {
-            @Override
-            public boolean isVisible() {
-                return !StringUtils.isEmpty(sequenceName);
-            }
-        });
+        sequence.add(new VisibleBehaviour(() -> !StringUtils.isEmpty(sequenceName)));
         add(sequence);
         AjaxButton toDefault = new AjaxButton(ID_SWITCH_TO_DEFAULT_SEQUENCE, createStringResource("AbstractPageLogin.switchToDefault")) {
 
@@ -66,12 +63,7 @@ public void onClick(AjaxRequestTarget target) {
                 setResponsePage(getMidpointApplication().getHomePage());
             }
         };
-        toDefault.add(new VisibleEnableBehaviour() {
-            @Override
-            public boolean isVisible() {
-                return !StringUtils.isEmpty(sequenceName);
-            }
-        });
+        toDefault.add(new VisibleBehaviour(() -> !StringUtils.isEmpty(sequenceName)));
         add(toDefault);
         initCustomLayer();
     }
@@ -101,7 +93,6 @@ protected void onConfigure() {
     }
 
     private void showExceptionMessage() {
-
         ServletWebRequest req = (ServletWebRequest) RequestCycle.get().getRequest();
         HttpServletRequest httpReq = req.getContainerRequest();
         HttpSession httpSession = httpReq.getSession();