[pollen] branch develop updated (77569dc -> 850b979)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 77569dc fixes #1088 remove invalid date message adds 4fa505d separate differente form in user profile page adds 6f8d6e6 add view Profile new beb223b fixes #1065 new 850b979 change icon delete The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 850b9795aa67e5ec6c3e2194ae21570fac4bbc8e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 11:43:42 2014 +0200 change icon delete commit beb223be8083c4c2c25cf8273f9b371642d678c5 Merge: 77569dc 6f8d6e6 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 11:32:58 2014 +0200 fixes #1065 Merge branch 'feature/1065-editUserPage' into develop Conflicts: pollen-ui-angular/src/main/webapp/i18n/en.js pollen-ui-angular/src/main/webapp/i18n/fr.js Summary of changes: pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 6 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 6 +- .../src/main/webapp/js/controllers/userCtrl.js | 18 +++-- .../main/webapp/partials/favoriteList-edit.html | 4 +- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/poll-comment.html | 2 +- .../src/main/webapp/partials/poll-link.html | 2 +- .../src/main/webapp/partials/poll-list.html | 2 +- .../main/webapp/partials/poll-listParticipant.html | 4 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/user-admin-list.html | 2 +- .../{user-edit.html => user-edit-editProfile.html} | 47 +---------- .../{user-edit.html => user-edit-password.html} | 42 ---------- .../webapp/partials/user-edit-viewProfile.html | 26 ++++++ .../src/main/webapp/partials/user-edit.html | 94 ++-------------------- 16 files changed, 69 insertions(+), 192 deletions(-) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-editProfile.html} (56%) copy pollen-ui-angular/src/main/webapp/partials/{user-edit.html => user-edit-password.html} (67%) create mode 100644 pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 beb223be8083c4c2c25cf8273f9b371642d678c5 Merge: 77569dc 6f8d6e6 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 11:32:58 2014 +0200 fixes #1065 Merge branch 'feature/1065-editUserPage' into develop Conflicts: pollen-ui-angular/src/main/webapp/i18n/en.js pollen-ui-angular/src/main/webapp/i18n/fr.js pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 6 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 6 +- .../src/main/webapp/js/controllers/userCtrl.js | 18 +++-- .../{user-edit.html => user-edit-editProfile.html} | 47 +---------- .../{user-edit.html => user-edit-password.html} | 42 ---------- .../webapp/partials/user-edit-viewProfile.html | 26 ++++++ .../src/main/webapp/partials/user-edit.html | 94 ++-------------------- 8 files changed, 59 insertions(+), 182 deletions(-) diff --cc pollen-ui-angular/src/main/webapp/i18n/en.js index df98f17,fb221b5..dbd9b1d --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@@ -71,7 -72,9 +72,10 @@@ var translateEN = 'user.generatePassword.success' : 'E-mail send with new password', 'user.validate.success' : 'You just validate you email, you can login now', 'user.validate.error' : 'Email already validate or invalid', + 'user.tab.viewProfile' : 'View profile', + 'user.tab.editProfile' : 'Edit profile', + 'user.tab.editPassword' : 'Edit Password', +'user.warning.emailNotValidate' : 'Your don\'t have validate your email', 'user.error.password.diff' : 'Passwords not equal', 'user.error.mail.notFound' : 'E-mail not found', 'user.error.mail.empty' : 'E-mail can not be empty', diff --cc pollen-ui-angular/src/main/webapp/i18n/fr.js index cf535bb,18f44db..fa54213 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@@ -71,7 -72,9 +72,10 @@@ var translateFR = 'user.generatePassword.success' : 'Un mail avec le nouveau mot de passe vient d\'être envoyé..', 'user.validate.success' : 'Vous venez de valider votre courriel, connectez-vous dès maintenants.', 'user.validate.error' : 'Erreur lors de la validation, courriel déjà validé ou invalide', + 'user.tab.viewProfile' : 'Voir son profile', + 'user.tab.editProfile' : 'Modifier son profile', + 'user.tab.editPassword' : 'Modifier son Password', +'user.warning.emailNotValidate' : 'Vous n\'avez pas validé votre email', 'user.error.password.diff' : 'Mot de passe différent', 'user.error.mail.notFound' : 'Courriel n\'a pas été trouvé', 'user.error.mail.empty' : 'Courriel ne peux pas être vide', -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 850b9795aa67e5ec6c3e2194ae21570fac4bbc8e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 11:43:42 2014 +0200 change icon delete --- pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html | 4 ++-- pollen-ui-angular/src/main/webapp/partials/inline-poll.html | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-comment.html | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-link.html | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-list.html | 2 +- pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html | 4 ++-- pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html | 2 +- pollen-ui-angular/src/main/webapp/partials/user-admin-list.html | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html index cc434bb..5e93c2d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/favoriteList-edit.html @@ -53,7 +53,7 @@ <input type="text" ng-model="member.email" class="form-control" auto-save="saveMember(member)" /> </input-error> </td> - <td class="action"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="fa fa-trash-o"></span></button></td> + <td class="action"><button class="btn btn-danger" ng-click="deleteMember(member);" tooltip="{{ 'action.favoriteList.deleteMember' | translate }} "><span class="fa fa-trash"></span></button></td> </tr> <tr> @@ -68,7 +68,7 @@ <th class="cell-lg" colspan="3"> <div> <button class="btn btn-info" ng-click="addMember();"><span class="fa fa-plus"></span> {{ 'action.favoriteList.addMember' | translate }} </button> - <button class="btn btn-danger" ng-click="deleteFavoriteList();"><span class="fa fa-trash-o"></span> {{ 'action.favoriteList.delete' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteFavoriteList();"><span class="fa fa-trash"></span> {{ 'action.favoriteList.delete' | translate }} </button> </div> <div> <import-csv fv-id="data.favoriteList.id" ng-if="data.favoriteList.id"></import-csv> 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 822f7da..54727b5 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -139,7 +139,7 @@ <span class="fa fa-edit"></span> </button> <button class="btn btn-danger" ng-if="vote.permission && !globalVariables.editMode && !vote.onEdit" ng-click="deleteVote(vote)"> - <span class="fa fa-trash-o"></span> + <span class="fa fa-trash"></span> </button> </div> </td> 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 1f90e43..890d99c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-comment.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-comment.html @@ -82,7 +82,7 @@ <span class="fa fa-pencil-square-o" ng-show="comment.id"></span> </a> <a class="fakeLink" ng-click="deletePost(comment)" ng-if="comment.permission" title="{{ 'comment.delete' | translate }}"> - <span class="fa fa-trash-o danger" ng-show="comment.id"></span> + <span class="fa fa-trash danger" ng-show="comment.id"></span> </a> </td> <td> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-link.html b/pollen-ui-angular/src/main/webapp/partials/poll-link.html index 5814ee3..bc06d02 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-link.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-link.html @@ -84,7 +84,7 @@ <li> <a class="fakeLink danger" href="" ng-click="deletePoll()"> - <span class="fa fa-trash-o" title="{{ 'poll.link.delete' | translate }}"></span> + <span class="fa fa-trash" title="{{ 'poll.link.delete' | translate }}"></span> <span class="text">{{ 'poll.link.delete' | translate }}</span> </a> </li> 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 79bb9d7..563694d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-list.html @@ -38,7 +38,7 @@ <button class="btn btn-default" ng-click="selectAll()"><span class="fa fa-check-square-o"></span> {{ 'action.selectAll' | translate }}</button> <button class="btn btn-default" ng-click="unselectAll()"><span class="fa fa-square-o"></span> {{ 'action.unselectAll' | translate }}</button> <button class="btn btn-default" ng-click="toggleSelectAll()"><span class="fa fa-check-square"></span> {{ 'action.toggleSelectAll' | translate }}</button> - <button class="btn btn-danger" ng-click="deleteSelected()" ng-if="globalVariables.hasAllRight"><span class="fa fa-trash-o"></span> {{ 'action.deleteSelected' | translate }}</button> + <button class="btn btn-danger" ng-click="deleteSelected()" ng-if="globalVariables.hasAllRight"><span class="fa fa-trash"></span> {{ 'action.deleteSelected' | translate }}</button> </td> </tr> </table> 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 28e2af5..d65d418 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-listParticipant.html @@ -104,14 +104,14 @@ </input-error> </td> <td class="action"> - <button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);" tooltip="{{ 'action.restricted.deleteVoter' | translate }}"><span class="fa fa-trash-o"></span></button> + <button class="btn btn-danger" ng-click="deleteVoterListMember(member, voterList);" tooltip="{{ 'action.restricted.deleteVoter' | translate }}"><span class="fa fa-trash"></span></button> </td> </tr> <tr> <th colspan="4"> <button class="btn btn-info" ng-click="addVoter($index);"> <span class="fa fa-plus"></span> {{ 'action.restricted.addVoter' | translate }} </button> - <button class="btn btn-danger" ng-click="deleteVoterList(voterList);"> <span class="fa fa-trash-o"></span> {{ 'action.restricted.deleteGroup' | translate }} </button> + <button class="btn btn-danger" ng-click="deleteVoterList(voterList);"> <span class="fa fa-trash"></span> {{ 'action.restricted.deleteGroup' | translate }} </button> <button class="btn btn-info" ng-click="importFavoriteList(voterList)" ng-if="data.favoriteList"><span class="fa fa-save"></span> {{ 'action.favoriteList.import.inGroup' | translate }}</button> </th> </tr> diff --git a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html index 15c617f..0784d8d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html +++ b/pollen-ui-angular/src/main/webapp/partials/poll-popupChoice.html @@ -69,7 +69,7 @@ </div> </div> <div class="modal-footer"> - <button type="button" class="btn btn-danger" ng-if="choice.choiceIsDeletable" ng-click="deleteChoice(choice)"><span class="fa fa-trash-o"></span> Supprimer</button> + <button type="button" class="btn btn-danger" ng-if="choice.choiceIsDeletable" ng-click="deleteChoice(choice)"><span class="fa fa-trash"></span> Supprimer</button> <button type="button" class="btn btn-default" ng-click="cancelChoice()"><span class="fa fa-remove"></span> Annuler</button> <button type="button" class="btn btn-primary" ng-click="saveChoice()"><span class="fa fa-save"></span> Sauvegarder</button> </div> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html b/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html index fc8e7d5..ced5a98 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-admin-list.html @@ -45,7 +45,7 @@ <td class="action"> <button class="btn btn-warning" ng-click="generatePassword(user)" title="{{ 'user.generatePassword' | translate}}"> <span class="fa fa-refresh"></span> </button> <button class="btn btn-warning" ng-click="banUser(user)" ng-disabled="user.isDisabled" title="{{ 'user.disableUser' | translate}}"> <span class="fa fa-ban"></span> </button> - <button class="btn btn-danger" ng-click="deleteUser(user)" title="{{ 'action.delete' | translate}}"> <span class="fa fa-trash-o"></span> </button> + <button class="btn btn-danger" ng-click="deleteUser(user)" title="{{ 'action.delete' | translate}}"> <span class="fa fa-trash"></span> </button> </td> </tr> <tr> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm