Dev: fixed footers

LimeSurvey · Dec 21, 2017 · 5dca49d · 5dca49d
1 parent 42793bc
commit 5dca49d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/application/views/admin/super/layout_insurvey.php b/application/views/admin/super/layout_insurvey.php
@@ -32,7 +32,7 @@
 
         echo '<div id="pjax-content" '
         . 'class="ls-flex-column align-items-flex-start align-content-center col-11 ls-flex-item transition-animate-width" '
-        . 'v-bind:style="\'max-width:\'+$store.getters.substractContainer" '
+        . 'v-bind:style="{\'max-width\': $store.getters.substractContainer, \'min-height\': $store.state.generalContainerHeight}"'
         . '>';
 
             //Rendered through /admin/survey/surveybar_view

diff --git a/assets/packages/adminpanel/src/main.js b/assets/packages/adminpanel/src/main.js
@@ -34,24 +34,11 @@ $(document).on('ready', function () {
             methods: {
                 controlWindowSize() {
                     const
-                        menuOffset = $('nav.navbar').outerHeight(),
-                        menuHeight = $('.menubar.surveymanagerbar').outerHeight(),
-                        footerHeight = $('footer').outerHeight(),
-                        windowHeight = screen.height,
-                        innerMenuHeight = $('#breadcrumb-container').outerHeight() + menuHeight,
-                        inSurveyViewHeight = (windowHeight - (menuOffset + (2 * footerHeight))),
-                        generalContainerHeight = inSurveyViewHeight - (innerMenuHeight);
-                    this.$log.log({
-                        menuOffset : menuOffset,
-                        menuHeight : menuHeight,
-                        footerHeight : footerHeight,
-                        windowHeight : windowHeight,
-                        windowHeightScreen : screen.availHeight,
-                        windowHeightScreenAvail : screen.height,
-                        innerMenuHeight : innerMenuHeight,
-                        inSurveyViewHeight : inSurveyViewHeight,
-                        generalContainerHeight : generalContainerHeight
-                    });
+                        inSurveyOffset = 230,
+                        menuHeight = $('.menubar').outerHeight(),
+                        windowHeight = $('html').height(),
+                        inSurveyViewHeight = (windowHeight - inSurveyOffset),
+                        generalContainerHeight = inSurveyViewHeight - (menuHeight);
                     this.$store.commit('changeInSurveyViewHeight', inSurveyViewHeight);
                     this.$store.commit('changeGeneralContainerHeight', generalContainerHeight);
                 }