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 4d9dbea9a538e13edc2fdbb7c96311a1f824eed9 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Tue Jun 24 17:53:16 2014 +0200 ordered comments by date (desc or asc) --- pollen-ui-angular/src/main/webapp/i18n/en.js | 2 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 ++ pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js | 12 ++++++++++-- pollen-ui-angular/src/main/webapp/partials/poll-comment.html | 7 ++++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index e5b1e54..9dc7f0d 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -68,6 +68,8 @@ var translateEN = { 'comment' : 'Comment', 'comment.added' : 'Comment added.', +'comment.order.toDesc' : 'Ordered by newer date', +'comment.order.toAsc' : 'Ordered by older date', 'action.logout' : 'Logout', 'action.login' : 'Login', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index b85c1f2..0222bd1 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -68,6 +68,8 @@ var translateFR = { 'comment' : 'Commentaire', 'comment.added' : 'Commentaire effectué', +'comment.order.toDesc' : 'Ordonner par le plus récent', +'comment.order.toAsc' : 'Ordonner par ordre chronologique', 'action.logout' : 'Se Deconnecter', 'action.login' : 'Se Connecter', 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 6987f95..ae03045 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/pollCtrl.js @@ -862,9 +862,17 @@ angular.module('pollControllers', []) else { $scope.pageSize = -1; } - $scope.urlPagination = $scope.setUrl(['page', 'pageSize']); - var paginationParameter = {pageSize:$scope.pageSize, order:'postDate', desc:true}; + $scope.desc = true; + + $scope.toggleOrder = function () { + $scope.desc = !$scope.desc; + paginationParameter.desc = $scope.desc; + paginationParameter.pageNumber = $scope.data.commentsPagination.lastPage - $scope.data.commentsPagination.currentPage; + initComments(); + } + + var paginationParameter = {pageSize: $scope.pageSize, order: 'postDate', desc: $scope.desc}; if (angular.isDefined($routeParams.page)) { if (angular.isDefined($routeParams.pageSize)) { paginationParameter = {pageSize:$routeParams.pageSize}; 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 cfd2042..ab8f2a1 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -43,7 +43,12 @@ </div> <div class="form-group"> - <div class="col-sm-3"> </div> + <div class="col-sm-3"> + <div ng-show="data.comments"> + <a class="fakeLink" ng-click="toggleOrder()" ng-show="desc" tooltip="{{ 'comment.order.toAsc' | translate }}"><span class="glyphicon glyphicon-sort-by-attributes"></span></a> + <a class="fakeLink" ng-click="toggleOrder()" ng-hide="desc" tooltip="{{ 'comment.order.toDesc' | translate }}"><span class="glyphicon glyphicon-sort-by-attributes-alt"></span></a> + </div> + </div> <div class="col-sm-9"> <button type="submit" class="btn btn-primary" ng-hide="comment.id"><span class="glyphicon glyphicon-save"></span> {{ 'action.comment' | translate }}</button> <button type="submit" class="btn btn-primary" ng-show="comment.id"><span class="glyphicon glyphicon-save"></span> {{ 'action.edit' | translate }}</button> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.