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

Merge pull request #1771 from emanuelschuetze/fix1729

Browse Source 
Added whitespace before triple dots in template (Fixes #1729)
This commit is contained in:
Oskar Hahn 2015-12-12 11:05:58 +01:00
commit 99b4e8c494
8 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/agenda/static/templates/agenda/item-detail.html
View File

@ -84,7 +84,7 @@
</alert>
<div os-perms="agenda.can_manage" class="input-group">
<ui-select ng-model="speaker.selected" ng-change="addSpeaker(speaker.selected.id)">
<ui-select-match placeholder="{{ 'Select or search a participant...' | translate }}">
<ui-select-match placeholder="{{ 'Select or search a participant ...' | translate }}">
{{ $select.selected.get_full_name() }}
</ui-select-match>
<ui-select-choices repeat="user in users | filter: $select.search">

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

@ -34,7 +34,7 @@
<button os-perms-lite="agenda.can_manage" class="btn btn-default"
ng-click="isDeleteMode = !isDeleteMode; uncheckAll()">
<i class="fa fa-check-square-o"></i>
<translate>Select</translate>...
<translate>Select ...</translate>
</button>
<div class="form-group">
<!-- project agenda button -->
@ -67,7 +67,7 @@
</div>
<button class="btn btn-default" ng-click="isFilterOpen = !isFilterOpen">
<i class="fa fa-filter"></i>
<translate>Filter</translate>...
<translate>Filter ...</translate>
</button>
</div>
</div>
@ -203,7 +203,7 @@
<button type="submit" class="btn btn-primary" translate>
Update
</button>
<a href="" ng-click="edit(item)" class="pull-right"><translate>Edit</translate>...</a>
<a href="" ng-click="editDialog(item)" class="pull-right"><translate>Edit ...</translate></a>
</div>
</form>
</table>

2
openslides/assignments/static/templates/assignments/assignment-detail.html
View File

@ -53,7 +53,7 @@
</alert>
<div os-perms="assignments.can_nominate_other" class="input-group">
<ui-select ng-model="candidate.selected" ng-change="addCandidate(candidate.selected.id)">
<ui-select-match placeholder="{{ 'Select or search a participant...' | translate }}">
<ui-select-match placeholder="{{ 'Select or search a participant ...' | translate }}">
{{ $select.selected.get_full_name() }}
</ui-select-match>
<ui-select-choices repeat="user in users | filter: $select.search">

6
openslides/assignments/static/templates/assignments/assignment-list.html
View File

@ -26,7 +26,7 @@
<button os-perms-lite="assignments.can_manage" class="btn btn-default"
ng-click="isDeleteMode = !isDeleteMode; uncheckAll()">
<i class="fa fa-check-square-o"></i>
<translate>Select</translate>...
<translate>Select ...</translate>
</button>
</form>
</div>
@ -41,7 +41,7 @@
</div>
<button class="btn btn-default" ng-click="isFilterOpen = !isFilterOpen">
<i class="fa fa-filter"></i>
<translate>Filter</translate>...
<translate>Filter ...</translate>
</button>
</div>
</div>
@ -162,7 +162,7 @@
Update
</button>
<a href="" ng-click="editDialog(assignment)"
class="pull-right" translate>Edit election...</a>
class="pull-right" translate>Edit election ...</a>
</div>
</table>
</div>

12
openslides/motions/static/js/motions/site.js
View File

@ -150,7 +150,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
ngOptions: 'option[to.valueProp] as option in to.options | filter: $select.search',
valueProp: 'id',
labelProp: 'full_name',
placeholder: gettextCatalog.getString('Select or search a submitter...')
placeholder: gettextCatalog.getString('Select or search a submitter ...')
},
hide: !operator.hasPerms('motions.can_manage')
},
@ -197,7 +197,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
ngOptions: 'option[to.valueProp] as option in to.options | filter: $select.search',
valueProp: 'id',
labelProp: 'title_or_filename',
placeholder: gettextCatalog.getString('Select or search an attachment...')
placeholder: gettextCatalog.getString('Select or search an attachment ...')
},
hideExpression: '!model.more'
},
@ -211,7 +211,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
ngOptions: 'option[to.valueProp] as option in to.options | filter: $select.search',
valueProp: 'id',
labelProp: 'name',
placeholder: gettextCatalog.getString('Select or search a category...')
placeholder: gettextCatalog.getString('Select or search a category ...')
},
hideExpression: '!model.more'
},
@ -225,7 +225,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
ngOptions: 'option[to.valueProp] as option in to.options | filter: $select.search',
valueProp: 'id',
labelProp: 'name',
placeholder: gettextCatalog.getString('Select or search a tag...')
placeholder: gettextCatalog.getString('Select or search a tag ...')
},
hideExpression: '!model.more'
},
@ -239,7 +239,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
ngOptions: 'option[to.valueProp] as option in to.options | filter: $select.search',
valueProp: 'id',
labelProp: 'full_name',
placeholder: gettextCatalog.getString('Select or search a supporter...')
placeholder: gettextCatalog.getString('Select or search a supporter ...')
},
hideExpression: '!model.more'
},
@ -253,7 +253,7 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
ngOptions: 'option[to.valueProp] as option in to.options | filter: $select.search',
valueProp: 'id',
labelProp: 'name',
placeholder: gettextCatalog.getString('Select or search a workflow...')
placeholder: gettextCatalog.getString('Select or search a workflow ...')
},
hideExpression: '!model.more',
}];

12
openslides/motions/static/templates/motions/motion-list.html
View File

@ -33,7 +33,7 @@
<button os-perms-lite="motions.can_manage" class="btn btn-default"
ng-click="isDeleteMode = !isDeleteMode; uncheckAll()">
<i class="fa fa-check-square-o"></i>
<translate>Select</translate>...
<translate>Select ...</translate>
</button>
</div>
<div class="col-sm-6">
@ -47,7 +47,7 @@
</div>
<button class="btn btn-default" ng-click="isFilterOpen = !isFilterOpen">
<i class="fa fa-filter"></i>
<translate>Filter</translate>...
<translate>Filter ...</translate>
</button>
</div>
</div>
@ -178,7 +178,7 @@
<div class="col-xs-6">
<label for="selectSubmitter" translate>Submitters</label>
<ui-select multiple ng-model="motion.submitters_id" name="selectSubmitter">
<ui-select-match placeholder="{{ 'Select or search a submitter...' | translate }}">
<ui-select-match placeholder="{{ 'Select or search a submitter ...' | translate }}">
{{ $item.get_full_name() }}
</ui-select-match>
<ui-select-choices repeat="user.id as user in users | filter: $select.search">
@ -189,7 +189,7 @@
<div class="col-xs-6">
<label for="selectTags" translate>Tags</label>
<ui-select multiple ng-model="motion.tags_id">
<ui-select-match placeholder="{{ 'Select or search a tag...' | translate }}">
<ui-select-match placeholder="{{ 'Select or search a tag ...' | translate }}">
{{ $item.name }}
</ui-select-match>
<ui-select-choices repeat="tag.id as tag in tags | filter: $select.search">
@ -203,7 +203,7 @@
<div ng-if="config('motions_min_supporters') > 0">
<label for="selectSubmitter" translate>Supporters</label>
<ui-select multiple ng-model="motion.supporters_id">
<ui-select-match placeholder="{{ 'Select or search a supporter...' | translate }}">
<ui-select-match placeholder="{{ 'Select or search a supporter ...' | translate }}">
{{ $item.get_full_name() }}
</ui-select-match>
<ui-select-choices repeat="user.id as user in users | filter: $select.search">
@ -221,7 +221,7 @@
Update
</button>
<a ng-if="motion.isAllowed('update')" ui-sref="motions.motion.detail.update({id: motion.id })"
class="pull-right" translate>Edit motion...</a>
class="pull-right" translate>Edit motion ...</a>
</div>
</table>
</div>

2
openslides/users/static/js/users/site.js
View File

@ -322,7 +322,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
ngOptions: 'option[to.valueProp] as option in to.options | filter: $select.search',
valueProp: 'id',
labelProp: 'name',
placeholder: gettextCatalog.getString('Select or search a group...')
placeholder: gettextCatalog.getString('Select or search a group ...')
}
},
{

4
openslides/users/static/templates/users/user-list.html
View File

@ -43,7 +43,7 @@
<button os-perms-lite="users.can_manage" class="btn btn-default"
ng-click="isDeleteMode = !isDeleteMode; uncheckAll()">
<i class="fa fa-check-square-o"></i>
<translate>Select</translate>...
<translate>Select ...</translate>
</button>
</div>
<div class="col-sm-6">
@ -57,7 +57,7 @@
</div>
<button class="btn btn-default" ng-click="isFilterOpen = !isFilterOpen">
<i class="fa fa-filter"></i>
<translate>Filter</translate>...
<translate>Filter ...</translate>
</button>
</div>
</div>