From 435e333bbbf08fb2512dfc1505d0142561cdaf74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Tue, 25 Oct 2016 13:45:54 +0200
Subject: [PATCH] Fix pagination and indentation of lists in import views.

---
 .../static/templates/agenda/item-list.html      | 14 +++++++++++---
 .../static/templates/motions/motion-import.html |  2 +-
 .../static/templates/topics/topic-import.html   |  2 +-
 .../static/templates/users/user-import.html     | 17 ++++++++++++++---
 .../users/static/templates/users/user-list.html | 13 ++++++++++---
 5 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index fcac9880d..6ea411c3b 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/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;">
-  </uib-pagination>
+      class="pagination-sm"
+      direction-links="false"
+      boundary-links="true"
+      first-text="&laquo;"
+      last-text="&raquo;">
+  </ul>
 </div>
diff --git a/openslides/motions/static/templates/motions/motion-import.html b/openslides/motions/static/templates/motions/motion-import.html
index ff25e5ec5..6d0de81b3 100644
--- a/openslides/motions/static/templates/motions/motion-import.html
+++ b/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.
diff --git a/openslides/topics/static/templates/topics/topic-import.html b/openslides/topics/static/templates/topics/topic-import.html
index 5d6baab55..5bb2cddd3 100644
--- a/openslides/topics/static/templates/topics/topic-import.html
+++ b/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.
diff --git a/openslides/users/static/templates/users/user-import.html b/openslides/users/static/templates/users/user-import.html
index 2e44b7116..c5b0e8f4d 100644
--- a/openslides/users/static/templates/users/user-import.html
+++ b/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>
diff --git a/openslides/users/static/templates/users/user-list.html b/openslides/users/static/templates/users/user-list.html
index 801f8994f..7444431cf 100644
--- a/openslides/users/static/templates/users/user-list.html
+++ b/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;">
-  </uib-pagination>
+      class="pagination-sm"
+      direction-links="false"
+      boundary-links="true"
+      first-text="&laquo;"
+      last-text="&raquo;">
+  </ul>
 </div>