Merge pull request #2042 from emanuelschuetze/spinner

Template improvements
This commit is contained in:
Norman Jäckel 2016-03-15 21:02:04 +01:00
commit b3582f462e
4 changed files with 29 additions and 7 deletions

View File

@ -545,6 +545,10 @@ img {
margin-top: 25px; margin-top: 25px;
} }
.spacer-bottom {
margin-bottom: 7px;
}
.spacer-right { .spacer-right {
margin-right: 5px; margin-right: 5px;
} }

View File

@ -432,6 +432,26 @@ angular.module('OpenSlidesApp.core.site', [
} }
]) ])
.directive('routeLoadingIndicator', [
'$rootScope',
'$state',
function($rootScope, $state) {
return {
restrict: 'E',
template: "<div class='header spacer-bottom' ng-if='isRouteLoading'><div class='title'><h1><translate>Loading ...</translate> <i class='fa fa-spinner fa-pulse'></i></h1></div></div>",
link: function(scope, elem, attrs) {
scope.isRouteLoading = false;
$rootScope.$on('$stateChangeStart', function() {
scope.isRouteLoading = true;
});
$rootScope.$on('$stateChangeSuccess', function() {
scope.isRouteLoading = false;
});
}
};
}
])
.controller('MainMenuCtrl', [ .controller('MainMenuCtrl', [
'$scope', '$scope',
'mainMenu', 'mainMenu',

View File

@ -161,7 +161,8 @@
<div class="containerOS"> <div class="containerOS">
<div class="col1" ng-class="isProjectorSidebar ? 'min' : 'max'"> <div class="col1" ng-class="isProjectorSidebar ? 'min' : 'max'">
<!-- dynamic views --> <!-- dynamic views -->
<div ui-view ng-cloak></div> <route-loading-indicator></route-loading-indicator>
<div ui-view ng-if="!isRouteLoading"></div>
<!-- footer --> <!-- footer -->
<div id="footer"> <div id="footer">
&copy; Copyright by <a href="http://www.openslides.org" target="_blank">OpenSlides</a> | &copy; Copyright by <a href="http://www.openslides.org" target="_blank">OpenSlides</a> |

View File

@ -24,12 +24,9 @@
<div id="header"> <div id="header">
<img ng-if="config('projector_enable_logo')" id="logo" src="/static/img/logo-projector.png" alt="OpenSlides" /> <img ng-if="config('projector_enable_logo')" id="logo" src="/static/img/logo-projector.png" alt="OpenSlides" />
<div ng-if="config('projector_enable_title')" id="eventdata"> <div ng-if="config('projector_enable_title')" id="eventdata">
<div class="title"> <div class="title" ng-bind-html="config('general_event_name')"></div>
{{ config('general_event_name') }} <div ng-if="config('general_event_description')" class="description"
</div> ng-bind-html="config('general_event_description')"></div>
<div ng-if="config('general_event_description')" class="description">
{{ config('general_event_description') }}
</div>
</div> </div>
</div> </div>