Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Jan 28, 2022 · 0d75464 · 0d75464
2 parents 38636da + 8a59d78
commit 0d75464
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 20 deletions.
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
@@ -135,7 +135,7 @@
                 <div wicket:id="debugPanel" style="z-index: 10000;"/>
             </section>
         </div>
-        <footer wicket:id="footerContainer" class="main-footer">
+        <footer wicket:id="footerContainer" class="main-footer" style="height: 50px;">
             <div class="pull-right hidden-xs" wicket:id="version">
                 <b><wicket:message key="PageTemplate.version"/></b> <wicket:message key="midpoint.system.build"/>
             </div>

diff --git a/gui/admin-gui/src/main/resources/static/js/midpoint-theme.js b/gui/admin-gui/src/main/resources/static/js/midpoint-theme.js
@@ -15,11 +15,6 @@ $(window).on('load', function() {
         console.error("Ajax call failure:\n" + JSON.stringify(attrs.target.location)
             + "\nStatus:\n" + JSON.stringify(textStatus));
     });
-
-    fixContentHeight();
-    $(window, ".wrapper").resize(function () {
-        fixContentHeight();
-    });
 });
 
 // $(document).ready(function() {
@@ -30,20 +25,6 @@ $(window).on('load', function() {
 //     });
 // });
 
-// I'm not sure why sidebar has 15px padding -> and why I had to use 10px constant here [lazyman]
-function fixContentHeight() {
-    if ($(".main-footer").length > 0) {
-        return;
-    }
-
-    var window_height = $(window).height();
-    var sidebar_height = $(".sidebar").height() || 0;
-
-    if (window_height < sidebar_height) {
-        $(".content-wrapper, .right-side").css('min-height', sidebar_height + 10); // footer size
-    }
-}
-
 function clickFuncWicket6(eventData) {
     var clickedElement = (window.event) ? event.srcElement : eventData.target;
     if ((clickedElement.tagName.toUpperCase() == 'BUTTON'