diff --git a/UI/Cells/ApprovalStatusCellTemplate.html b/UI/Cells/ApprovalStatusCellTemplate.html index 336b12024..80a9ae682 100644 --- a/UI/Cells/ApprovalStatusCellTemplate.html +++ b/UI/Cells/ApprovalStatusCellTemplate.html @@ -1,6 +1,5 @@  diff --git a/UI/Content/Backgrid/paginator.less b/UI/Content/Backgrid/paginator.less index 59c5f65e8..29f36b4ff 100644 --- a/UI/Content/Backgrid/paginator.less +++ b/UI/Content/Backgrid/paginator.less @@ -7,12 +7,20 @@ border-top : none; .box-sizing(border-box); .border-radius(0 0 4px 4px); + position: relative; + + .total-records { + display : inline-block; + height : 30px; + padding : 0; + line-height: 30px; + font-size : 13px; + position : absolute; + right : 0; + } ul { display : inline-block; - *display : inline; - margin : 5px 0; - *zoom : 1; li { display : inline; @@ -31,10 +39,12 @@ } } .active { - i, span { + span { background-color : #f5f5f5; color : #999999; cursor : default; + width : inherit; + padding : 0px 2px; } } diff --git a/UI/Handlebars/Helpers/Numbers.js b/UI/Handlebars/Helpers/Numbers.js index 3ede0e32d..44443fc34 100644 --- a/UI/Handlebars/Helpers/Numbers.js +++ b/UI/Handlebars/Helpers/Numbers.js @@ -12,4 +12,8 @@ define( return FormatHelpers.pad(input, 2); }); + Handlebars.registerHelper('Number', function (input) { + return FormatHelpers.Number(input); + }); + }); diff --git a/UI/Shared/FormatHelpers.js b/UI/Shared/FormatHelpers.js index a840a23d4..c3d04a4bc 100644 --- a/UI/Shared/FormatHelpers.js +++ b/UI/Shared/FormatHelpers.js @@ -33,6 +33,14 @@ define( z = z || '0'; n = n + ''; return n.length >= width ? n : new Array(width - n.length + 1).join(z) + n; + }, + + Number: function (input) { + if (!input) { + return ''; + } + + return input.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); } } }); diff --git a/UI/Shared/Grid/Pager.js b/UI/Shared/Grid/Pager.js index ade0a525a..7ddfe4ab5 100644 --- a/UI/Shared/Grid/Pager.js +++ b/UI/Shared/Grid/Pager.js @@ -30,6 +30,8 @@ define( return; } + target.closest('li i').addClass('icon-spinner icon-spin'); + var label = target.attr('data-action'); var ffLabels = this.fastForwardHandleLabels; @@ -81,10 +83,11 @@ define( if (collection.mode !== 'infinite') { for (var i = windowStart; i < windowEnd; i++) { handles.push({ - label : i + 1, - title : 'No. ' + (i + 1), - className : currentPage === i ? 'active' :undefined, - pageNumber: i + 1 + label : i + 1, + title : 'No. ' + (i + 1), + className : currentPage === i ? 'active' :undefined, + pageNumber : i + 1, + lastPage : lastPage + 1 }); } } @@ -134,7 +137,8 @@ define( var templateFunction = Marionette.TemplateCache.get(this.template); this.$el.html(templateFunction({ - handles: this.makeHandles() + handles: this.makeHandles(), + state: this.collection.state })); this.delegateEvents(); diff --git a/UI/Shared/Grid/PagerTemplate.html b/UI/Shared/Grid/PagerTemplate.html index c86a3a50c..74b8eadab 100644 --- a/UI/Shared/Grid/PagerTemplate.html +++ b/UI/Shared/Grid/PagerTemplate.html @@ -1,11 +1,15 @@  + + + Total Records: {{Number state.totalRecords}} + \ No newline at end of file