Merge branch 'shashvattrip-Better_Pagination_MIFOSX-1617' into develop

shashvattrip · Jan 8, 2015 · 123875b · 123875b
2 parents fcdf67d + 5825d96
commit 123875b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -105,7 +105,9 @@ module.exports = function(grunt) {
           //'<%= mifosx.dist %>/<%=mifosx.target%>/bower_components/requirejs/requirejs.min.js'
           //:['<%= mifosx.app %>/bower_components/requirejs/require.js'],
           '<%= mifosx.dist %>/<%=mifosx.target%>/bower_components/underscore/underscore.min.js'
-          :['<%= mifosx.app %>/bower_components/underscore/underscore.js']
+          :['<%= mifosx.app %>/bower_components/underscore/underscore.js'],
+           '<%= mifosx.dist %>/<%=mifosx.target%>/bower_components/angular-utils-pagination/dirPagination.min.js'
+                :['<%= mifosx.app %>/bower_components/angular-utils-pagination/dirPagination.js']
         }]
       }
     },
@@ -179,7 +181,8 @@ module.exports = function(grunt) {
           dest: '<%= mifosx.dist %>/<%=mifosx.target%>/bower_components',
           src: [
             '**/*min.js', 'ckeditor/**', 'require-css/*.js', 'require-less/*.js',
-            '!jasmine/**', '!requirejs/**/**', 'requirejs/require.js', '!underscore/**'
+            '!jasmine/**', '!requirejs/**/**', 'requirejs/require.js', '!underscore/**',
+            'angular-utils-pagination/dirPagination.tpl.html'
           ]
         }
         ]

diff --git a/app/scripts/loader-build.js b/app/scripts/loader-build.js
@@ -32,7 +32,8 @@
             'frAngular': '../scripts/modules/KeyboardManager',
             'Q': '../bower_components/q/q.min',
             'tmh.dynamicLocale': '../bower_components/angular-dynamic-locale/tmhDynamicLocale.min',
-            'webcam-directive':'../bower_components/webcam-directive/dist/1.1.0/webcam.min'
+            'webcam-directive':'../bower_components/webcam-directive/dist/1.1.0/webcam.min',
+            'angular-utils-pagination':'../bower_components/angular-utils-pagination/dirPagination.min'
         },
         shim: {
             'angular': { exports: 'angular' },
@@ -61,6 +62,7 @@
             'Q': {deps: ['angular']},
             'tmh.dynamicLocale': {deps: ['angular']},
             'webcam-directive': {deps: ['angular']},
+            'angular-utils-pagination': {deps: ['angular']},
             'mifosX': {
                 deps: [
                     'angular',
@@ -87,7 +89,8 @@
                     'frAngular',
                     'Q',
                     'tmh.dynamicLocale',
-                    'webcam-directive'
+                    'webcam-directive',
+                    'angular-utils-pagination'
                 ],
                 exports: 'mifosX'
             }

diff --git a/app/views/clients/clients.html b/app/views/clients/clients.html
@@ -34,5 +34,5 @@
         <li class="previous"><a id="prev" ng-click="clients.previous()" href="" ng-disabled="!clients.hasPrevious()">&larr; {{'label.button.previous' | translate}}</a></li>
         <li class="next"><a id="next" ng-click="clients.next()" href="" ng-disabled="!clients.hasNext()">{{'label.button.next' | translate}} &rarr;</a></li>
     </ul> -->
-    <dir-pagination-controls template-url="../../bower_components/angular-utils-pagination/dirPagination.tpl.html" on-page-change="getResultsPage(newPageNumber)"></dir-pagination-controls>
+    <dir-pagination-controls template-url="bower_components/angular-utils-pagination/dirPagination.tpl.html" on-page-change="getResultsPage(newPageNumber)"></dir-pagination-controls>
 </div>