From 4125efbfe65891166765761fa00ef6a4ad6010fb Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 18 Jan 2016 21:40:50 +0100 Subject: [PATCH] Added agendaSupplement for agenda item title. Added padding-left for child item cells. --- openslides/agenda/static/js/agenda/base.js | 6 +++--- openslides/agenda/static/templates/agenda/item-list.html | 4 ++-- openslides/assignments/static/js/assignments/base.js | 1 + openslides/motions/static/js/motions/base.js | 1 + 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/openslides/agenda/static/js/agenda/base.js b/openslides/agenda/static/js/agenda/base.js index 366393f3d..916764013 100644 --- a/openslides/agenda/static/js/agenda/base.js +++ b/openslides/agenda/static/js/agenda/base.js @@ -52,11 +52,11 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users']) // in the DS store. title = this.title; } - if (this.getContentResource().verboseName) { - title = gettextCatalog.getString(this.getContentResource().verboseName) + ' ' + title; + if (this.getContentResource().agendaSupplement) { + title = gettextCatalog.getString(this.getContentResource().agendaSupplement) + ' ' + title; } if (this.item_number) { - title = this.item_number + ' ' + title; + title = this.item_number + ' ยท ' + title; } return title; }, diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index ace7c5f45..ced67ce89 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -131,8 +131,8 @@ - - + {{ item.getTitle() }} diff --git a/openslides/assignments/static/js/assignments/base.js b/openslides/assignments/static/js/assignments/base.js index 6c00b822a..487195755 100644 --- a/openslides/assignments/static/js/assignments/base.js +++ b/openslides/assignments/static/js/assignments/base.js @@ -80,6 +80,7 @@ angular.module('OpenSlidesApp.assignments', []) name: name, useClass: jsDataModel, verboseName: gettext('Election'), + agendaSupplement: gettext('Election'), phases: phases, getPhases: function () { if (!this.phases) { diff --git a/openslides/motions/static/js/motions/base.js b/openslides/motions/static/js/motions/base.js index 71193a3d5..20e9ce8a1 100644 --- a/openslides/motions/static/js/motions/base.js +++ b/openslides/motions/static/js/motions/base.js @@ -169,6 +169,7 @@ angular.module('OpenSlidesApp.motions', ['OpenSlidesApp.users']) name: name, useClass: jsDataModel, verboseName: gettext('Motion'), + agendaSupplement: gettext('Motion'), methods: { getResourceName: function () { return name;