Dev: small visual amendmends

LimeSurvey · Jul 19, 2017 · e06dd46 · e06dd46
1 parent 9dc55e7
commit e06dd46
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -273,7 +273,7 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $
             //// Each view will call the correct bar as a subview.
             $this->_surveysidemenu($aData);
             //// TODO : Move this div inside each correct view ASAP !
-            echo '<div class="ls-flex-column align-items-flex-start align-content-center col-11 ls-flex-item" v-bind:style="\'max-width:\'+$store.getters.substractContainer" id="pjax-content">';
+            echo '<div 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" id="pjax-content">';
             $this->_surveybar($aData);
             $this->_nquestiongroupbar($aData);
             $this->_questionbar($aData);

diff --git a/assets/packages/adminpanel/build/lsadminpanel.js b/assets/packages/adminpanel/build/lsadminpanel.js
@@ -29166,6 +29166,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
         mousedown(e) {
             this.isMouseDown = this.$store.state.isCollapsed ? false : true;
             $('#sidebar').removeClass('transition-animate-width');
+            $('#pjax-content').removeClass('transition-animate-width');
         },
         mouseup(e) {
             if (this.isMouseDown) {
@@ -29176,6 +29177,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
                 }
                 this.$store.commit('changeSidebarwidth', this.sideBarWidth);
                 $('#sidebar').addClass('transition-animate-width');
+                $('#pjax-content').removeClass('transition-animate-width');
             }
         },
         mouseleave(e) {
@@ -29644,8 +29646,8 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
         }
       }
     }, [_vm._v(" \n                    " + _vm._s(questiongroup.group_name) + " \n                    "), _c('span', {
-      staticClass: "pull-right"
-    }, [_vm._v("(" + _vm._s(questiongroup.questions.length) + ")")])]), _vm._v(" "), _c('i', {
+      staticClass: "badge pull-right ls-space margin right-5"
+    }, [_vm._v(_vm._s(questiongroup.questions.length))])]), _vm._v(" "), _c('i', {
       staticClass: "fa bigIcons",
       class: _vm.isActive(questiongroup.gid) ? 'fa-caret-up' : 'fa-caret-down',
       on: {
@@ -30658,7 +30660,9 @@ const getAppState = function(userid){
       },
       getters:{
         substractContainer: state => {
-          return ($('#vue-app-main-container').width()-parseInt(state.sidebarwidth))+'px'
+          let bodyWidth =  ($('#vue-app-main-container').width()-parseInt(state.sidebarwidth));
+          let collapsedBodyWidth = ($('#vue-app-main-container').width()-parseInt('98px'));
+          return (state.isCollapsed ? collapsedBodyWidth : bodyWidth)+'px';
         }
       },
       mutations: {

diff --git a/assets/packages/adminpanel/src/components/questionsgroups.vue b/assets/packages/adminpanel/src/components/questionsgroups.vue
@@ -79,7 +79,7 @@ export default {
                     <i class="fa fa-bars bigIcons" draggable="true">&nbsp;</i>
                     <a :href="questiongroup.link" @click.stop="openQuestionGroup(questiongroup)" class="col-12 pjax"> 
                         {{questiongroup.group_name}} 
-                        <span class="pull-right">({{questiongroup.questions.length}})</span>
+                        <span class="badge pull-right ls-space margin right-5">{{questiongroup.questions.length}}</span>
                     </a>
                     <i class="fa bigIcons" v-bind:class="isActive(questiongroup.gid) ? 'fa-caret-up' : 'fa-caret-down'" @click.prevent="toggleActivation(questiongroup.gid)">&nbsp;</i>
                 </div>

diff --git a/assets/packages/adminpanel/src/components/sidebar.vue b/assets/packages/adminpanel/src/components/sidebar.vue
@@ -93,6 +93,7 @@ export default {
         mousedown(e) {
             this.isMouseDown = this.$store.state.isCollapsed ? false : true;
             $('#sidebar').removeClass('transition-animate-width');
+            $('#pjax-content').removeClass('transition-animate-width');
         },
         mouseup(e) {
             if(this.isMouseDown){
@@ -103,6 +104,7 @@ export default {
                 }
                 this.$store.commit('changeSidebarwidth', this.sideBarWidth);
                 $('#sidebar').addClass('transition-animate-width');
+                $('#pjax-content').removeClass('transition-animate-width');
             }
         },
         mouseleave(e) {

diff --git a/assets/packages/adminpanel/src/store/vuex-store.js b/assets/packages/adminpanel/src/store/vuex-store.js
@@ -58,7 +58,9 @@ const getAppState = function(userid){
       },
       getters:{
         substractContainer: state => {
-          return ($('#vue-app-main-container').width()-parseInt(state.sidebarwidth))+'px'
+          let bodyWidth =  ($('#vue-app-main-container').width()-parseInt(state.sidebarwidth));
+          let collapsedBodyWidth = ($('#vue-app-main-container').width()-parseInt('98px'));
+          return (state.isCollapsed ? collapsedBodyWidth : bodyWidth)+'px';
         }
       },
       mutations: {