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 496cd660548975297cba90a7844a642a8d5b73e2 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 1 15:30:29 2014 +0200 edit voterName for vote --- .../src/main/webapp/partials/inline-poll.html | 36 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 6 deletions(-) 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 c38d63a..844240d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -84,7 +84,20 @@ <!-- begin print vote --> <tr ng-repeat="vote in data.votants track by $index" class="pollAnim"> - <td class="pollChoice text-muted"> {{vote.voterName}}</td> + <td class="pollChoice"> + <div class="text-muted" ng-hide="vote.onEdit"> + {{vote.voterName}} + </div> + <div ng-show="vote.onEdit"> + <input-error error="vote.restError.voterName[0]" data="vote.voterName"> + <input type="text" + class="form-control" + placeholder="{{ 'user.name' | translate }}" + ng-model="vote.voterName" + input-error="vote.restError.voterName[0]" /> + </input-error> + </div> + </td> <td ng-repeat="choice in vote.choice" class="pollChoice" ng-click="toggleVoteValue(choice, vote.onEdit, $event);" @@ -102,15 +115,26 @@ </div> <div ng-show="vote.onEdit"> <input-error error="choice.restError[0]" data="choice.voteValue"> - <input type="{{data.voteCountingType.renderType}}" ng-model="choice.voteValue" ng-disabled="!vote.onEdit" ng-click="toggleVoteValue(choice, vote.onEdit, $event);" /> + <input type="{{data.voteCountingType.renderType}}" + ng-model="choice.voteValue" + ng-disabled="!vote.onEdit" + ng-click="toggleVoteValue(choice, vote.onEdit, $event);" /> </input-error> </div> </td> <td> - <button class="btn btn-primary" ng-if="vote.permission && !globalVariables.editMode && vote.onEdit" ng-click="saveVote(vote)"><span class="glyphicon glyphicon-ok"></span></button> - <button class="btn btn-default" ng-if="vote.permission && !globalVariables.editMode && vote.onEdit" ng-click="cancelVote(vote)"><span class="glyphicon glyphicon-remove"></span></button> - <button class="btn btn-info" ng-if="vote.permission && !globalVariables.editMode && !vote.onEdit" ng-click="editVote(vote)"><span class="glyphicon glyphicon-pencil"></span></button> - <button class="btn btn-danger" ng-if="vote.permission && !globalVariables.editMode && !vote.onEdit" ng-click="deleteVote(vote)"><span class="glyphicon glyphicon-trash"></span></button> + <button class="btn btn-primary" ng-if="vote.permission && !globalVariables.editMode && vote.onEdit" ng-click="saveVote(vote)"> + <span class="glyphicon glyphicon-ok"></span> + </button> + <button class="btn btn-default" ng-if="vote.permission && !globalVariables.editMode && vote.onEdit" ng-click="cancelVote(vote)"> + <span class="glyphicon glyphicon-remove"></span> + </button> + <button class="btn btn-info" ng-if="vote.permission && !globalVariables.editMode && !vote.onEdit" ng-click="editVote(vote)"> + <span class="glyphicon glyphicon-pencil"></span> + </button> + <button class="btn btn-danger" ng-if="vote.permission && !globalVariables.editMode && !vote.onEdit" ng-click="deleteVote(vote)"> + <span class="glyphicon glyphicon-trash"></span> + </button> </td> </tr> <!-- end print vote --> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.