Improve filters display...

and do not hide filters, ever.
This commit is contained in:
Nils Maier 2014-05-17 14:49:20 +02:00
parent 12fb096a5b
commit 2b584f2fe1
3 changed files with 50 additions and 42 deletions

View File

@ -31,7 +31,7 @@
} }
.download-graph { .download-graph {
width: 35%; width: 40%;
margin-top: 1em; margin-top: 1em;
margin-bottom: 1em; margin-bottom: 1em;
margin-right: 30px; margin-right: 30px;

View File

@ -1,3 +1,8 @@
input[type=checkbox], input[type=radio] {
vertical-align: middle;
position: relative;
}
.pagination ul > li:not(.disabled) { .pagination ul > li:not(.disabled) {
cursor: pointer; cursor: pointer;
} }

View File

@ -239,44 +239,51 @@
<!-- {{{ download template --> <!-- {{{ download template -->
<h3 ng-show="totalAria2Downloads()">Download List</h3> <h3 ng-show="totalAria2Downloads()">Download List</h3>
<form ng-show="(totalAria2Downloads() > pageSize) || downloadFilter.length" id="filters" class="clearfix"> <form id="filters" class="clearfix">
<fieldset> <fieldset>
<label for="download-filter" id="download-filter-label">Search</label> <p>
<input id="download-filter" type="text" ng-model="downloadFilter" autocomplete="off" ng-change="onDownloadFilter()" class="input-large"/> <label for="download-filter" id="download-filter-label">Search
<button ng-click="clearFilter()" class="btn btn-default btn-mini">Clear</button> <input id="download-filter" type="text" ng-model="downloadFilter" autocomplete="off" ng-change="onDownloadFilter()" class="input-large"/></label>
<br> <button ng-click="clearFilter()" class="btn btn-default btn-mini">Clear</button>
<label for="filter-speed"> </p>
<input type="checkbox" ng-model="filterSpeed" ng-change="persistFilters()" id="filter-speed"> <p>
running <label for="filter-speed">
</label> <input type="checkbox" ng-model="filterSpeed" ng-change="persistFilters()" id="filter-speed">
<label for="filter-active"> Running
<input type="checkbox" ng-model="filterActive" ng-change="persistFilters()" id="filter-active"> </label>
active <label for="filter-active">
</label> <input type="checkbox" ng-model="filterActive" ng-change="persistFilters()" id="filter-active">
<label for="filter-waiting"> Active
<input type="checkbox" ng-model="filterWaiting" ng-change="persistFilters()" id="filter-waiting"> </label>
waiting <label for="filter-waiting">
</label> <input type="checkbox" ng-model="filterWaiting" ng-change="persistFilters()" id="filter-waiting">
<label for="filter-complete"> Waiting
<input type="checkbox" ng-model="filterComplete" ng-change="persistFilters()" id="filter-complete"> </label>
complete <label for="filter-complete">
</label> <input type="checkbox" ng-model="filterComplete" ng-change="persistFilters()" id="filter-complete">
<label for="filter-error"> Complete
<input type="checkbox" ng-model="filterError" ng-change="persistFilters()" id="filter-error"> </label>
error <label for="filter-error">
</label> <input type="checkbox" ng-model="filterError" ng-change="persistFilters()" id="filter-error">
<label for="filter-paused"> Error
<input type="checkbox" ng-model="filterPaused" ng-change="persistFilters()" id="filter-paused"> </label>
paused <label for="filter-paused">
</label> <input type="checkbox" ng-model="filterPaused" ng-change="persistFilters()" id="filter-paused">
<label for="filter-removed"> Paused
<input type="checkbox" ng-model="filterRemoved" ng-change="persistFilters()" id="filter-removed"> </label>
removed <label for="filter-removed">
</label> <input type="checkbox" ng-model="filterRemoved" ng-change="persistFilters()" id="filter-removed">
<button ng-click="toggleStateFilters()" class="btn btn-default btn-mini">Toggle</button> Removed
<br> </label>
<b>Found: {{totalDownloads}} / {{totalAria2Downloads()}} </b> <button ng-click="toggleStateFilters()" class="btn btn-default btn-mini">Toggle</button>
<button ng-click="resetFilters()" class="btn btn-mini">Reset</button> </p>
<p>
<label><input type="checkbox" ng-model="hideLinkedMetadata" id="hide-linked-metadata"> Hide linked meta-data</label>
</p>
<p>
Displaying <strong>{{totalDownloads}}</strong> of <em>{{totalAria2Downloads()}}</em> downloads
&nbsp;<button ng-click="resetFilters()" class="btn btn-default btn-mini">Reset filters</button>
</p>
</fieldset> </fieldset>
</form> </form>
@ -295,10 +302,6 @@
</pagination> </pagination>
</div> </div>
<form>
<label><input type="checkbox" ng-model="hideLinkedMetadata" id="hide-linked-metadata"> Hide linked meta-data</label>
</form>
<table <table
ng-repeat="download in getDownloads()" ng-repeat="download in getDownloads()"
class="row download" data-gid="{{download.gid}}"> class="row download" data-gid="{{download.gid}}">