Merge pull request #3444 from FinnStutzenstein/ScrollTopOnPageChange

Go to top on a page change

openslides/agenda/static/js/agenda/site.js

@@ -164,6 +164,7 @@ angular.module('OpenSlidesApp.agenda.site', [
         $scope.limitBegin = 0;
         $scope.pageChanged = function() {
             $scope.limitBegin = ($scope.currentPage - 1) * $scope.itemsPerPage;
+            $scope.gotoTop();
         };
 
         // parse duration for inline editing

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

@@ -128,7 +128,8 @@
     </div>
   </div>
 
-  <div class="spacer-top-lg italic">
+  <div class="spacer-top-lg italic row">
+    <div class="col-md-6">
       <span os-perms="agenda.can_see_hidden_items">{{ itemsFiltered.length }} /</span>
       {{ items.length }} {{ "items" | translate }}<span ng-if="(items|filter:{selected:true}).length > 0">,
       {{(items|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
@@ -140,6 +141,13 @@
             (<translate>Estimated end:</translate> {{ calculateEndTime() }})
           </span>
         </span>
+      </span>
+    </div>
+    <div class="col-md-6" ng-show="itemsFiltered.length > itemsPerPage">
+      <span class="pull-right">
+        <translate>Page</translate> {{ currentPage }} / {{ Math.ceil(itemsFiltered.length/itemsPerPage) }}
+      </span>
+    </div>
   </div>
 
   <div id="agenda-table" class="os-table container-fluid">

openslides/assignments/static/js/assignments/site.js

@@ -351,6 +351,7 @@ angular.module('OpenSlidesApp.assignments.site', [
         $scope.limitBegin = 0;
         $scope.pageChanged = function() {
             $scope.limitBegin = ($scope.currentPage - 1) * $scope.itemsPerPage;
+            $scope.gotoTop();
         };
 
         // update phase

openslides/assignments/static/templates/assignments/assignment-list.html

@@ -71,11 +71,18 @@
     </div>
   </div>
 
-  <div class="spacer-top-lg italic">
+  <div class="spacer-top-lg italic row">
+    <div class="col-md-6">
       {{ assignmentsFiltered.length }} /
       {{ assignments.length }} {{ "elections" | translate }}<span ng-if="(assignments|filter:{selected:true}).length > 0">,
       {{(assignments|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
     </div>
+    <div class="col-md-6" ng-show="assignmentsFiltered.length > itemsPerPage">
+      <span class="pull-right">
+        <translate>Page</translate> {{ currentPage }} / {{ Math.ceil(assignmentsFiltered.length/itemsPerPage) }}
+      </span>
+    </div>
+  </div>
 
   <div class="os-table container-fluid">
     <div class="row header-row">

openslides/core/static/js/core/base.js

@@ -526,6 +526,14 @@ angular.module('OpenSlidesApp.core', [
     }
 ])
 
+// Put the Math object into every scope.
+.run([
+    '$rootScope',
+    function ($rootScope) {
+        $rootScope.Math = window.Math;
+    }
+])
+
 // Template hooks
 // 2 possible uses:
 // - { Id: 'myHookId', template: '<button>click me</button>' }

openslides/core/static/js/core/site.js

@@ -1008,7 +1008,14 @@ angular.module('OpenSlidesApp.core.site', [
                 $scope.show = ($window.pageYOffset >= 150);
             });
         });
-        $scope.gotoTop = function () {
+    }
+])
+
+.run([
+    '$rootScope',
+    '$window',
+    function ($rootScope, $window) {
+        $rootScope.gotoTop = function () {
             $window.scrollTo(0, 0);
         };
     }

openslides/motions/static/js/motions/site.js

@@ -1052,6 +1052,7 @@ angular.module('OpenSlidesApp.motions.site', [
         $scope.limitBegin = 0;
         $scope.pageChanged = function() {
             $scope.limitBegin = ($scope.currentPage - 1) * $scope.itemsPerPage;
+            $scope.gotoTop();
         };
 
 

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

@@ -120,11 +120,18 @@
     </div>
   </div>
 
-  <div class="spacer-top-lg italic">
+  <div class="spacer-top-lg italic row">
+    <div class="col-md-6">
       {{ motionsFiltered.length }} /
       {{ motions.length }} {{ "motions" | translate }}<span ng-if="(motions|filter:{selected:true}).length > 0">,
       {{(motions|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
     </div>
+    <div class="col-md-6" ng-show="motionsFiltered.length > itemsPerPage">
+      <span class="pull-right">
+        <translate>Page</translate> {{ currentPage }} / {{ Math.ceil(motionsFiltered.length/itemsPerPage) }}
+      </span>
+    </div>
+  </div>
 
   <div class="os-table container-fluid">
     <div class="row header-row">

openslides/users/static/js/users/site.js

@@ -623,6 +623,7 @@ angular.module('OpenSlidesApp.users.site', [
         $scope.limitBegin = 0;
         $scope.pageChanged = function() {
             $scope.limitBegin = ($scope.currentPage - 1) * $scope.itemsPerPage;
+            $scope.gotoTop();
         };
 
         // Toggle group from user

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

@@ -126,11 +126,18 @@
     </div>
   </div>
 
-  <div class="spacer-top-lg italic">
+  <div class="spacer-top-lg italic row">
+    <div class="col-md-6">
       {{ usersFiltered.length }} /
       {{ users.length }} {{ "participants" | translate }}<span ng-if="(users|filter:{selected:true}).length > 0">,
       {{(users|filter:{selected:true}).length}} {{ "selected" | translate }}</span>
     </div>
+    <div class="col-md-6" ng-show="usersFiltered.length > itemsPerPage">
+      <span class="pull-right">
+        <translate>Page</translate> {{ currentPage }} / {{ Math.ceil(usersFiltered.length/itemsPerPage) }}
+      </span>
+    </div>
+  </div>
 
   <!-- filter users (for user with 'can_see_extra_data' permission) - consider present filter -->
   <div os-perms="users.can_see_extra_data">