diff --git a/openslides/agenda/projector.py b/openslides/agenda/projector.py index 26dbab12a..8727236ea 100644 --- a/openslides/agenda/projector.py +++ b/openslides/agenda/projector.py @@ -40,13 +40,13 @@ class ItemListSlide(ProjectorElement): view_action='list') -class ItemDetailSlide(ProjectorElement): +class ListOfSpeakersSlide(ProjectorElement): """ Slide definitions for Item model. This is only for list of speakers slide. You have to set 'id'. """ - name = 'agenda/item' + name = 'agenda/list-of-speakers' def get_context(self): pk = self.config_entry.get('id') diff --git a/openslides/agenda/static/js/agenda/base.js b/openslides/agenda/static/js/agenda/base.js index 85dbe5f79..a0f5fd7ef 100644 --- a/openslides/agenda/static/js/agenda/base.js +++ b/openslides/agenda/static/js/agenda/base.js @@ -80,18 +80,18 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users']) projectListOfSpeakers: function() { return $http.post( '/rest/core/projector/1/prune_elements/', - [{name: 'agenda/item', id: this.id}] + [{name: 'agenda/list-of-speakers', id: this.id}] ); }, // check if list of speakers is projected isListOfSpeakersProjected: function () { // Returns true if there is a projector element with the - // name 'agenda/item' and the same id. + // name 'agenda/list-of-speakers' and the same id. var projector = Projector.get(1); if (typeof projector === 'undefined') return false; var self = this; var predicate = function (element) { - return element.name == 'agenda/item' && + return element.name == 'agenda/list-of-speakers' && typeof element.id !== 'undefined' && element.id == self.id; }; diff --git a/openslides/agenda/static/js/agenda/projector.js b/openslides/agenda/static/js/agenda/projector.js index 505692c2d..87a662589 100644 --- a/openslides/agenda/static/js/agenda/projector.js +++ b/openslides/agenda/static/js/agenda/projector.js @@ -7,8 +7,8 @@ angular.module('OpenSlidesApp.agenda.projector', ['OpenSlidesApp.agenda']) .config([ 'slidesProvider', function(slidesProvider) { - slidesProvider.registerSlide('agenda/item', { - template: 'static/templates/agenda/slide-item-detail.html', + slidesProvider.registerSlide('agenda/list-of-speakers', { + template: 'static/templates/agenda/slide-list-of-speakers.html', }); slidesProvider.registerSlide('agenda/item-list', { template: 'static/templates/agenda/slide-item-list.html', @@ -16,7 +16,7 @@ angular.module('OpenSlidesApp.agenda.projector', ['OpenSlidesApp.agenda']) } ]) -.controller('SlideItemDetailCtrl', [ +.controller('SlideListOfSpeakersCtrl', [ '$scope', 'Agenda', 'User', diff --git a/openslides/agenda/static/templates/agenda/slide-item-list.html b/openslides/agenda/static/templates/agenda/slide-item-list.html index d7bda0920..86e9185cf 100644 --- a/openslides/agenda/static/templates/agenda/slide-item-list.html +++ b/openslides/agenda/static/templates/agenda/slide-item-list.html @@ -1,11 +1,12 @@

Agenda

- - -
- {{ item.item_number }} - - {{ item.title }} -
+
+ +

+    + {{ item.title }} + +

+
diff --git a/openslides/agenda/static/templates/agenda/slide-item-detail.html b/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html similarity index 88% rename from openslides/agenda/static/templates/agenda/slide-item-detail.html rename to openslides/agenda/static/templates/agenda/slide-list-of-speakers.html index 43df47410..e84a5d98d 100644 --- a/openslides/agenda/static/templates/agenda/slide-item-detail.html +++ b/openslides/agenda/static/templates/agenda/slide-list-of-speakers.html @@ -1,4 +1,4 @@ -
+

{{ item.title }} List of speakers diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css index e4e0816ec..d63a21f1b 100644 --- a/openslides/core/static/css/projector.css +++ b/openslides/core/static/css/projector.css @@ -213,17 +213,9 @@ tr.elected td { background-color: #BED4DE !important; } -/*** Table list ***/ -.tablelist { - font-size: 130%; -} -.tablelist td { - padding: 5px; -} -.tablelist .leftcolumn { - padding-right: 15px; - vertical-align: top; -} -.tablelist td.closed { - text-decoration: line-through; +/*** Agenda list ***/ +.agendalist p { + font-size: 140%; } +.spacer-top { + margin-top: 25px;