New feature: Choose if side-menu should be always hidden, always clos…

…ed or adaptive (default)
LimeSurvey · Apr 28, 2016 · 6a77d73 · 6a77d73
1 parent 406a855
commit 6a77d73
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php
@@ -943,6 +943,7 @@ function _surveysidemenu($aData)
             $aData['aGroups'] = $aGroups;
             $aData['surveycontent'] = Permission::model()->hasSurveyPermission($aData['surveyid'], 'surveycontent', 'read');
             $aData['surveycontentupdate'] = Permission::model()->hasSurveyPermission($aData['surveyid'], 'surveycontent', 'update');
+            $aData['sideMenuBehaviour'] = getGlobalSetting('sideMenuBehaviour');
             $this->getController()->renderPartial("/admin/super/sidemenu", $aData);
         }
         else

diff --git a/application/views/admin/super/quickmenu.php b/application/views/admin/super/quickmenu.php
@@ -1,4 +1,4 @@
-<div id="quick-menu-container" style="display: none;">
+<div id="quick-menu-container">
     <!-- TODO: Placement right won't work with right-to-left -->
     <a
         href="<?php echo $this->createUrl("admin/survey/sa/view/surveyid/$surveyid"); ?>"

diff --git a/application/views/admin/super/sidemenu.php b/application/views/admin/super/sidemenu.php
@@ -14,17 +14,26 @@
 ?>
 
     <!-- State when page is loaded : for JavaScript-->
-    <?php if(isset($sidemenu['state']) && $sidemenu['state']==false ):?>
-       <input type="hidden" id="close-side-bar" />
+    <?php if ($sideMenuBehaviour == 'adaptive'): ?>
+        <?php if(isset($sidemenu['state']) && $sidemenu['state']==false ):?>
+           <input type="hidden" id="close-side-bar" />
+        <?php endif;?>
+    <?php elseif ($sideMenuBehaviour == 'alwaysClosed'): ?>
+           <input type="hidden" id="close-side-bar" />
+    <?php elseif ($sideMenuBehaviour == 'alwaysOpen'): ?>
+        <!-- Do nothing -->
     <?php endif;?>
 
     <!-- To handle correctly the side menu positioning -->
-    <div class="absolute-wrapper hidden-xs" style="z-index: 100;"> </div>
+        <div
+            class="absolute-wrapper hidden-xs"
+            style="z-index: 100; <?php if ($sideMenuBehaviour == 'alwaysClosed'): echo 'left: -250px;'; endif; ?> ">
+        </div>
 
     <!-- sideMenu -->
-    <div class="side-menu  hidden-xs" id="sideMenu" style="z-index: 101;">
+    <div class="side-menu <?php if ($sideMenuBehaviour == 'alwaysClosed'): echo ' side-menu-hidden'; endif; ?> hidden-xs" id="sideMenu" style="z-index: 101;">
 
-        <nav class="navbar navbar-default  hidden-xs">
+        <nav class="navbar navbar-default hidden-xs">
 
             <!-- Header : General -->
             <div class="navbar-header  hidden-xs">
@@ -78,7 +87,7 @@
 
             <!-- Main Menu -->
             <div class="side-menu-container hidden-xs">
-                <ul class="nav navbar-nav sidemenuscontainer  hidden-xs">
+                <ul class="nav navbar-nav sidemenuscontainer hidden-xs" style="<?php if ($sideMenuBehaviour == 'alwaysClosed'): echo 'display: none;'; endif; ?>">
 
                     <!-- Question & Groups-->
                     <li class="panel panel-default dropdownlvl1" id="dropdown">

diff --git a/styles/Sea_Green/css/lime-admin-common.css b/styles/Sea_Green/css/lime-admin-common.css
@@ -510,7 +510,8 @@ div.panel.disabled {
   position: fixed;
   left: 0;
   width: 300px;
-  height: 100%; }
+  height: 100%;
+}
 
 .side-menu {
   position: absolute;
@@ -693,6 +694,10 @@ div.panel.disabled {
   #sideMenu .sidemenuscontainer li:hover > a {
     font-weight: 700; }
 
+.side-menu-hidden {
+    left: -250px;
+}
+
 .side-body {
   min-height: 700px;
   margin-left: 320px; }