diff --git a/ui/app/index.html b/ui/app/index.html index 4cd7775ad..6d69f07b1 100644 --- a/ui/app/index.html +++ b/ui/app/index.html @@ -23,6 +23,7 @@ + @@ -39,7 +40,8 @@ - + + @@ -59,6 +61,7 @@ + diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js index 77466ae54..dd08c4a24 100644 --- a/ui/app/scripts/app.js +++ b/ui/app/scripts/app.js @@ -14,7 +14,8 @@ angular.module('cortex', [ 'ui-notification', 'angularMoment', 'ngSanitize', - 'angularUtils.directives.dirPagination' + 'angularUtils.directives.dirPagination', + 'angular-page-loader' ]) .config(function(NotificationProvider) { NotificationProvider.setOptions({ diff --git a/ui/app/styles/main.css b/ui/app/styles/main.css index aa1f40fb2..5f3da57d8 100644 --- a/ui/app/styles/main.css +++ b/ui/app/styles/main.css @@ -149,3 +149,7 @@ a.text-white, a.text-white:hover { .box-tools .pagination { margin: 0; } + +[ng\:cloak], [ng-cloak], [data-ng-cloak], [x-ng-cloak], .ng-cloak, .x-ng-cloak { + display: none !important; +} diff --git a/ui/bower.json b/ui/bower.json index b395db1e0..d2bc600e6 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -16,7 +16,8 @@ "dropzone": "^4.3.0", "lodash": "^4.15.0", "css-spaces": "^0.3.5", - "underscore": "^1.8.3" + "underscore": "^1.8.3", + "angular-page-loader": "*" }, "devDependencies": { "angular-mocks": "1.5.10" diff --git a/ui/test/karma.conf.js b/ui/test/karma.conf.js index e9923cd49..f98b94af7 100644 --- a/ui/test/karma.conf.js +++ b/ui/test/karma.conf.js @@ -35,6 +35,7 @@ module.exports = function(config) { 'bower_components/dropzone/dist/min/dropzone.min.js', 'bower_components/lodash/lodash.js', 'bower_components/underscore/underscore.js', + 'bower_components/angular-page-loader/dist/angular-page-loader.js', 'bower_components/angular-mocks/angular-mocks.js', // endbower 'app/scripts/**/*.js',