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 7df41458f4adb184bfa34ef51497f2a1d248bdf4 Author: Kevin Morin <morin@codelutin.com> Date: Fri Oct 10 18:30:30 2014 +0200 fixes #1067 Need to click twice on menu to open them refs #1097 Display the number of comments in the comments tab title --- .../pollen/services/bean/PaginationResultBean.java | 6 +++ .../chorem/pollen/services/bean/PollenBeans.java | 1 + pollen-ui-angular/src/main/webapp/index.html | 4 +- .../src/main/webapp/partials/poll.html | 62 ++++++++++++++++++---- 4 files changed, 61 insertions(+), 12 deletions(-) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java index 223a59e..415e324 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PaginationResultBean.java @@ -35,6 +35,8 @@ public class PaginationResultBean<O extends PollenBean> { public static class PaginationResultContextBean { + protected long count; + protected int currentPage; protected int lastPage; @@ -61,6 +63,10 @@ public class PaginationResultBean<O extends PollenBean> { return pagination; } + public void setCount(long count) { + pagination.count = count; + } + public void setCurrentPage(int currentPage) { pagination.currentPage = currentPage; } diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java index fcfcd33..d672df7 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/bean/PollenBeans.java @@ -72,6 +72,7 @@ public class PollenBeans { result.setPageSize(entities.getCurrentPage().getPageSize()); result.setCurrentPage(entities.getCurrentPage().getPageNumber()); result.setLastPage(entities.getLastPage().getPageNumber()); + result.setCount(entities.getCount()); List<PaginationOrder> orderClauses = entities.getCurrentPage().getOrderClauses(); if (CollectionUtils.isNotEmpty(orderClauses)) { diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index f7c666f..703de08 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -78,7 +78,7 @@ </li> <li class="dropdown" ng-show="currentUser.administrator"> - <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> + <a href="#" role="button" class="dropdown-toggle"> {{ 'admin' | translate }} <strong class="caret"></strong> </a> @@ -90,7 +90,7 @@ </li> <li class="dropdown" ng-show="currentUser.id"> - <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown"> + <a href="#" role="button" class="dropdown-toggle"> {{ currentUser.name || currentUser.email }} <strong class="caret"></strong> </a> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 04dc5dc..33a1294 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -21,16 +21,58 @@ <div id="poll-content" ng-class="{'maxi-content': globalVariables.minify}" ng-if="data.poll"> <ul class="nav nav-tabs"> - <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"><a href="{{globalVariables.linkVote}}"><span class="fa fa-thumbs-o-up fa-flip-horizontal"></span> {{ 'poll.tab.vote' | translate }}</a></li> - <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.commentIsVisible"><a href="{{globalVariables.linkComment}}"><span class="fa fa-comments-o"></span> {{ 'poll.tab.comment' | translate }}</a></li> - <li ng-class="{active: tab == 'result'}" ng-show="data.poll.resultIsVisible"><a href="{{globalVariables.linkResult}}"><span class="fa fa-bar-chart-o"></span> {{ 'poll.tab.result' | translate }}</a></li> - <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkEdit}}"><span class="fa fa-pencil-square-o"></span> {{ 'poll.tab.edit' | translate }} <info-error error="globalVariables.pollError"></info-error></a></li> - <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkConf}}"><span class="fa fa-wrench"></span> {{ 'poll.tab.conf' | translate }} <info-error error="globalVariables.configError"></info-error></a></li> - <li ng-class="{active: tab == 'participant'}" ng-show="data.poll.permission"><a href="{{globalVariables.linkParticipant}}"><span class="fa fa-users"></span> {{ 'poll.tab.participant' | translate }} <info-error error="globalVariables.participantError"></info-error></a></li> - - <li ng-class="{active: tab == 'create'}" ng-show="globalVariables.create"><a href="#/poll/create"><span class="fa fa-pencil-square-o"></span> {{ 'poll.tab.create' | translate }} <info-error error="globalVariables.pollError"></info-error></a></li> - <li ng-class="{active: tab == 'conf'}" ng-show="globalVariables.create"><a href="#/poll/create/conf"><span class="fa fa-wrench"></span> {{ 'poll.tab.conf' | translate }} <info-error error="globalVariables.configError"></info-error></a></li> - <li ng-class="{active: tab == 'participant'}" ng-show="globalVariables.create"><a href="#/poll/create/participant"><span class="fa fa-users"></span> {{ 'poll.tab.participant' | translate }} <info-error error="globalVariables.participantError"></info-error></a></li> + <li ng-class="{active: tab == 'vote'}" ng-show="data.poll.id"> + <a href="{{globalVariables.linkVote}}"> + <span class="fa fa-thumbs-o-up fa-flip-horizontal"></span> {{ 'poll.tab.vote' | translate }} + </a> + </li> + <li ng-class="{active: tab == 'comment'}" ng-show="data.poll.commentIsVisible"> + <a href="{{globalVariables.linkComment}}"> + <span class="fa fa-comments-o"></span> {{ 'poll.tab.comment' | translate }} ({{ data.commentsPagination.count }}) + </a> + </li> + <li ng-class="{active: tab == 'result'}" ng-show="data.poll.resultIsVisible"> + <a href="{{globalVariables.linkResult}}"> + <span class="fa fa-bar-chart-o"></span> {{ 'poll.tab.result' | translate }} + </a> + </li> + <li ng-class="{active: tab == 'edit'}" ng-show="data.poll.permission"> + <a href="{{globalVariables.linkEdit}}"> + <span class="fa fa-pencil-square-o"></span> {{ 'poll.tab.edit' | translate }} + <info-error error="globalVariables.pollError"></info-error> + </a> + </li> + <li ng-class="{active: tab == 'conf'}" ng-show="data.poll.permission"> + <a href="{{globalVariables.linkConf}}"> + <span class="fa fa-wrench"></span> {{ 'poll.tab.conf' | translate }} + <info-error error="globalVariables.configError"></info-error> + </a> + </li> + <li ng-class="{active: tab == 'participant'}" ng-show="data.poll.permission"> + <a href="{{globalVariables.linkParticipant}}"> + <span class="fa fa-users"></span> {{ 'poll.tab.participant' | translate }} + <info-error error="globalVariables.participantError"></info-error> + </a> + </li> + + <li ng-class="{active: tab == 'create'}" ng-show="globalVariables.create"> + <a href="#/poll/create"> + <span class="fa fa-pencil-square-o"></span> {{ 'poll.tab.create' | translate }} + <info-error error="globalVariables.pollError"></info-error> + </a> + </li> + <li ng-class="{active: tab == 'conf'}" ng-show="globalVariables.create"> + <a href="#/poll/create/conf"> + <span class="fa fa-wrench"></span> {{ 'poll.tab.conf' | translate }} + <info-error error="globalVariables.configError"></info-error> + </a> + </li> + <li ng-class="{active: tab == 'participant'}" ng-show="globalVariables.create"> + <a href="#/poll/create/participant"> + <span class="fa fa-users"></span> {{ 'poll.tab.participant' | translate }} + <info-error error="globalVariables.participantError"></info-error> + </a> + </li> </ul> <!--<div ng-include="'./partials/poll-info.html'" ng-controller="PollInfoCtrl" class="poll-info"></div>--> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.