Fixed issue #12509: Too much white space in admin UI and some other t…

…hings
LimeSurvey · Nov 23, 2017 · 2a60fee · 2a60fee
1 parent ac977eb
commit 2a60fee
Show file tree

Hide file tree

Showing 10 changed files with 469 additions and 392 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -443,7 +443,8 @@ public function view($iSurveyID, $gid = null, $qid = null)
             $aData['showLastQuestion'] = false;
         }
         $aData['templateapiversion'] = Template::model()->getTemplateConfiguration(null, $iSurveyID)->getApiVersion();
-
+
+
         $this->_renderWrappedTemplate('survey', array(), $aData);
     }
 

diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -1229,7 +1229,7 @@ public function _surveysummary($aData)
         // We get the state of the quickaction
         // If the survey is new (ie: it has no group), it is opened by default
         $aData['quickactionstate'] = (int) SettingsUser::getUserSettingValue('quickaction_state');
-
+        $aData['subviewData'] = $aData;
         $content = $this->getController()->renderPartial("/admin/survey/surveySummary_view", $aData, true);
         $this->getController()->renderPartial("/admin/super/sidebody", array(
             'content' => $content,

diff --git a/application/views/admin/survey/subview/_survey_quickaction.php b/application/views/admin/survey/subview/_survey_quickaction.php
diff --git a/application/views/admin/survey/surveySummary_view.php b/application/views/admin/survey/surveySummary_view.php
diff --git a/assets/packages/adminpanel/build/lsadminpanel.js b/assets/packages/adminpanel/build/lsadminpanel.js
@@ -36401,6 +36401,7 @@ $(document).on('ready', function () {
     $(document).on('pjax:success', () => {
         $('#pjaxClickInhibitor').fadeOut(400, function(){$(this).remove();});
         $('#pjax-file-load-container').find('div').css('width', '100%');
+        $(document).trigger('vue-sidemenu-update-link');
         setTimeout(function () {
             $('#pjax-file-load-container').find('div').css({
                 'width': '0%',
@@ -36837,6 +36838,10 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
         this.getTopmenus();
         this.getBottommenus();
 
+        $(document).on('vue-sidemenu-update-link', () => {
+            this.controlActiveLink();
+        });
+
         $(document).on('vue-redraw', () => {
             this.getQuestions();
             this.getSidemenus();
@@ -39384,6 +39389,7 @@ const getAppState = function (userid) {
             },
             changeIsCollapsed(state, value) {
                 state.isCollapsed = value;
+                $(document).trigger('vue-sidemenu-update-link');
             },
             changeMaxHeight(state, newHeight) {
                 state.maxHeight = newHeight;

diff --git a/assets/packages/adminpanel/build/lsadminpanel.js.map b/assets/packages/adminpanel/build/lsadminpanel.js.map
diff --git a/assets/packages/adminpanel/build/lsadminpanel.min.js b/assets/packages/adminpanel/build/lsadminpanel.min.js
diff --git a/assets/packages/adminpanel/src/components/sidebar.vue b/assets/packages/adminpanel/src/components/sidebar.vue
@@ -78,26 +78,30 @@ export default {
         controlActiveLink(){
             //get current location
             let currentUrl = window.location.href;
+
             //Check for corresponding menuItem
             let lastMenuItemObject = false;
             _.each(this.$store.state.sidemenus, (itm,i)=>{
                 _.each(itm.entries, (itmm,j)=>{
                     lastMenuItemObject =  _.endsWith(currentUrl,itmm.link) ? itmm : lastMenuItemObject;
                 });
             });
+
             //check for quickmenu menuLinks
             let lastQuickMenuItemObject = false;
             _.each(this.$store.state.collapsedmenus, (itm,i)=>{
                 _.each(itm.entries, (itmm,j)=>{
                     lastQuickMenuItemObject =  _.endsWith(currentUrl,itmm.link) ? itmm : lastQuickMenuItemObject;
                 });
             });
+
             //check for corresponding question group object
             let lastQuestionGroupObject = false;
             _.each(this.$store.state.questiongroups, (itm,i)=>{
                 let regTest = new RegExp('questiongroups/sa/edit/surveyid/'+itm.sid+'/gid/'+itm.gid);
                 lastQuestionGroupObject =  (regTest.test(currentUrl) || _.endsWith(currentUrl,itm.link)) ? itm : lastQuestionGroupObject;
             });
+            
             //check for corresponding question group
             let lastQuestionObject = false;
              _.each(this.$store.state.questiongroups, (itm,i)=>{
@@ -276,6 +280,10 @@ export default {
         this.getTopmenus();
         this.getBottommenus();
 
+        $(document).on('vue-sidemenu-update-link', ()=>{
+            this.controlActiveLink();
+        });
+
         $(document).on('vue-redraw', ()=>{
             this.getQuestions();
             this.getSidemenus();

diff --git a/assets/packages/adminpanel/src/main.js b/assets/packages/adminpanel/src/main.js
@@ -90,6 +90,7 @@ $(document).on('ready', function () {
     $(document).on('pjax:success', () => {
         $('#pjaxClickInhibitor').fadeOut(400, function(){$(this).remove();});
         $('#pjax-file-load-container').find('div').css('width', '100%');
+        $(document).trigger('vue-sidemenu-update-link');
         setTimeout(function () {
             $('#pjax-file-load-container').find('div').css({
                 'width': '0%',

diff --git a/assets/packages/adminpanel/src/store/vuex-store.js b/assets/packages/adminpanel/src/store/vuex-store.js
@@ -66,6 +66,7 @@ const getAppState = function (userid) {
             },
             changeIsCollapsed(state, value) {
                 state.isCollapsed = value;
+                $(document).trigger('vue-sidemenu-update-link');
             },
             changeMaxHeight(state, newHeight) {
                 state.maxHeight = newHeight;