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 4e9d45d3a262196b2b5c9d9608aafe9467edd69d Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 2 14:43:26 2014 +0200 improve UI (print message when no poll in list,fix color vote) --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + pollen-ui-angular/src/main/webapp/less/style.less | 5 +++-- pollen-ui-angular/src/main/webapp/partials/poll-list.html | 2 ++ pollen-ui-angular/src/main/webapp/partials/poll.html | 2 -- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index d6cb8e7..beffd49 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -64,6 +64,7 @@ var translateEN = { 'poll.result.title.zero' : 'No result', 'poll.result.title.one' : 'Result : One voter', 'poll.result.title.other' : 'Result : {{nbVoter}} Voters', +'poll.error.listEmpty' : 'No poll find', 'vote.added' : 'Vote added.', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index 94e7ad3..7a3c2a0 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -70,6 +70,7 @@ var translateFR = { 'poll.result.title.zero' : 'Aucun Résultat', 'poll.result.title.one' : 'Résultat : Un votant', 'poll.result.title.other' : 'Résultat : {{nbVoter}} Votants', +'poll.error.listEmpty' : 'Aucun sondage trouvé', 'vote.added' : 'Vote effectué', diff --git a/pollen-ui-angular/src/main/webapp/less/style.less b/pollen-ui-angular/src/main/webapp/less/style.less index 6939672..5c98406 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -232,10 +232,11 @@ height:25px; } - .voteTrue { + &.voteTrue { background-color:@brand-success; } - .voteFalse { + + &.voteFalse { background-color:@brand-danger; } } 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 e036126..5e8d310 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -1,4 +1,6 @@ +<div ng-if="!data.polls[0]"><h1>{{ 'poll.error.listEmpty' | translate }}</h1></div> + <div ng-repeat="poll in data.polls"> <h2><a href="#/poll/vote/{{poll.id}}">{{poll.title}}</a> <a href="#/poll/edit/{{poll.id}}"><i class="glyphicon glyphicon-pencil"></i></a></h2> <p ng-bind-html="toHTML(poll.description)"></p> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll.html b/pollen-ui-angular/src/main/webapp/partials/poll.html index 234c6fd..ac7d5c1 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll.html @@ -30,8 +30,6 @@ <li ng-class="{active: tab == 'participant'}" ng-show="data.poll.permission || globalVariables.create"><a href="{{globalVariables.linkParticipant || '#/poll/create/participant'}}" ng-click="tab = 'participant'">{{ 'poll.tab.participant' | translate }}</a></li> </ul> - <div ng-include="'./partials/poll-link.html'" ng-if="tab == 'home'"></div> - <div ng-include="'./partials/poll-poll.html'" ng-if="tab == 'edit' || tab == 'vote'"></div> <div ng-include="'./partials/poll-settings.html'" ng-if="tab == 'conf'"></div> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.