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

Merge pull request #3470 from FinnStutzenstein/SpeakersInMotionListView

Browse Source 
Showing the number of next speakers in motion list view
This commit is contained in:
Emanuel Schütze 2017-11-03 10:55:13 +01:00 committed by GitHub
commit 5558ba3fc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -46,8 +46,9 @@ Motions:
- New config options to hide reason and recommendation on projector [#3432].
- Show motion identifier in (current) list of speakers [#3442]
- Added navigation between single motions [#3459].
- Improved the multiselect state filter [#3459].
- Improved the multiselect state filter [#3459].
- Added karma:watch command [#3466].
- Show the number of next speakers in motion list view [#3470].
Elections:
- Added pagination for list view [#3393].

3
openslides/core/static/css/app.css
View File

@ -1396,6 +1396,9 @@ img {
.badge-info {
background-color: #f0ad4e;
}
.badge-success {
background-color: #5bb85b;
}
.smallhr {
margin-top: 5px;

8
openslides/motions/static/templates/motions/motion-detail.html
View File

@ -82,13 +82,13 @@
</div>
<div class="col-sm-6">
<span class="pull-right">
<a ui-sref="motions.motion.detail({id: navigation.previousMotion.id})" class="btn btn-default"
ng-disabled="!navigation.previousMotion">
<a ui-sref="motions.motion.detail({id: navigation.previousMotion.id})"
class="btn btn-default btn-sm" ng-disabled="!navigation.previousMotion">
<i class="fa fa-angle-double-left"></i>
<translate>Motion</translate> {{ navigation.previousMotion.identifier }}
</a>
<a ui-sref="motions.motion.detail({id: navigation.nextMotion.id})" class="btn btn-default"
ng-disabled="!navigation.nextMotion">
<a ui-sref="motions.motion.detail({id: navigation.nextMotion.id})"
class="btn btn-default btn-sm" ng-disabled="!navigation.nextMotion">
<translate>Motion</translate> {{ navigation.nextMotion.identifier }}
<i class="fa fa-angle-double-right"></i>
</a>

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

@ -625,7 +625,7 @@
</div>
<!-- additional content column -->
<div class="col-xs-4 content" ng-style="{'width': isSelectMode ? 'calc(50% - 120px)' : 'calc(50% - 70px)'}">
<div style="width: 60%;" class="optional">
<div style="width: 50%;" class="optional">
<small>
<!-- Category dropdown for manage user -->
<div os-perms="motions.can_manage" ng-show="categories.length > 0"
@ -751,11 +751,21 @@
{{ (config('motions_min_supporters') - motion.supporters.length) > 0 ? '(' + (config('motions_min_supporters') - motion.supporters.length) + ' ' + ('needed' | translate) + ')': '' }}"
tooltip-class="nobr">
<span class="badge"
ng-class="{'badge-info': motion.supporters.length < config('motions_min_supporters')}">
ng-class="motion.supporters.length < config('motions_min_supporters') ? 'badge-info' : 'badge-success'">
{{ motion.supporters.length }}
</span>
</div>
</div>
<div style="width: 10%;" class="pull-right">
<div class="centered" ng-if="(motion.agenda_item.speakers | filter: {'begin_time': null}).length"
uib-tooltip="{{ (motion.agenda_item.speakers | filter: {'begin_time': null}).length }} {{ 'speakers' | translate }}"
tooltip-class="nobr">
<a ui-sref="agenda.item.detail({id: motion.agenda_item_id})" os-perms="agenda.can_see" class="badge">
<i class="fa fa-comment-o"></i>
{{ (motion.agenda_item.speakers | filter: {'begin_time': null}).length }}
</a>
</div>
</div>
<div style="width: 30%;" class="pull-right">
<div class="centered">{{ motion.agenda_item.getItemNumberWithAncestors() }}</div>
</div>