diff --git a/README.rst b/README.rst index e41c21c0b..d12ca407c 100644 --- a/README.rst +++ b/README.rst @@ -195,7 +195,6 @@ OpenSlides uses the following projects or parts of them: * `angular-formly `_, License: MIT * `angular-formly-templates-bootstrap `_, License: MIT * `angular-gettext `_, License: MIT - * `angular-loading-bar `_, License: MIT * `angular-messages `_, License: MIT * `pdfmake `_, License: MIT * `angular-pdf `_, License: MIT diff --git a/bower.json b/bower.json index 6d94e75f1..dd18759eb 100644 --- a/bower.json +++ b/bower.json @@ -13,7 +13,6 @@ "angular-formly": "~8.4.0", "angular-formly-templates-bootstrap": "~6.2.0", "angular-gettext": "~2.3.7", - "angular-loading-bar": "~0.9.0", "angular-messages": "~1.5.8", "angular-pdf": "~1.3.0", "angular-sanitize": "~1.5.8", diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index 995e630b0..5769012e0 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -130,22 +130,31 @@ img { } #startup-overlay { - display: table; + position: absolute; + top: 0; + left: 0; + height: 100%; + width: 100%; background-color: #fff; + z-index: 900; +} + +#spinner-container { position: absolute; top: 0; left: 0; width: 100%; height: 100%; + max-height: 356px; z-index: 1000; } -#startup-overlay h1 { +#spinner-container div { + width: 100%; + position: absolute; + bottom: 0; font-size: 56px; text-align: center; -} -#startup-overlay > div { - display: table-cell; - vertical-align: middle; + color: #317796; } /** Header **/ diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js index af7f1e175..a0ef4cefc 100644 --- a/openslides/core/static/js/core/site.js +++ b/openslides/core/static/js/core/site.js @@ -8,7 +8,6 @@ angular.module('OpenSlidesApp.core.site', [ 'OpenSlidesApp.core.start', 'OpenSlidesApp.poll.majority', 'ui.router', - 'angular-loading-bar', 'colorpicker.module', 'formly', 'formlyBootstrap', diff --git a/openslides/core/static/js/core/start.js b/openslides/core/static/js/core/start.js index 31586d133..f92842fc2 100644 --- a/openslides/core/static/js/core/start.js +++ b/openslides/core/static/js/core/start.js @@ -13,7 +13,7 @@ angular.module('OpenSlidesApp.core.start', []) 'Group', 'mainMenu', function($http, $rootScope, $state, autoupdate, operator, Group, mainMenu) { - $rootScope.startupWaitingEnabled = true; + $rootScope.openslidesBootstrapDone = false; $http.get('/users/whoami/').success(function(data) { $rootScope.guest_enabled = data.guest_enabled; if (data.user_id === null && !data.guest_enabled) { @@ -25,7 +25,7 @@ angular.module('OpenSlidesApp.core.start', []) operator.setUser(data.user_id, data.user); $rootScope.operator = operator; mainMenu.updateMainMenu(); - $rootScope.startupWaitingEnabled = false; + $rootScope.openslidesBootstrapDone = true; }); } }); diff --git a/openslides/core/static/templates/index.html b/openslides/core/static/templates/index.html index f416b51be..c0042ad4a 100644 --- a/openslides/core/static/templates/index.html +++ b/openslides/core/static/templates/index.html @@ -18,11 +18,10 @@
-
-
-

-
+
+
+