fix #221 - display sidebar only if needed

(cherry picked from commit 25f5949)
alfio-event · Sep 26, 2016 · 6329eef · 6329eef
1 parent 4a66eb9
commit 6329eef
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/src/main/webapp/WEB-INF/templates/admin/index.ms b/src/main/webapp/WEB-INF/templates/admin/index.ms
@@ -81,15 +81,23 @@
             </div>
         </div>
     </div>
-    <div class="container-fluid menu-spacer">
-        <div class="row">
-            <div class="hidden-xs hidden-sm col-md-2 col-md-push-1">
-                <alfio-sidebar></alfio-sidebar>
-            </div>
-            <div class="col-sm-12 col-xs-12 col-md-8 col-md-push-1">
-                <div data-ui-view></div>
+    <div data-ng-controller="LayoutController as ctrl" data-ng-switch="ctrl.displaySidebar">
+        <div class="container-fluid menu-spacer" data-ng-show="ctrl.displaySidebar">
+            <div class="row">
+                <div class="hidden-xs hidden-sm col-md-2 col-md-push-1">
+                    <alfio-sidebar></alfio-sidebar>
+                </div>
+                <div class="col-sm-12 col-xs-12 col-md-8 col-md-push-1">
+                    <div data-ui-view></div>
+                </div>
             </div>
         </div>
+        <div class="container-fluid menu-spacer" data-ng-if="!ctrl.displaySidebar">
+            <div data-ui-view></div>
+            <footer>
+                <h5 class="text-muted text-center">Powered by <a href="https://alf.io" target="_blank">Alf.io</a> v.{{alfioVersion}}</h5>
+            </footer>
+        </div>
     </div>
 </body>
 </html>
diff --git a/src/main/webapp/resources/js/admin/ng-app/admin-application.js b/src/main/webapp/resources/js/admin/ng-app/admin-application.js
@@ -1481,6 +1481,17 @@
         });
     }]);
 
+    admin.controller('LayoutController', ['$state', '$rootScope', function($state, $rootScope) {
+        var ctrl = this;
+        var checkSidebar = function() {
+            ctrl.displaySidebar = angular.isDefined($state.$current.data) && angular.isDefined($state.$current.data.view);
+        };
+        checkSidebar();
+        $rootScope.$on('$stateChangeSuccess', function(event, toState, toParams, fromState, fromParams) {
+            checkSidebar();
+        })
+    }]);
+
     admin.run(function($rootScope, PriceCalculator) {
         $rootScope.evaluateBarType = function(index) {
             var barClasses = ['warning', 'info', 'success'];