Merge pull request #976 from wknet123/dev-show-totals

Updates for displaying pagination total number.

src/ui/static/resources/js/components/paginator/paginator.directive.html

@@ -12,3 +12,4 @@
     </li>
   </ul>
 </nav>
+<p class="pull-right" style="margin-right: 15%; margin-top: 5px;">// 'total' | tr // // vm.totalCount // // 'items' | tr //</p>

src/ui/static/resources/js/components/paginator/paginator.directive.js

@@ -106,11 +106,10 @@
         if(this.time > this.minimum) {         
           if(this.time === 0) {
             ctrl.page = ctrl.displayCount;
-          }else if((ctrl.page % ctrl.displayCount) != 0) {
+          }else{
             ctrl.page =  this.time * ctrl.displayCount;
           }
           --this.time;
-          --ctrl.page;
         }
         scope.$apply();
       };

src/ui/static/resources/js/components/user/list-user.directive.html

@@ -55,7 +55,7 @@
         </div>
       </div>
       <div class="col-xs-4 col-md-12 well well-sm well-custom">
-        <div class="col-md-offset-10">//vm.users ? vm.users.length : 0// items</div>
+        <div class="col-md-offset-10">//vm.users ? vm.users.length : 0// // 'items' | tr //</div>
       </div>
     </div>
   </div>

src/ui/static/resources/js/services/i18n/locale_messages_en-US.js

@@ -96,6 +96,7 @@ var locale_messages = {
   'save': 'Save',
   'cancel': 'Cancel',
   'confirm': 'Confirm',
+  'total': 'Total',
   'items': 'item(s)',  
   'add_member': 'Add Member',
   'operation': 'Operation',

src/ui/static/resources/js/services/i18n/locale_messages_zh-CN.js

@@ -96,6 +96,7 @@ var locale_messages = {
   'save': '保存',
   'cancel': '取消',
   'confirm': '确认',
+  'total': '总计',
   'items': '条记录',
   'add_member': '新增成员',
   'operation': '操作',