From 754040570d2e55ca3be12b9ffa38d9a4faaa7090 Mon Sep 17 00:00:00 2001
From: FinnStutzenstein <finn.stutzenstein@hotmail.de>
Date: Wed, 11 Apr 2018 14:33:44 +0200
Subject: [PATCH] New style for motion agenda title and list of speakers

Improved list of speakers slide title:
- h2 subtitle: use always motion identifier only (like in motion slides)
- h1 title: use always "list of speakers" (long motion title not useful
  if an other projector shows the motion slide with full title
  (identifier is enough)
---
 openslides/agenda/static/js/agenda/base.js    | 22 +++++++++++++++----
 ...artial-slide-current-list-of-speakers.html |  8 +++----
 .../templates/agenda/slide-item-list.html     |  2 +-
 .../agenda/slide-list-of-speakers.html        |  7 +++---
 openslides/motions/models.py                  |  4 ++--
 openslides/motions/static/js/motions/base.js  | 16 +++++++++++---
 6 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/openslides/agenda/static/js/agenda/base.js b/openslides/agenda/static/js/agenda/base.js
index f5a002e59..0eb0994e0 100644
--- a/openslides/agenda/static/js/agenda/base.js
+++ b/openslides/agenda/static/js/agenda/base.js
@@ -67,6 +67,18 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
                     }
                     return title;
                 },
+                getListOfSpeakersTitle: function () {
+                    var title;
+                    try {
+                        title =  this.getContentObject().getListOfSpeakersTitle();
+                        if (this.item_number) {
+                            title = this.item_number + ' · ' + title;
+                        }
+                    } catch (e) {
+                        title = this.getTitle();
+                    }
+                    return title;
+                },
                 getAgendaTitle: function () {
                     return this.title;
                 },
@@ -97,14 +109,16 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
                         }
                     });
                 },
-                getListViewTitle: function () {
-                    var title;
+                getProjectorTitle: function () {
                     try {
-                        title =  this.getContentObject().getAgendaListViewTitle();
+                        return this.getContentObject().getAgendaListViewTitle();
                     } catch (e) {
                         // when the content object is not in the DS store
-                        title = this.list_view_title;
+                        return this.list_view_title;
                     }
+                },
+                getListViewTitle: function () {
+                    var title = this.getProjectorTitle();
                     if (this.item_number) {
                         title = this.item_number + ' · ' + title;
                     }
diff --git a/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html b/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html
index 18d2bf1b7..2020d3727 100644
--- a/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html
+++ b/openslides/agenda/static/templates/agenda/partial-slide-current-list-of-speakers.html
@@ -2,11 +2,11 @@
 
   <!-- Title -->
   <div id="title">
-    <h1>{{ agendaItem.getTitle() }}</h1>
-    <h2>
-      <span translate>List of speakers</span>
+    <h1 translate>List of speakers</h1>
+    <h2>{{ agendaItem.getListOfSpeakersTitle() }}
       <span ng-if="(agendaItem.speakers | filter: {begin_time: null}).length > 0">
-      &ndash; {{ (agendaItem.speakers | filter: {begin_time: null}).length }} <translate>speakers</translate>
+        &ndash; {{ (agendaItem.speakers | filter: {begin_time: null}).length }} <translate>speakers</translate>
+      </span>
       <span ng-if="agendaItem.speaker_list_closed" class="slimlabel label label-danger" translate>Closed</span>
     </h2>
   </div>
diff --git a/openslides/agenda/static/templates/agenda/slide-item-list.html b/openslides/agenda/static/templates/agenda/slide-item-list.html
index 86ec80868..c9fc98b0b 100644
--- a/openslides/agenda/static/templates/agenda/slide-item-list.html
+++ b/openslides/agenda/static/templates/agenda/slide-item-list.html
@@ -18,7 +18,7 @@
   </td>
   <td ng-if="!node.item.closed">
     <p ng-class="{mainitem: node.item.parent_id === null, subitem: node.item.parent_id !== null}">
-      {{ node.item.title }}
+      {{ node.item.getProjectorTitle() }}
     </p>
     <table ng-if="node.children.length" class="agendalist-table">
       <tr ng-repeat="node in node.children" ng-include="'projector_agenda_renderer.html'"></tr>
diff --git a/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html b/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html
index a953feeb1..c2b9371d0 100644
--- a/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html
+++ b/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html
@@ -2,11 +2,12 @@
 
   <!-- Title -->
   <div id="title">
-    <h1>{{ item.getTitle() }}</h1>
+    <h1 translate>List of speakers</h1>
     <h2>
-      <span translate>List of speakers</span>
+      {{ item.getListOfSpeakersTitle() }}
       <span ng-if="(item.speakers | filter: {begin_time: null}).length > 0">
-      &ndash; {{ (item.speakers | filter: {begin_time: null}).length }} <translate>speakers</translate>
+        &ndash; {{ (item.speakers | filter: {begin_time: null}).length }} <translate>speakers</translate>
+      </span>
       <span ng-if="item.speaker_list_closed" class="slimlabel label label-danger" translate>Closed</span>
     </h2>
   </div>
diff --git a/openslides/motions/models.py b/openslides/motions/models.py
index 40925771a..0f5fc73c0 100644
--- a/openslides/motions/models.py
+++ b/openslides/motions/models.py
@@ -654,9 +654,9 @@ class Motion(RESTModelMixin, models.Model):
         Note: It has to be the same return value like in JavaScript.
         """
         if self.identifier:
-            string = '%s (%s %s)' % (self.title, _(self._meta.verbose_name), self.identifier)
+            string = '%s %s' % (_(self._meta.verbose_name), self.identifier)
         else:
-            string = '%s (%s)' % (self.title, _(self._meta.verbose_name))
+            string = '%s (%s)' % (_(self._meta.verbose_name), self.title)
         return string
 
     @property
diff --git a/openslides/motions/static/js/motions/base.js b/openslides/motions/static/js/motions/base.js
index a874aa630..df8c3ee1c 100644
--- a/openslides/motions/static/js/motions/base.js
+++ b/openslides/motions/static/js/motions/base.js
@@ -265,11 +265,21 @@ angular.module('OpenSlidesApp.motions', [
                     return this.getVersion(versionId).title;
                 },
                 getAgendaTitle: function () {
-                    var title = '';
+                    var title = gettextCatalog.getString('Motion');
                     if (this.identifier) {
-                        title = gettextCatalog.getString('Motion') + ' ' + this.identifier + ': ';
+                        title += ' ' + this.identifier;
+                    } else {
+                        title += ' (' + this.getTitle() + ')';
+                    }
+                    return title;
+                },
+                getListOfSpeakersTitle: function () {
+                    var title = gettextCatalog.getString('Motion');
+                    if (this.identifier) {
+                        title += ' ' + this.identifier;
+                    } else {
+                        title += ' (' + this.getTitle() + ')';
                     }
-                    title += this.getTitle();
                     return title;
                 },
                 getTitleWithChanges: function (changeRecommendationMode, versionId) {