ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added agendaSupplement for agenda item title.

Browse Source 
Added padding-left for child item cells.
This commit is contained in:
Emanuel Schuetze 2016-01-18 21:40:50 +01:00
parent 76dc29cddf
commit 4125efbfe6
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/agenda/static/js/agenda/base.js
View File

@ -52,11 +52,11 @@ angular.module('OpenSlidesApp.agenda', ['OpenSlidesApp.users'])
// in the DS store. // in the DS store.
title = this.title; title = this.title;
} }
if (this.getContentResource().verboseName) { if (this.getContentResource().agendaSupplement) {
title = gettextCatalog.getString(this.getContentResource().verboseName) + ' ' + title; title = gettextCatalog.getString(this.getContentResource().agendaSupplement) + ' ' + title;
} }
if (this.item_number) { if (this.item_number) {
title = this.item_number + ' ' + title; title = this.item_number + ' · ' + title;
} }
return title; return title;
}, },

4
openslides/agenda/static/templates/agenda/item-list.html
View File

@ -131,8 +131,8 @@
<td ng-show="isDeleteMode" os-perms="agenda.can_manage" class="deleteColumn"> <td ng-show="isDeleteMode" os-perms="agenda.can_manage" class="deleteColumn">
<input type="checkbox" ng-model="item.selected"> <input type="checkbox" ng-model="item.selected">
<!-- agenda data columns --> <!-- agenda data columns -->
<td ng-if="!item.quickEdit" ng-mouseover="item.hover=true" ng-mouseleave="item.hover=false"> <td ng-if="!item.quickEdit" ng-mouseover="item.hover=true" ng-mouseleave="item.hover=false"
<span ng-repeat="n in [].constructor(item.parentCount) track by $index">&ndash;</span> style="padding-left: calc(8px + {{ item.parentCount }}*15px)">
<strong> <strong>
<a href="" ng-click="open(item)"> <a href="" ng-click="open(item)">
{{ item.getTitle() }} {{ item.getTitle() }}

1
openslides/assignments/static/js/assignments/base.js
View File

@ -80,6 +80,7 @@ angular.module('OpenSlidesApp.assignments', [])
name: name, name: name,
useClass: jsDataModel, useClass: jsDataModel,
verboseName: gettext('Election'), verboseName: gettext('Election'),
agendaSupplement: gettext('Election'),
phases: phases, phases: phases,
getPhases: function () { getPhases: function () {
if (!this.phases) { if (!this.phases) {

1
openslides/motions/static/js/motions/base.js
View File

@ -169,6 +169,7 @@ angular.module('OpenSlidesApp.motions', ['OpenSlidesApp.users'])
name: name, name: name,
useClass: jsDataModel, useClass: jsDataModel,
verboseName: gettext('Motion'), verboseName: gettext('Motion'),
agendaSupplement: gettext('Motion'),
methods: { methods: {
getResourceName: function () { getResourceName: function () {
return name; return name;