This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 736f5f52a66c0097eec3a7d8d0ef304f4be8f61c Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Jun 17 16:15:22 2014 +0200 delete url, and fix pointer for pagination --- pollen-ui-angular/src/main/webapp/js/app.js | 3 +-- pollen-ui-angular/src/main/webapp/partials/pagination.html | 6 +++--- pollen-ui-angular/src/main/webapp/partials/poll-comment.html | 3 +-- pollen-ui-angular/src/main/webapp/partials/poll-list.html | 3 +-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/app.js b/pollen-ui-angular/src/main/webapp/js/app.js index ccaef99..1d31b79 100644 --- a/pollen-ui-angular/src/main/webapp/js/app.js +++ b/pollen-ui-angular/src/main/webapp/js/app.js @@ -240,8 +240,7 @@ angular.module('pollen', ['pollenServices', 'ngRoute', 'pollControllers', 'userC scope: { currentPage: '=', lastPage: '=', - pageSize: '=', - url: '=' + pageSize: '=' }, templateUrl: 'partials/pagination.html', link: function (scope, element, attrs) { diff --git a/pollen-ui-angular/src/main/webapp/partials/pagination.html b/pollen-ui-angular/src/main/webapp/partials/pagination.html index c32bab3..9e3feaf 100644 --- a/pollen-ui-angular/src/main/webapp/partials/pagination.html +++ b/pollen-ui-angular/src/main/webapp/partials/pagination.html @@ -1,13 +1,13 @@ <ul class="pagination" ng-show="pageList.length > 1"> <li ng-class="{disabled:currentPage == 0}" ng-click="goPage(previousPage)"> - <a>«</a> + <a class="fakeLink">«</a> </li> <li ng-repeat="page in pageList" ng-class="{active:currentPage == page}" ng-click="goPage(page)"> - <a>{{page+1}}</a> + <a class="fakeLink">{{page+1}}</a> </li> <li ng-class="{disabled:currentPage == lastPage}" ng-click="goPage(nextPage)"> - <a>»</a> + <a class="fakeLink">»</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 0e3110e..2186408 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -69,6 +69,5 @@ <make-pagination current-page="data.commentsPagination.currentPage" last-page="data.commentsPagination.lastPage" - page-size="pageSize" - url="urlPagination"></make-pagination> + page-size="pageSize"></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 e1f74d8..0d9c69c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -9,5 +9,4 @@ <make-pagination current-page="data.pollsPagination.currentPage" last-page="data.pollsPagination.lastPage" - page-size="pageSize" - url="urlPagination"></make-pagination> + page-size="data.pollsPagination.pageSize"></make-pagination> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.