[pollen] branch feature/1065-editUserPage created (now 4fa505d)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1065-editUserPage in repository pollen. See http://git.chorem.org/pollen.git at 4fa505d separate differente form in user profile page This branch includes the following new commits: new 4fa505d separate differente form in user profile page The 1 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 4fa505dba95f22c3073aed828c42264257ebec56 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 27 18:30:23 2014 +0200 separate differente form in user profile page -- 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 feature/1065-editUserPage in repository pollen. See http://git.chorem.org/pollen.git commit 4fa505dba95f22c3073aed828c42264257ebec56 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Aug 27 18:30:23 2014 +0200 separate differente form in user profile page --- pollen-ui-angular/src/main/webapp/i18n/en.js | 3 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 + .../src/main/webapp/js/controllers/userCtrl.js | 18 +++-- .../{user-edit.html => user-edit-editProfile.html} | 43 +--------- .../{user-edit.html => user-edit-password.html} | 42 ---------- .../webapp/partials/user-edit-viewProfile.html | 6 ++ .../src/main/webapp/partials/user-edit.html | 94 ++-------------------- 7 files changed, 32 insertions(+), 177 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index d0a9353..84c91c3 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -71,6 +71,9 @@ 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.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 --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index c4a82b8..ef25a97 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -71,6 +71,9 @@ 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.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', diff --git a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js index 144df17..d88068c 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -94,6 +94,8 @@ angular.module('userControllers', []) function ($scope, $rootScope, $routeParams, $route, $location, $translate, User, SessionStorage, Page) { Page.setTitle('title.user.edit'); + $scope.tab = "viewProfile"; + if (angular.isUndefined($scope.data)) { $scope.data = {user:{}}; } @@ -110,13 +112,15 @@ angular.module('userControllers', []) $scope.data.user.newPassword2 = ''; $scope.editUser = function () { - User.update($scope.data.user, function (data) { - SessionStorage.save({user:data}); - $rootScope.$broadcast('editUser'); - $rootScope.$broadcast('newSuccess', 'user.edit.success'); - }, function (error) { - $scope.restError = error.data; - }); + if ($scope.data.user.name != SessionStorage.get().user.name || $scope.data.user.email != SessionStorage.get().user.email) { + User.update($scope.data.user, function (data) { + SessionStorage.save({user: data}); + $rootScope.$broadcast('editUser'); + $rootScope.$broadcast('newSuccess', 'user.edit.success'); + }, function (error) { + $scope.restError = error.data; + }); + } }; $scope.editPassword = function () { diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit-editProfile.html similarity index 58% copy from pollen-ui-angular/src/main/webapp/partials/user-edit.html copy to pollen-ui-angular/src/main/webapp/partials/user-edit-editProfile.html index 1dd40a3..c7ff71d 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit-editProfile.html @@ -46,40 +46,6 @@ </div> </div> -</form> - - -<div class="row"> - <div class="col-sm-2"></div> - <div class="col-sm-9"><hr/></div> - <div class="col-sm-1"></div> -</div> - -<form class="form-horizontal"> - <div class="control-group row"> - <label for="formNewPassword" class="col-sm-5 text-right control-label"> - {{ 'user.passwordNew' | translate }} - </label> - <div class="col-sm-6"> - <input type="password" id="formNewPassword" class="form-control" ng-model="data.user.newPassword" auto-save="editPassword()"/> - </div> - <div class="col-sm-1"> - <info-error error="restError.newPassword[0]" data="data.user.newPassword" append-class="fa-2x"></info-error> - </div> - </div> - - <div class="control-group row"> - <label for="formNewPassword2" class="col-sm-5 text-right control-label"> - {{ 'user.password2' | translate }} - </label> - <div class="col-sm-6"> - <input type="password" id="formNewPassword2" class="form-control" ng-model="data.user.newPassword2" auto-save="editPassword()"/> - </div> - <div class="col-sm-1"> - <span class="fa fa-info-error fa-2x danger" tooltip="{{ 'user.error.password.diff' | translate }}" ng-if="data.user.newPassword != data.user.newPassword2"></span> - </div> - </div> - <div class="row"> <div class="col-sm-2"></div> <div class="col-sm-9"><hr/></div> @@ -91,18 +57,11 @@ {{ 'user.passwordCurrent' | translate }} </label> <div class="col-sm-6"> - <input type="password" id="formCurrentPassword" class="form-control" ng-model="data.user.password" auto-save="editPassword()" /> + <input type="password" id="formCurrentPassword" class="form-control" ng-model="data.user.password" auto-save="editUser()" /> </div> <div class="col-sm-1"> <info-error error="restError.password[0]" data="data.user.password" append-class="fa-2x"></info-error> </div> </div> - <div class="control-group row"> - <div class="col-sm-5"></div> - <div class="col-sm-7"> - <button class="btn btn-warning" ng-click="disableUser()"><span class="fa fa-ban"></span> {{ 'user.disableMe' | translate }}</button> - </div> - </div> - </form> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit-password.html similarity index 67% copy from pollen-ui-angular/src/main/webapp/partials/user-edit.html copy to pollen-ui-angular/src/main/webapp/partials/user-edit-password.html index 1dd40a3..b63f1f6 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit-password.html @@ -22,41 +22,6 @@ <form class="form-horizontal"> <div class="control-group row"> - <label for="formName" class="col-sm-5 text-right control-label"> - {{ 'user.name' | translate }} - </label> - <div class="col-sm-6"> - <input type="text" id="formName" class="form-control" ng-model="data.user.name" auto-save="editUser()" /> - </div> - <div class="col-sm-1"> - </div> - </div> - - <div class="control-group row"> - - <label for="formEmail" class="col-sm-5 text-right control-label"> - {{ 'user.mail' | translate }} - </label> - - <div class="col-sm-6"> - <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email" auto-save="editUser()" /> - </div> - <div class="col-sm-1"> - <info-error error="restError.email[0]" data="data.user.email" append-class="fa-2x"></info-error> - </div> - </div> - -</form> - - -<div class="row"> - <div class="col-sm-2"></div> - <div class="col-sm-9"><hr/></div> - <div class="col-sm-1"></div> -</div> - -<form class="form-horizontal"> - <div class="control-group row"> <label for="formNewPassword" class="col-sm-5 text-right control-label"> {{ 'user.passwordNew' | translate }} </label> @@ -98,11 +63,4 @@ </div> </div> - <div class="control-group row"> - <div class="col-sm-5"></div> - <div class="col-sm-7"> - <button class="btn btn-warning" ng-click="disableUser()"><span class="fa fa-ban"></span> {{ 'user.disableMe' | translate }}</button> - </div> - </div> - </form> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html b/pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html new file mode 100644 index 0000000..e01a1fd --- /dev/null +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html @@ -0,0 +1,6 @@ +<div class="control-group row"> + <div class="col-sm-5"></div> + <div class="col-sm-7"> + <button class="btn btn-warning" ng-click="disableUser()"><span class="fa fa-ban"></span> {{ 'user.disableMe' | translate }}</button> + </div> +</div> \ No newline at end of file diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html index 1dd40a3..0fc0e59 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -18,91 +18,13 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<h2> {{ 'title.user.edit' | translate }} </h2> -<form class="form-horizontal"> - <div class="control-group row"> - <label for="formName" class="col-sm-5 text-right control-label"> - {{ 'user.name' | translate }} - </label> - <div class="col-sm-6"> - <input type="text" id="formName" class="form-control" ng-model="data.user.name" auto-save="editUser()" /> - </div> - <div class="col-sm-1"> - </div> - </div> +<ul class="nav nav-tabs"> + <li ng-class="{active : tab == 'viewProfile'}"><a href="/#/user/edit" ng-click="tab = 'viewProfile'">{{ 'user.tab.viewProfile' | translate }}</a></li> + <li ng-class="{active : tab == 'editProfile'}"><a href="/#/user/edit" ng-click="tab = 'editProfile'">{{ 'user.tab.editProfile' | translate }}</a></li> + <li ng-class="{active : tab == 'editPassword'}"><a href="/#/user/edit" ng-click="tab = 'editPassword'">{{ 'user.tab.editPassword' | translate }}</a></li> +</ul> - <div class="control-group row"> - - <label for="formEmail" class="col-sm-5 text-right control-label"> - {{ 'user.mail' | translate }} - </label> - - <div class="col-sm-6"> - <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email" auto-save="editUser()" /> - </div> - <div class="col-sm-1"> - <info-error error="restError.email[0]" data="data.user.email" append-class="fa-2x"></info-error> - </div> - </div> - -</form> - - -<div class="row"> - <div class="col-sm-2"></div> - <div class="col-sm-9"><hr/></div> - <div class="col-sm-1"></div> -</div> - -<form class="form-horizontal"> - <div class="control-group row"> - <label for="formNewPassword" class="col-sm-5 text-right control-label"> - {{ 'user.passwordNew' | translate }} - </label> - <div class="col-sm-6"> - <input type="password" id="formNewPassword" class="form-control" ng-model="data.user.newPassword" auto-save="editPassword()"/> - </div> - <div class="col-sm-1"> - <info-error error="restError.newPassword[0]" data="data.user.newPassword" append-class="fa-2x"></info-error> - </div> - </div> - - <div class="control-group row"> - <label for="formNewPassword2" class="col-sm-5 text-right control-label"> - {{ 'user.password2' | translate }} - </label> - <div class="col-sm-6"> - <input type="password" id="formNewPassword2" class="form-control" ng-model="data.user.newPassword2" auto-save="editPassword()"/> - </div> - <div class="col-sm-1"> - <span class="fa fa-info-error fa-2x danger" tooltip="{{ 'user.error.password.diff' | translate }}" ng-if="data.user.newPassword != data.user.newPassword2"></span> - </div> - </div> - - <div class="row"> - <div class="col-sm-2"></div> - <div class="col-sm-9"><hr/></div> - <div class="col-sm-1"></div> - </div> - - <div class="control-group row"> - <label for="formCurrentPassword" class="col-sm-5 text-right control-label"> - {{ 'user.passwordCurrent' | translate }} - </label> - <div class="col-sm-6"> - <input type="password" id="formCurrentPassword" class="form-control" ng-model="data.user.password" auto-save="editPassword()" /> - </div> - <div class="col-sm-1"> - <info-error error="restError.password[0]" data="data.user.password" append-class="fa-2x"></info-error> - </div> - </div> - - <div class="control-group row"> - <div class="col-sm-5"></div> - <div class="col-sm-7"> - <button class="btn btn-warning" ng-click="disableUser()"><span class="fa fa-ban"></span> {{ 'user.disableMe' | translate }}</button> - </div> - </div> - -</form> +<div ng-include="'partials/user-edit-viewProfile.html'" ng-if="tab == 'viewProfile'" class="anim-fade"></div> +<div ng-include="'partials/user-edit-editProfile.html'" ng-if="tab == 'editProfile'" class="anim-fade"></div> +<div ng-include="'partials/user-edit-password.html'" ng-if="tab == 'editPassword'" class="anim-fade"></div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm