Showing the number of next speakers in motion list view
This commit is contained in:
parent
e774e2127d
commit
1236fee7ee
@ -48,6 +48,7 @@ Motions:
|
|||||||
- Added navigation between single motions [#3459].
|
- Added navigation between single motions [#3459].
|
||||||
- Improved the multiselect state filter [#3459].
|
- Improved the multiselect state filter [#3459].
|
||||||
- Added karma:watch command [#3466].
|
- Added karma:watch command [#3466].
|
||||||
|
- Show the number of next speakers in motion list view [#3470].
|
||||||
|
|
||||||
Elections:
|
Elections:
|
||||||
- Added pagination for list view [#3393].
|
- Added pagination for list view [#3393].
|
||||||
|
@ -1396,6 +1396,9 @@ img {
|
|||||||
.badge-info {
|
.badge-info {
|
||||||
background-color: #f0ad4e;
|
background-color: #f0ad4e;
|
||||||
}
|
}
|
||||||
|
.badge-success {
|
||||||
|
background-color: #5bb85b;
|
||||||
|
}
|
||||||
|
|
||||||
.smallhr {
|
.smallhr {
|
||||||
margin-top: 5px;
|
margin-top: 5px;
|
||||||
|
@ -82,13 +82,13 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-sm-6">
|
<div class="col-sm-6">
|
||||||
<span class="pull-right">
|
<span class="pull-right">
|
||||||
<a ui-sref="motions.motion.detail({id: navigation.previousMotion.id})" class="btn btn-default"
|
<a ui-sref="motions.motion.detail({id: navigation.previousMotion.id})"
|
||||||
ng-disabled="!navigation.previousMotion">
|
class="btn btn-default btn-sm" ng-disabled="!navigation.previousMotion">
|
||||||
<i class="fa fa-angle-double-left"></i>
|
<i class="fa fa-angle-double-left"></i>
|
||||||
<translate>Motion</translate> {{ navigation.previousMotion.identifier }}
|
<translate>Motion</translate> {{ navigation.previousMotion.identifier }}
|
||||||
</a>
|
</a>
|
||||||
<a ui-sref="motions.motion.detail({id: navigation.nextMotion.id})" class="btn btn-default"
|
<a ui-sref="motions.motion.detail({id: navigation.nextMotion.id})"
|
||||||
ng-disabled="!navigation.nextMotion">
|
class="btn btn-default btn-sm" ng-disabled="!navigation.nextMotion">
|
||||||
<translate>Motion</translate> {{ navigation.nextMotion.identifier }}
|
<translate>Motion</translate> {{ navigation.nextMotion.identifier }}
|
||||||
<i class="fa fa-angle-double-right"></i>
|
<i class="fa fa-angle-double-right"></i>
|
||||||
</a>
|
</a>
|
||||||
|
@ -625,7 +625,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- additional content column -->
|
<!-- additional content column -->
|
||||||
<div class="col-xs-4 content" ng-style="{'width': isSelectMode ? 'calc(50% - 120px)' : 'calc(50% - 70px)'}">
|
<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>
|
<small>
|
||||||
<!-- Category dropdown for manage user -->
|
<!-- Category dropdown for manage user -->
|
||||||
<div os-perms="motions.can_manage" ng-show="categories.length > 0"
|
<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) + ')': '' }}"
|
{{ (config('motions_min_supporters') - motion.supporters.length) > 0 ? '(' + (config('motions_min_supporters') - motion.supporters.length) + ' ' + ('needed' | translate) + ')': '' }}"
|
||||||
tooltip-class="nobr">
|
tooltip-class="nobr">
|
||||||
<span class="badge"
|
<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 }}
|
{{ motion.supporters.length }}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</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 style="width: 30%;" class="pull-right">
|
||||||
<div class="centered">{{ motion.agenda_item.getItemNumberWithAncestors() }}</div>
|
<div class="centered">{{ motion.agenda_item.getItemNumberWithAncestors() }}</div>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user