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 23791384ca7c997fcc5462349f17998e4f965523 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Thu Aug 28 12:16:43 2014 +0200 fixes #1085 add an action of sidebar to comment poll fixes #1086 add tooltips for minify and maxify sidebar --- pollen-ui-angular/src/main/webapp/i18n/en.js | 5 ++++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 +++ pollen-ui-angular/src/main/webapp/partials/poll-link.html | 12 ++++++++++-- 3 files changed, 17 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 d0a9353..0f5f5f2 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -87,15 +87,18 @@ var translateEN = { 'poll.tab.conf' : 'Configuration', 'poll.tab.participant' : 'Participants', -'poll.new' : 'New Poll', +'poll.link.toMaxify' : 'Maxify sidebar', +'poll.link.toMinify' : 'Minify sidebar', 'poll.link.edit' : 'Edit poll', 'poll.link.vote' : 'Vote', 'poll.link.result' : 'Result of poll', +'poll.link.comment' : 'Comments of poll', 'poll.link.clone' : 'Clone this poll', 'poll.link.export' : 'Export this poll', 'poll.link.close' : 'Close this poll', 'poll.link.delete' : 'Delete this poll', +'poll.new' : 'New Poll', 'poll.edit' : 'Click to edit', 'poll.desc' : 'Description is optional. This message will not visible in vote page.', 'poll.saved' : 'Poll saved.', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index c4a82b8..44fb6fa 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -87,9 +87,12 @@ var translateFR = { 'poll.tab.conf' : 'Configuration', 'poll.tab.participant' : 'Participants', +'poll.link.toMaxify' : 'Agrandir le cadre', +'poll.link.toMinify' : 'Réduire le cadre', 'poll.link.edit' : 'Lien d\'édition', 'poll.link.vote' : 'Lien de partage pour le vote', 'poll.link.result' : 'Lien du résultat du sondage', +'poll.link.comment' : 'Commentaires du sondage', 'poll.link.clone' : 'Cloner le sondage', 'poll.link.export' : 'Exporter le sondage', 'poll.link.close' : 'Clore les votes du sondage', diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html index d22a353..f7d62f9 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -21,8 +21,8 @@ <ul> <li class="toMini" ng-click="toggleMinify()"> - <a class="fakeLink" ng-show="globalVariables.minify"><span class="fa fa-chevron-right"></span></a> - <a class="fakeLink" ng-hide="globalVariables.minify"><span class="fa fa-chevron-left"></span></a> + <a class="fakeLink" ng-show="globalVariables.minify" title="{{ 'poll.link.toMaxify' | translate }}"><span class="fa fa-chevron-right"></span></a> + <a class="fakeLink" ng-hide="globalVariables.minify" title="{{ 'poll.link.toMinify' | translate }}"><span class="fa fa-chevron-left"></span></a> </li> <li ng-if="! data.poll.isClosed"> @@ -40,6 +40,14 @@ </a> <input type="text" select-on-click value="{{globalVariables.linkResult}}" readonly class="form-control input-mini"/> </li> + + <li ng-if="data.poll.resultIsVisible"> + <a href="{{globalVariables.linkComment}}"> + <span class="fa fa-comments-o"></span> + <span class="text">{{ 'poll.link.comment' | translate }}</span> + </a> + </li> + </ul> <ul ng-if="data.poll.permission"> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.