diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/controllers.js b/angularjs-portal-home/src/main/webapp/my-app/layout/static/controllers.js index 404423ba9..0865098b7 100644 --- a/angularjs-portal-home/src/main/webapp/my-app/layout/static/controllers.js +++ b/angularjs-portal-home/src/main/webapp/my-app/layout/static/controllers.js @@ -32,7 +32,7 @@ define(['angular', 'jquery'], function(angular, $) { }; var endFn = function(){ - $scope.loading = false; + $scope.loaded = true; $scope.empty = $scope.portlet.exclusiveContent && $scope.portlet.exclusiveContent.length > 0 ? false : true; }; @@ -50,7 +50,7 @@ define(['angular', 'jquery'], function(angular, $) { if (typeof $scope.portlet === 'undefined' || typeof $scope.portlet.fname === 'undefined') { if(result.status === 403) { - $scope.loading = false; + $scope.loaded = true; $scope.empty = false; $scope.portlet = {}; $scope.portlet.title = 'Access Denied'; @@ -60,7 +60,7 @@ define(['angular', 'jquery'], function(angular, $) { $location.path('/'); } } else { - $scope.loading = true; + $scope.loaded = true; layoutService.getExclusiveMarkup($scope.portlet).then(endFn,endFn); } }); @@ -89,7 +89,7 @@ define(['angular', 'jquery'], function(angular, $) { layoutService, sharedPortletService) { $scope.portlet = sharedPortletService.getProperty() || {}; - $scope.loading = []; + $scope.loaded = false; var that = this; that.getPortlet = function (fname, portlets) { for (var p in portlets) { @@ -104,7 +104,7 @@ define(['angular', 'jquery'], function(angular, $) { if (typeof $rootScope.layout !== 'undefined' && $rootScope.layout != null) { $scope.portlet = that.getPortlet($routeParams.fname, $rootScope.layout); - $scope.loading = $scope.portlet; + $scope.loaded = true; } if (typeof $scope.portlet.fname === 'undefined') { layoutService.getApp($routeParams.fname).then(function (result) { @@ -113,7 +113,7 @@ define(['angular', 'jquery'], function(angular, $) { if (typeof $scope.portlet === 'undefined' || typeof $scope.portlet.fname === 'undefined') { if(result.status === 403) { - $scope.loading = false; + $scope.loaded = true; $scope.empty = false; $scope.portlet = {}; $scope.portlet.title = 'Access Denied'; @@ -124,13 +124,13 @@ define(['angular', 'jquery'], function(angular, $) { } } else { - $scope.loading = $scope.portlet; //not [] + $scope.loaded = true; } }); } } else { - $scope.loading = $scope.portlet; + $scope.loaded = true; } $scope.openRating = function (size, fname, name) { diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html index 7af31a543..6d2673aeb 100644 --- a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html +++ b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-exclusive.html @@ -17,7 +17,7 @@ app-action-link-text="'Add to home'" app-add-to-home='true'>
- +
diff --git a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html index a8bebeb6d..ad3e880cc 100644 --- a/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html +++ b/angularjs-portal-home/src/main/webapp/my-app/layout/static/partials/static-content-max.html @@ -18,7 +18,7 @@ app-add-to-home='true'>
- +