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 c804cdcd2f0dc6d3f027f22ad99b8a8508f3d3a2 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 | 20 +++++++++----------- .../src/main/webapp/partials/big-poll.html | 18 ++++++++++++------ .../src/main/webapp/partials/inline-poll.html | 4 ++-- .../src/main/webapp/partials/poll-list.html | 2 ++ pollen-ui-angular/src/main/webapp/partials/poll.html | 2 -- 7 files changed, 27 insertions(+), 21 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..13d64d0 100644 --- a/pollen-ui-angular/src/main/webapp/less/style.less +++ b/pollen-ui-angular/src/main/webapp/less/style.less @@ -205,11 +205,13 @@ margin:auto; margin-bottom:8px; } -} -.btn-large { - height:60px; - width:80px; + #poll-inline { + .btn-large { + height:60px; + width:80px; + } + } } @@ -232,10 +234,11 @@ height:25px; } - .voteTrue { + &.voteTrue { background-color:@brand-success; } - .voteFalse { + + &.voteFalse { background-color:@brand-danger; } } @@ -285,11 +288,6 @@ } } -.pollBigVote { - float:right; - margin-top:5px; -} - .pool-alert { position: fixed; top:65px; diff --git a/pollen-ui-angular/src/main/webapp/partials/big-poll.html b/pollen-ui-angular/src/main/webapp/partials/big-poll.html index 99be716..9dc5c09 100644 --- a/pollen-ui-angular/src/main/webapp/partials/big-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/big-poll.html @@ -60,18 +60,24 @@ <input type="checkbox" ng-model="data.vote.choice[$index].voteValue" name="{{data.vote.choice[$index].choiceId}}"/> </div> </div> + <div class="row pollBigChoice"> <div class="col-sm-10"> - <button class="btn btn-info btn-large" ng-click="addChoice()" ng-if="globalVariables.editMode" ><span class="glyphicon glyphicon-plus"></span> Ajouter un choix</button> + <button class="btn btn-info" ng-click="addChoice()" ng-if="globalVariables.editMode" ><span class="glyphicon glyphicon-plus"></span> Ajouter un choix</button> </div> <div class="col-sm-2"> <button ng-click="inlineVersion()" class="btn btn-default">inline version</button> </div> </div> -<div class="pollBigVote"> - <input-error error="data.vote.restError.voterName[0]" data="data.vote.voterName"> - <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" /> - </input-error> - <button class="btn btn-primary" ng-click="voter()">{{ 'action.vote' | translate }}</button> +<div class="row" ng-show="!globalVariables.editMode" ng-if="!data.poll.isClosed"> + <div class="col-sm-6"> </div> + <div class="col-sm-4"> + <input-error error="data.vote.restError.voterName[0]" data="data.vote.voterName"> + <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" /> + </input-error> + </div> + <div class="col-sm-2"> + <button class="btn btn-primary" ng-click="voter()">{{ 'action.vote' | translate }}</button> + </div> </div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html index 87d801c..d5f4474 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -21,7 +21,7 @@ ~ --> - <table> + <table id="poll-inline"> <!-- begin print choices --> <tr> <td><button ng-click="bigVersion()" class="btn btn-default" >Big version</button></td> @@ -56,7 +56,7 @@ <tr ng-show="!globalVariables.editMode" ng-if="! data.poll.isClosed"> <td class="pollChoice"> <input-error error="data.vote.restError.voterName[0]" data="data.vote.voterName"> - <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" /> + <input type="text" class="form-control" placeholder="{{ 'user.name' | translate }}" ng-model="data.vote.voterName" input-error="data.vote.restError.voterName[0]" focus-me="true" /> </input-error> </td> <td ng-repeat="choice in data.vote.choice" class="pollChoice" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}" ng-click="toggleValue(choice, $event);"> 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>.