Projector template improvements

- Vertical centering event title (if no description available)
- Fix sorting of main agenda item list.
- Show countdowns side-by-side. Allow edit if countdown is running.

openslides/agenda/static/js/agenda/projector.js

@@ -69,7 +69,10 @@ angular.module('OpenSlidesApp.agenda.projector', ['OpenSlidesApp.agenda'])
             } else if ($scope.element.tree) {
                 $scope.items = AgendaTree.getFlatTree(Agenda.getAll());
             } else {
-                $scope.items = $filter('filter')(Agenda.getAll(), {'parent_id': null});
+                $scope.items = Agenda.filter({
+                    where: { parent_id: null },
+                    orderBy: 'weight'
+                });
             }
         });
     }

openslides/core/static/css/projector.css

@@ -51,7 +51,7 @@ body{
     font-size: 24px;
     position: absolute;
     text-align: right;
-    top: 25px;
+    top: 23px;
     right: 50px;
     padding-left: 30px;
 }
@@ -185,16 +185,16 @@ hr {
 /*** Overlay ***/
 .countdown {
     min-width: 260px;
-    position: fixed;
-    margin: 0;
-    top: 90px;
+    position: relative;
+    margin: 0 0 10px 10px;
+    top: 0px;
     right: 0px;
-    padding: 23px 47px 0px 19px;
+    padding: 23px 45px 0px 19px;
     min-height: 72px;
     font-size: 3.7em;
     font-weight: bold;
     text-align: right;
-    border-radius: 7px 0 0 7px;
+    border-radius: 7px 7px 7px 7px;
     z-index: 200;
     font-family: "Roboto Condensed",Helvetica,Arial,sans-serif;
 }
@@ -202,7 +202,7 @@ hr {
     font-weight: normal;
     font-size: 18px;
     margin-top: 20px;
-    padding-right: 5px;
+    padding-right: 6px;
 }
 .countdown.warning {
     color: #ed940d;

openslides/core/static/templates/core/projector-controls.html

@@ -85,8 +85,7 @@
                 <i class="fa fa-times"></i>
             </button>
             <!-- edit countdown button -->
-            <button ng-show="countdown.status=='stop'"
-                type="button" class="close editicon"
+            <button type="button" class="close editicon"
                 ng-click="editCountdownFlag=true;"
                 title="{{ 'Edit countdown' | translate}}">
                 <i class="fa fa-pencil"></i>

openslides/core/static/templates/core/slide_countdown.html

@@ -1,6 +1,6 @@
 <div ng-controller="SlideCountdownCtrl">
   <div ng-if="visible">
-    <div class="countdown well" style="margin-top: calc({{index}}*100px);"
+    <div class="countdown well pull-right"
         ng-class="{
           'negative': seconds <= 0,
           'warning': seconds <= config('agenda_countdown_warning_time') && seconds > 0 }">

openslides/core/static/templates/projector.html

@@ -24,7 +24,8 @@
 <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" ng-bind-html="config('general_event_name')"></div>
+    <div class="title" ng-class="{ 'titleonly': !config('general_event_description') }"
+        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>
@@ -37,7 +38,7 @@
       font-size: {{scale}}%;
     }
   </style>
-  <div ng-repeat="element in elements">
+  <div ng-repeat="element in elements | orderBy:'index'">
     <div ng-include="element.template"></div>
   </div>
 </div>