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 a5fc320b42560cfffee04b9355e42a13dc806d81 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Mon Jun 16 15:25:35 2014 +0200 improve print vote with color --- pollen-ui-angular/src/main/webapp/css/style.css | 8 ++++++++ pollen-ui-angular/src/main/webapp/partials/inline-poll.html | 6 +++--- pollen-ui-angular/src/main/webapp/partials/poll-result.html | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/css/style.css b/pollen-ui-angular/src/main/webapp/css/style.css index 11ae47b..a71f43a 100644 --- a/pollen-ui-angular/src/main/webapp/css/style.css +++ b/pollen-ui-angular/src/main/webapp/css/style.css @@ -153,6 +153,14 @@ i.icon-collapse { height:25px; } +.pollChoice.voteTrue { + background-color:rgba(0,255,0,0.5); +} + +.pollChoice.voteFalse { + background-color:rgba(255,0,0,0.5); +} + .right-inner-addon .glyphicon-input { position: absolute; right: 30px; 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 37a85c4..b7ba9d6 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -66,12 +66,12 @@ <!-- begin print vote --> <tr ng-repeat="vote in data.votants track by $index" class="pollAnim"> <td class="pollChoice"> {{vote.voterName}}</td> - <td ng-repeat="choice in vote.choice" class="pollChoice"> + <td ng-repeat="choice in vote.choice" class="pollChoice" ng-class="{voteTrue:choice.voteValue, voteFalse:!choice.voteValue}"> <input type="checkbox" ng-model="choice.voteValue" disabled /> </td> <td> - <button class="btn btn-info" ng-if="vote.permission" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> - <button class="btn btn-danger" ng-if="vote.permission" ng-click="deleteVote(vote)"><span class="glyphicon glyphicon-remove"></span></button> + <button class="btn btn-info" ng-if="vote.permission && !globalVariables.editMode" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> + <button class="btn btn-danger" ng-if="vote.permission && !globalVariables.editMode" ng-click="deleteVote(vote)"><span class="glyphicon glyphicon-remove"></span></button> </td> </tr> <!-- end print vote --> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-result.html b/pollen-ui-angular/src/main/webapp/partials/poll-result.html index 20fb3f0..8ff8bb9 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-result.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-result.html @@ -1,6 +1,6 @@ <h1>{{data.poll.title}}</h1> -<h2> Résultats : {{data.result.nbVotant}}</h2> +<h2> Résultats : {{data.result.nbVotant}} Votants</h2> <chart data="data.result.scoresChart"></chart> <pie data="data.result.scoresChart"></pie> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.