This is an automated email from the git hooks/post-receive script. New commit to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git commit fe0076d40d5135764ee00082e9fb7fb6fb8fd1aa Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed Jul 23 17:06:46 2014 +0200 add button 'Disable Me' in edit user profil --- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/partials/user-edit.html | 16 +++++++++++++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/pollen-ui-angular/src/main/webapp/i18n/en.js b/pollen-ui-angular/src/main/webapp/i18n/en.js index bade830..96817f0 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/en.js +++ b/pollen-ui-angular/src/main/webapp/i18n/en.js @@ -38,6 +38,7 @@ var translateEN = { 'user.edit.success' : 'Save with success', 'user.forgotPassword.success' : 'Password send by email', 'user.favoriteList' : 'Favorite list', +'user.disableMe' : 'Disable me', '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 dc11690..ad63d5e 100644 --- a/pollen-ui-angular/src/main/webapp/i18n/fr.js +++ b/pollen-ui-angular/src/main/webapp/i18n/fr.js @@ -38,6 +38,7 @@ var translateFR = { 'user.edit.success' : 'Modification effectuée..', 'user.forgotPassword.success' : 'Un mail de changement de mot de passe vient d\'être envoyé..', 'user.favoriteList' : 'Liste de Diffusion Favorite', +'user.disableMe' : 'Désactiver mon compte', '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/partials/user-edit.html b/pollen-ui-angular/src/main/webapp/partials/user-edit.html index 15fdd66..7a24223 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-edit.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-edit.html @@ -61,7 +61,7 @@ </form> -<div> +<div class="row"> <div class="col-sm-2"></div> <div class="col-sm-9"><hr/></div> <div class="col-sm-1"></div> @@ -103,4 +103,18 @@ <span class="glyphicon glyphicon-exclamation-sign 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="row"> + <div class="col-sm-5"></div> + <div class="col-sm-7"> + <button class="btn btn-warning" ng-click="disableUser()"><span class="glyphicon glyphicon-ban-circle"></span> {{ 'user.disableMe' | translate }}</button> + </div> + </div> + </form> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.