diff --git a/app-backend/dist/js/dashboard.min.js b/app-backend/dist/js/dashboard.min.js index 8bf47f2..1b3d373 100644 --- a/app-backend/dist/js/dashboard.min.js +++ b/app-backend/dist/js/dashboard.min.js @@ -1343,6 +1343,8 @@ angular.module('RDash') function MasterCtrl($scope, $cookieStore, $rootScope, pageDefinitions , $location, apiManager) { + + $scope.isFullPage = true; $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) { $scope.routePath = toState.url; @@ -1350,7 +1352,7 @@ function MasterCtrl($scope, $cookieStore, $rootScope, pageDefinitions for (var count = 0; count < pageDefinitions.length; count++) { if (pageDefinitions[count].url == toState.url){ $scope.pageName = pageDefinitions[count].name; - $scope.isFullPage = pageDefinitions[count].isFullPage; + $scope.isFullPage = pageDefinitions[count].isFullPage || !apiManager.isLoggedIn(); } } }); diff --git a/app-frontend/src/js/controllers/master-ctrl.js b/app-frontend/src/js/controllers/master-ctrl.js index 886966d..795b849 100644 --- a/app-frontend/src/js/controllers/master-ctrl.js +++ b/app-frontend/src/js/controllers/master-ctrl.js @@ -8,6 +8,8 @@ angular.module('RDash') function MasterCtrl($scope, $cookieStore, $rootScope, pageDefinitions , $location, apiManager) { + + $scope.isFullPage = true; $rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) { $scope.routePath = toState.url; @@ -15,7 +17,7 @@ function MasterCtrl($scope, $cookieStore, $rootScope, pageDefinitions for (var count = 0; count < pageDefinitions.length; count++) { if (pageDefinitions[count].url == toState.url){ $scope.pageName = pageDefinitions[count].name; - $scope.isFullPage = pageDefinitions[count].isFullPage; + $scope.isFullPage = pageDefinitions[count].isFullPage || !apiManager.isLoggedIn(); } } });