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 6f8d6e683ad6f229e02cb3c5b031022400a14e8e Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Fri Aug 29 11:29:36 2014 +0200 add view Profile --- pollen-ui-angular/bower.json | 2 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 3 ++- pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 ++- .../webapp/partials/user-edit-editProfile.html | 4 ++-- .../webapp/partials/user-edit-viewProfile.html | 22 +++++++++++++++++++++- 5 files changed, 28 insertions(+), 6 deletions(-) diff --git a/pollen-ui-angular/bower.json b/pollen-ui-angular/bower.json index 33e2c02..b8fdb75 100644 --- a/pollen-ui-angular/bower.json +++ b/pollen-ui-angular/bower.json @@ -22,7 +22,7 @@ "jqplot-bower": "1.0.8", "moment": "2.8.1", "bootstrap-datetimepicker": "dralagen/bootstrap-datetimepicker#3.1.3", - "font-awesome": "4.1.0" + "font-awesome": "4.2.0" }, "devDependencies": { "angular-mocks": "1.2.23" diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index 84c91c3..fb221b5 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -49,8 +49,9 @@ var translateEN = { 'user.listPollInvited' : 'Invited Poll', 'user.name' : 'Name', -'user.myName' : 'Name', +'user.myName' : 'Your name', 'user.mail' : 'e-mail', +'user.myMail' : 'Your e-mail', 'user.isAdmin' : 'Is an administrator', 'user.password' : 'Password', 'user.password2' : 'Confirm', diff --git a/pollen-ui-angular/src/main/webapp/i18n/fr.js b/pollen-ui-angular/src/main/webapp/i18n/fr.js index ef25a97..18f44db 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -49,8 +49,9 @@ var translateFR = { 'user.listPollInvited' : 'Sondage invité', 'user.name' : 'Nom d\'utilisateur', -'user.myName' : 'Votre Nom', +'user.myName' : 'Votre nom d\'utilisateur', 'user.mail' : 'Courriel', +'user.myMail' : 'Votre Courriel', 'user.isAdmin' : 'Est Administrateur', 'user.password' : 'Mot de passe', 'user.password2' : 'Confirmation', diff --git a/pollen-ui-angular/src/main/webapp/partials/user-edit-editProfile.html b/pollen-ui-angular/src/main/webapp/partials/user-edit-editProfile.html index c7ff71d..975fb61 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit-editProfile.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit-editProfile.html @@ -23,7 +23,7 @@ <form class="form-horizontal"> <div class="control-group row"> <label for="formName" class="col-sm-5 text-right control-label"> - {{ 'user.name' | translate }} + {{ 'user.myName' | translate }} </label> <div class="col-sm-6"> <input type="text" id="formName" class="form-control" ng-model="data.user.name" auto-save="editUser()" /> @@ -35,7 +35,7 @@ <div class="control-group row"> <label for="formEmail" class="col-sm-5 text-right control-label"> - {{ 'user.mail' | translate }} + {{ 'user.myMail' | translate }} </label> <div class="col-sm-6"> 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 index e01a1fd..dcae714 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit-viewProfile.html @@ -1,4 +1,24 @@ -<div class="control-group row"> +<div class="row"> + <div class="col-sm-5 text-right">{{ 'user.myName' | translate }}</div> + <div class="col-sm-7"> + {{ data.user.name || data.user.email }} + </div> +</div> + +<div class="row"> + <div class="col-sm-5 text-right">{{ 'user.myMail' | translate }}</div> + <div class="col-sm-7"> + {{ data.user.email }} + </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="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> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.