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 4c238640108017eccdb1dc19020951b68beba0e6 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jun 18 17:35:15 2014 +0200 some update in style and translate --- 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/partials/inline-poll.html | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-comment.html | 11 ++++++----- .../src/main/webapp/partials/poll-listParticipant.html | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index f878922..e0338f4 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -69,6 +69,7 @@ var translateEN = { 'action.return' : 'Return', 'action.cancel' : 'Cancel', 'action.save' : 'Save', +'action.edit' : 'Edit', 'action.delete' : 'Delete', 'action.vote' : 'Vote', 'action.comment' : 'Comment', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index f710b33..8ce94c4 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -69,6 +69,7 @@ var translateFR = { 'action.return' : 'Retour', 'action.cancel' : 'Annuler', 'action.save' : 'Sauvegarder', +'action.edit' : 'Modifier', 'action.delete' : 'Supprimer', 'action.vote' : 'Voter', 'action.comment' : 'Commenter', 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 5062f76..43b92ee 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -71,7 +71,7 @@ </td> <td> <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> + <button class="btn btn-danger" ng-if="vote.permission && !globalVariables.editMode" ng-click="deleteVote(vote)"><span class="glyphicon glyphicon-trash"></span></button> </td> </tr> <!-- end print vote --> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html index 2186408..978c2b7 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -45,7 +45,8 @@ <div class="form-group"> <div class="col-sm-3"> </div> <div class="col-sm-9"> - <input type="submit" class="btn btn-primary" value="{{ 'action.comment' | translate }}" /> + <button type="submit" class="btn btn-primary" ng-hide="comment.id"><span class="glyphicon glyphicon-save"></span> {{ 'action.comment' | translate }}</button> + <button type="submit" class="btn btn-primary" ng-show="comment.id"><span class="glyphicon glyphicon-save"></span> {{ 'action.edit' | translate }}</button> </div> </div> </form> @@ -55,10 +56,10 @@ <table id="comments"> <tr ng-repeat="comment in data.comments"> <td> - <i class="glyphicon glyphicon-user"></i>{{comment.authorName}}<br/> - <i class="glyphicon glyphicon-calendar"></i>{{comment.postDate | date:globalVariables.dateFormat}}<br/> - <i class="glyphicon glyphicon-pencil fakeLink" ng-show="comment.id" ng-click="editPost(comment)"></i> - <i class="glyphicon glyphicon-remove danger fakeLink" ng-show="comment.id" ng-click="deletePost(comment)"></i> + <span class="glyphicon glyphicon-user"></span>{{comment.authorName}}<br/> + <span class="glyphicon glyphicon-calendar"></span>{{comment.postDate | date:globalVariables.dateFormat}}<br/> + <a class="fakeLink" ng-click="editPost(comment)"><span class="glyphicon glyphicon-pencil" ng-show="comment.id"></span></a> + <a class="fakeLink" ng-click="deletePost(comment)"><span class="glyphicon glyphicon-trash danger" ng-show="comment.id"></span></a> </td> <td> <div ng-bind-html="toHTML(comment.text)"></div> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html index a34bdba..db05d20 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -55,7 +55,7 @@ <td> <div ng-class="{'has-error':member.restError.name}"><input type="text" ng-model="member.name" class="form-control" auto-save="saveVoterListMember(member, voterList)"/></div></td> <td> <div ng-class="{'has-error':member.restError.email}"><input type="text" ng-model="member.email" class="form-control" auto-save="saveVoterListMember(member, voterList)" /></div></td> <td class="weight"> <div ng-class="{'has-error':member.restError.weight}"><input type="number" ng-model="member.weight" select-on-click class="form-control" auto-save="saveVoterListMember(member, voterList)"/></div></td> - <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);"><i class="glyphicon glyphicon-remove"></i></button></div></td> + <td class="action"> <div ng-show="member.id"><button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);"><span class="glyphicon glyphicon-trash"></span></button></div></td> </tr> <tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.