Merge pull request #2530 from emanuelschuetze/pagination

Fix pagination and indentation of lists in import views.

openslides/agenda/static/templates/agenda/item-list.html

@@ -275,8 +275,16 @@
                 class="pull-right"><translate>Edit ...</translate></a>
           </div>
   </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()"
-      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>

openslides/motions/static/templates/motions/motion-import.html

@@ -37,7 +37,7 @@
   </div>
 
   <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>
           <code>identifier, title, text, reason, submitter, category, origin</code>
       <li translate>Identifier, reason, submitter, category and origin are optional and may be empty.

openslides/topics/static/templates/topics/topic-import.html

@@ -64,7 +64,7 @@
   </div>
 
   <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>
           <code>title, text, duration, comment, is_hidden</code>
       <li translate>Title is required. All other fields are optional and may be empty.

openslides/users/static/templates/users/user-import.html

@@ -66,7 +66,7 @@
   </div>
 
   <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>
           <code>title, first_name, last_name, structure_level, number, groups, comment, is_active, is_committee</code>
       <li><translate>Default groups</translate>:
@@ -127,7 +127,7 @@
               <i class="fa fa-check-circle fa-lg"></i>
             </span>
           <td>
-            {{ $index + 1 }}
+            {{ (currentPage - 1) * itemsPerPage + $index + 1 }}
           <td>
             {{ user.title }}
           <td ng-class="{ 'text-danger': user.name_error }">
@@ -173,7 +173,18 @@
                   </li>
                 </ul>
     </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">
       <i class="fa fa-exclamation-triangle"></i>

openslides/users/static/templates/users/user-list.html

@@ -222,8 +222,15 @@
           </span>
           <input os-perms="users.can_manage" type="checkbox" ng-model="user.is_present" ng-click="save(user)">
   </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()"
-      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>