Merge pull request #2530 from emanuelschuetze/pagination

Fix pagination and indentation of lists in import views.
This commit is contained in:
Norman Jäckel 2016-10-26 14:55:44 +02:00 committed by GitHub
commit f5b37c1b84
5 changed files with 37 additions and 11 deletions

View File

@ -275,8 +275,16 @@
class="pull-right"><translate>Edit ...</translate></a> class="pull-right"><translate>Edit ...</translate></a>
</div> </div>
</table> </table>
<uib-pagination ng-show="itemsFiltered.length > itemsPerPage" total-items="itemsFiltered.length" items-per-page="itemsPerPage" ng-model="currentPage" <ul uib-pagination
ng-show="itemsFiltered.length > itemsPerPage"
total-items="itemsFiltered.length"
items-per-page="itemsPerPage"
ng-model="currentPage"
ng-change="pageChanged()" ng-change="pageChanged()"
class="pagination-sm" direction-links="false" boundary-links="true" first-text="&laquo;" last-text="&raquo;"> class="pagination-sm"
</uib-pagination> direction-links="false"
boundary-links="true"
first-text="&laquo;"
last-text="&raquo;">
</ul>
</div> </div>

View File

@ -37,7 +37,7 @@
</div> </div>
<h4 translate>Please note:</h4> <h4 translate>Please note:</h4>
<ul> <ul class="indentation">
<li><translate>Required comma or semicolon separated values with these column header names in the first row</translate>:<br> <li><translate>Required comma or semicolon separated values with these column header names in the first row</translate>:<br>
<code>identifier, title, text, reason, submitter, category, origin</code> <code>identifier, title, text, reason, submitter, category, origin</code>
<li translate>Identifier, reason, submitter, category and origin are optional and may be empty. <li translate>Identifier, reason, submitter, category and origin are optional and may be empty.

View File

@ -64,7 +64,7 @@
</div> </div>
<h4 translate>Please note:</h4> <h4 translate>Please note:</h4>
<ul> <ul class="indentation">
<li><translate>Required comma or semicolon separated values with these column header names in the first row</translate>:<br> <li><translate>Required comma or semicolon separated values with these column header names in the first row</translate>:<br>
<code>title, text, duration, comment, is_hidden</code> <code>title, text, duration, comment, is_hidden</code>
<li translate>Title is required. All other fields are optional and may be empty. <li translate>Title is required. All other fields are optional and may be empty.

View File

@ -66,7 +66,7 @@
</div> </div>
<h4 translate>Please note:</h4> <h4 translate>Please note:</h4>
<ul> <ul class="indentation">
<li><translate>Required comma or semicolon separated values with these column header names in the first row</translate>:<br> <li><translate>Required comma or semicolon separated values with these column header names in the first row</translate>:<br>
<code>title, first_name, last_name, structure_level, number, groups, comment, is_active, is_committee</code> <code>title, first_name, last_name, structure_level, number, groups, comment, is_active, is_committee</code>
<li><translate>Default groups</translate>: <li><translate>Default groups</translate>:
@ -127,7 +127,7 @@
<i class="fa fa-check-circle fa-lg"></i> <i class="fa fa-check-circle fa-lg"></i>
</span> </span>
<td> <td>
{{ $index + 1 }} {{ (currentPage - 1) * itemsPerPage + $index + 1 }}
<td> <td>
{{ user.title }} {{ user.title }}
<td ng-class="{ 'text-danger': user.name_error }"> <td ng-class="{ 'text-danger': user.name_error }">
@ -173,7 +173,18 @@
</li> </li>
</ul> </ul>
</table> </table>
<uib-pagination total-items="users.length" items-per-page="itemsPerPage" ng-model="currentPage" ng-change="pageChanged()"></uib-pagination> <ul uib-pagination
ng-show="users.length > itemsPerPage"
total-items="users.length"
items-per-page="itemsPerPage"
ng-model="currentPage"
ng-change="pageChanged()"
class="pagination-sm"
direction-links="false"
boundary-links="true"
first-text="&laquo;"
last-text="&raquo;">
</ul>
<div class="text-danger"> <div class="text-danger">
<i class="fa fa-exclamation-triangle"></i> <i class="fa fa-exclamation-triangle"></i>

View File

@ -222,8 +222,15 @@
</span> </span>
<input os-perms="users.can_manage" type="checkbox" ng-model="user.is_present" ng-click="save(user)"> <input os-perms="users.can_manage" type="checkbox" ng-model="user.is_present" ng-click="save(user)">
</table> </table>
<uib-pagination total-items="usersFiltered.length" items-per-page="itemsPerPage" ng-model="currentPage" <ul uib-pagination
total-items="usersFiltered.length"
items-per-page="itemsPerPage"
ng-model="currentPage"
ng-change="pageChanged()" ng-change="pageChanged()"
class="pagination-sm" direction-links="false" boundary-links="true" first-text="&laquo;" last-text="&raquo;"> class="pagination-sm"
</uib-pagination> direction-links="false"
boundary-links="true"
first-text="&laquo;"
last-text="&raquo;">
</ul>
</div> </div>