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

Merge pull request #1770 from emanuelschuetze/fix1728

Browse Source 
Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728)
This commit is contained in:
Oskar Hahn 2015-12-12 09:28:20 +01:00
commit fd90b15a0e
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openslides/agenda/static/js/agenda/site.js
View File

@ -84,7 +84,6 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
$scope.items = AgendaTree.getFlatTree(Agenda.getAll()); $scope.items = AgendaTree.getFlatTree(Agenda.getAll());
}); });
$scope.alert = {}; $scope.alert = {};
$scope.isFilter = true;
// open new dialog // open new dialog
$scope.newDialog = function () { $scope.newDialog = function () {

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

@ -65,14 +65,14 @@
placeholder="{{ 'Search' | translate}}"> placeholder="{{ 'Search' | translate}}">
</div> </div>
</div> </div>
<button class="btn btn-default" ng-click="isFilter = !isFilter"> <button class="btn btn-default" ng-click="isFilterOpen = !isFilterOpen">
<i class="fa fa-filter"></i> <i class="fa fa-filter"></i>
<translate>Filter</translate>... <translate>Filter</translate>...
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div uib-collapse="isFilter" class="row"> <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.noHiddenItems" ng-true-value="1" ng-false-value="">

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

@ -39,14 +39,14 @@
placeholder="{{ 'Search' | translate}}"> placeholder="{{ 'Search' | translate}}">
</div> </div>
</div> </div>
<button class="btn btn-default" ng-click="isFilter = !isFilter"> <button class="btn btn-default" ng-click="isFilterOpen = !isFilterOpen">
<i class="fa fa-filter"></i> <i class="fa fa-filter"></i>
<translate>Filter</translate>... <translate>Filter</translate>...
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div uib-collapse="!isFilter" class="row"> <div uib-collapse="!isFilterOpen" class="row">
<div class="col-sm-6 text-right"></div> <div class="col-sm-6 text-right"></div>
<div class="col-sm-6 text-right"> <div class="col-sm-6 text-right">
<!-- phase filter --> <!-- phase filter -->

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

@ -45,14 +45,14 @@
placeholder="{{ 'Search' | translate}}"> placeholder="{{ 'Search' | translate}}">
</div> </div>
</div> </div>
<button class="btn btn-default" ng-click="isFilter = !isFilter"> <button class="btn btn-default" ng-click="isFilterOpen = !isFilterOpen">
<i class="fa fa-filter"></i> <i class="fa fa-filter"></i>
<translate>Filter</translate>... <translate>Filter</translate>...
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div uib-collapse="!isFilter" class="row"> <div uib-collapse="!isFilterOpen" class="row spacer">
<div class="col-sm-6 text-right"></div> <div class="col-sm-6 text-right"></div>
<div class="col-sm-6 text-right"> <div class="col-sm-6 text-right">
<!-- state filter --> <!-- state filter -->

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

@ -55,14 +55,14 @@
placeholder="{{ 'Search' | translate}}"> placeholder="{{ 'Search' | translate}}">
</div> </div>
</div> </div>
<button class="btn btn-default" ng-click="isFilter = !isFilter"> <button class="btn btn-default" ng-click="isFilterOpen = !isFilterOpen">
<i class="fa fa-filter"></i> <i class="fa fa-filter"></i>
<translate>Filter</translate>... <translate>Filter</translate>...
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div uib-collapse="!isFilter" class="row"> <div uib-collapse="!isFilterOpen" class="row spacer">
<div class="col-sm-6 text-right"></div> <div class="col-sm-6 text-right"></div>
<div class="col-sm-6 text-right"> <div class="col-sm-6 text-right">
<!-- isPresent filter --> <!-- isPresent filter -->