From 1b25d9c37643a6d04756b3ea0ccff2cf511fcc6c Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 13 Mar 2016 21:07:25 +0100
Subject: [PATCH 1/2] Added loading spinner icon.

Only for loading resolve object from server.
---
 openslides/core/static/css/app.css          |  4 ++++
 openslides/core/static/js/core/site.js      | 20 ++++++++++++++++++++
 openslides/core/static/templates/index.html |  3 ++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index accc49747..d2defa24e 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -545,6 +545,10 @@ img {
     margin-top: 25px;
 }
 
+.spacer-bottom {
+    margin-bottom: 7px;
+}
+
 .spacer-right {
     margin-right: 5px;
 }
diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js
index e87b45de4..6c17afce0 100644
--- a/openslides/core/static/js/core/site.js
+++ b/openslides/core/static/js/core/site.js
@@ -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', [
     '$scope',
     'mainMenu',
diff --git a/openslides/core/static/templates/index.html b/openslides/core/static/templates/index.html
index f771fa36c..0061c4b11 100644
--- a/openslides/core/static/templates/index.html
+++ b/openslides/core/static/templates/index.html
@@ -161,7 +161,8 @@
   <div class="containerOS">
     <div class="col1" ng-class="isProjectorSidebar ? 'min' : 'max'">
         <!-- dynamic views -->
-        <div ui-view ng-cloak></div>
+        <route-loading-indicator></route-loading-indicator>
+        <div ui-view ng-if="!isRouteLoading"></div>
         <!-- footer -->
         <div id="footer">
           &copy; Copyright by <a href="http://www.openslides.org" target="_blank">OpenSlides</a> |

From a8d95816645364578711aca1bcc0cc8b8a241239 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 13 Mar 2016 21:27:37 +0100
Subject: [PATCH 2/2] Allow html in event name and description.

---
 openslides/core/static/templates/projector.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/openslides/core/static/templates/projector.html b/openslides/core/static/templates/projector.html
index 50bd36add..9021e158e 100644
--- a/openslides/core/static/templates/projector.html
+++ b/openslides/core/static/templates/projector.html
@@ -24,12 +24,9 @@
 <div id="header">
   <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 class="title">
-      {{ config('general_event_name') }}
-    </div>
-    <div ng-if="config('general_event_description')" class="description">
-      {{ config('general_event_description') }}
-    </div>
+    <div class="title" ng-bind-html="config('general_event_name')"></div>
+    <div ng-if="config('general_event_description')" class="description"
+        ng-bind-html="config('general_event_description')"></div>
   </div>
 </div>