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

Merge pull request #1805 from emanuelschuetze/agendaHidden

Browse Source 
Improved item hidden filter.
This commit is contained in:
Oskar Hahn 2016-01-09 17:00:55 +01:00
commit dba513c2fd
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/agenda/serializers.py
View File

@ -56,6 +56,7 @@ class ItemSerializer(ModelSerializer):
'comment', 'comment',
'closed', 'closed',
'type', 'type',
'is_hidden',
'duration', 'duration',
'speakers', 'speakers',
'speaker_list_closed', 'speaker_list_closed',

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

@ -40,7 +40,7 @@
<!-- project agenda button --> <!-- project agenda button -->
<a os-perms="core.can_manage_projector" <a os-perms="core.can_manage_projector"
class="btn btn-default form-control" class="btn btn-default form-control"
title="'Project agenda'|translate" title="{{ 'Project agenda' | translate }}"
ng-click="projectAgenda()" ng-click="projectAgenda()"
ng-class="{ 'btn-primary': isAgendaProjected() }"> ng-class="{ 'btn-primary': isAgendaProjected() }">
<i class="fa fa-video-camera"></i> <i class="fa fa-video-camera"></i>
@ -75,11 +75,11 @@
<div uib-collapse="!isFilterOpen" class="row spacer"> <div uib-collapse="!isFilterOpen" class="row spacer">
<div class="col-sm-12 text-right"> <div class="col-sm-12 text-right">
<!-- hidden item filter --> <!-- hidden item filter -->
<input type="checkbox" ng-model="filter.noHiddenItems" ng-true-value="1" ng-false-value=""> <input type="checkbox" ng-model="filter.showHiddenItems" ng-true-value="" ng-false-value="false">
<translate> Hide internal items</translate> <translate> Show internal items</translate>
<!-- closed filter --> <!-- closed filter -->
<input type="checkbox" ng-model="filter.noClosedItems" ng-true-value="false" ng-false-value=""> <input type="checkbox" ng-model="filter.showClosedItems" ng-true-value="" ng-false-value="false">
<translate> Hide closed items</translate> <translate> Show closed items</translate>
</div> </div>
</div> </div>
<div uib-collapse="!isDeleteMode" class="row spacer"> <div uib-collapse="!isDeleteMode" class="row spacer">
@ -115,10 +115,10 @@
<th class="minimum"> <th class="minimum">
<translate>Done</translate> <translate>Done</translate>
<tbody> <tbody>
<tr ng-repeat="item in items | filter: filter.search | filter: {type: filter.noHiddenItems} <tr ng-repeat="item in items | filter: filter.search | filter: {is_hidden: filter.showHiddenItems}
| filter: {closed: filter.noClosedItems}" | filter: {closed: filter.showClosedItems}"
class="animate-item" class="animate-item"
ng-class="{ 'activeline': item.isProjected(), 'selected': item.selected, 'hiddenrow': item.type == 2}"> ng-class="{ 'activeline': item.isProjected(), 'selected': item.selected, 'hiddenrow': item.is_hidden}">
<!-- projector column --> <!-- projector column -->
<td ng-show="!isDeleteMode" os-perms="core.can_manage_projector"> <td ng-show="!isDeleteMode" os-perms="core.can_manage_projector">
<a class="btn btn-default btn-sm" <a class="btn btn-default btn-sm"
@ -132,13 +132,13 @@
<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-if="item.type == 2" title="'Hidden item'|translate"><i class="fa fa-ban"></i></span>
<span ng-repeat="n in [].constructor(item.parentCount) track by $index">&ndash;</span> <span ng-repeat="n in [].constructor(item.parentCount) track by $index">&ndash;</span>
<strong> <strong>
<a href="" ng-click="open(item)"> <a href="" ng-click="open(item)">
{{ item.getTitle() }} {{ item.getTitle() }}
</a> </a>
</strong> </strong>
<span ng-if="item.is_hidden" title="{{ 'Internal item' | translate }}"><i class="fa fa-ban"></i></span>
<div ng-if="item.comment"> <div ng-if="item.comment">
<small><i class="fa fa-info-circle"></i> {{ item.comment }}</small> <small><i class="fa fa-info-circle"></i> {{ item.comment }}</small>
</div> </div>

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

@ -85,7 +85,7 @@ angular.module('OpenSlidesApp.assignments', [])
if (!this.phases) { if (!this.phases) {
this.phases = $http({ 'method': 'OPTIONS', 'url': '/rest/assignments/assignment/' }); this.phases = $http({ 'method': 'OPTIONS', 'url': '/rest/assignments/assignment/' });
} }
return phases; return this.phases;
}, },
methods: { methods: {
getResourceName: function () { getResourceName: function () {

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

@ -696,7 +696,7 @@ th.sortable:hover, tr.pointer:hover, .pointer {
/* background colors for table rows */ /* background colors for table rows */
tr.hiddenrow td { tr.hiddenrow td {
background-color: #e5e5e5; background-color: #F5DCDC;
} }
tr.activeline td, li.activeline, .projected { tr.activeline td, li.activeline, .projected {

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

@ -370,7 +370,7 @@ angular.module('OpenSlidesApp.users.site', ['OpenSlidesApp.users'])
templateOptions: { templateOptions: {
label: gettextCatalog.getString('Is active'), label: gettextCatalog.getString('Is active'),
description: gettextCatalog.getString( description: gettextCatalog.getString(
'Designates whether this user should be treated as ' 'Designates whether this user should be treated as ' +
'active. Unselect this instead of deleting the account.') 'active. Unselect this instead of deleting the account.')
} }
}]; }];