This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit 6c2b973e499af62ff4a6dba02ee4395aa5366ce1 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed May 28 14:32:30 2014 +0200 create directive for pagination --- pollen-ui-angular/src/main/webapp/js/app.js | 14 ++++++++++++++ .../src/main/webapp/js/controllers/pollCtrl.js | 5 ++++- .../src/main/webapp/partials/pagination.html | 11 +++++++++++ .../src/main/webapp/partials/poll-comment.html | 6 ++++++ .../src/main/webapp/partials/poll-list.html | 16 +++++----------- 5 files changed, 40 insertions(+), 12 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index ee998d0..957151b 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -195,3 +195,17 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC } }) +.directive('makePagination', function () { + return { + restrict: 'E', + scope: { + pageList: '=', + currentPage: '=', + lastPage: '=', + pageSize: '=', + url: '=' + }, + templateUrl: 'partials/pagination.html' + } +}) + diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js index cebc55e..ffa175d 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -542,14 +542,17 @@ angular.module('pollControllers', []) function ($scope, $controller, $routeParams, Poll) { $controller('PollCtrl', {$scope:$scope}); + $scope.pageSize = 10; + var pollPromise; var paginationParameter; if (angular.isDefined($routeParams.page)) { if (angular.isDefined($routeParams.pageSize)) { paginationParameter = {pageSize:$routeParams.pageSize}; + $scope.pageSize = $routeParams.pageSize; } else { - paginationParameter = {pageSize:10}; + paginationParameter = {pageSize:$scope.pageSize}; } paginationParameter.pageNumber = $routeParams.page; diff --git a/pollen-ui-angular/src/main/webapp/partials/pagination.html b/pollen-ui-angular/src/main/webapp/partials/pagination.html new file mode 100644 index 0000000..d82635f --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/pagination.html @@ -0,0 +1,11 @@ +<ul class="pagination" ng-show="pageList.length > 1"> + <li ng-class="{disabled:currentPage == 0}"> + <a ng-if="currentPage != 0" href="{{url}}page={{currentPage-1}}&pageSize={{pageSize}}">«</a> + <a ng-if="currentPage == 0">«</a> + </li> + <li ng-repeat="page in pageList" ng-class="{active:currentPage == page}"><a href="{{url}}page={{page}}&pageSize={{pageSize}}">{{page+1}}</a></li> + <li ng-class="{disabled:currentPage == lastPage}"> + <a ng-if="currentPage != lastPage" href="{{url}}page={{currentPage+1}}&pageSize={{pageSize}}">»</a> + <a ng-if="currentPage == lastPage">»</a> + </li> +</ul> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html index 83ae6d2..90d24ec 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -60,4 +60,10 @@ </tr> </table> <!-- end print comments --> + + <make-pagination page-list="pageList" + current-page="data.pollsPagination.currentPage" + last-page="data.pollsPagination.lastPage" + page-size="pageSize" + url="urlPagination"></make-pagination> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-list.html b/pollen-ui-angular/src/main/webapp/partials/poll-list.html index 75c7b87..b648f14 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -7,14 +7,8 @@ <hr/> </div> -<ul class="pagination" ng-show="pageList.length > 1"> - <li ng-class="{disabled:data.pollsPagination.currentPage == 0}"> - <a ng-if="data.pollsPagination.currentPage != 0" href="{{urlPagination}}page={{data.pollsPagination.currentPage-1}}&pageSize={{data.pollsPagination.pageSize}}">«</a> - <a ng-if="data.pollsPagination.currentPage == 0">«</a> - </li> - <li ng-repeat="page in pageList" ng-class="{active:data.pollsPagination.currentPage == page}"><a href="{{urlPagination}}page={{page}}&pageSize={{data.pollsPagination.pageSize}}">{{page+1}}</a></li> - <li ng-class="{disabled:data.pollsPagination.currentPage == data.pollsPagination.lastPage}"> - <a ng-if="data.pollsPagination.currentPage != data.pollsPagination.lastPage" href="{{urlPagination}}page={{data.pollsPagination.currentPage+1}}&pageSize={{data.pollsPagination.pageSize}}">»</a> - <a ng-if="data.pollsPagination.currentPage == data.pollsPagination.lastPage">»</a> - </li> -</ul> \ No newline at end of file +<make-pagination page-list="pageList" + current-page="data.pollsPagination.currentPage" + last-page="data.pollsPagination.lastPage" + page-size="pageSize" + url="urlPagination"></make-pagination> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.