This is an automated email from the git hooks/post-receive script. New commit to branch devel in repository Pollen. See http://git.None/Pollen.git commit a66900491967d2985e5bbe19c938c2f6743203f5 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed May 28 17:59:35 2014 +0200 beautifull form for register --- .../src/main/webapp/partials/user-register.html | 54 +++++++++++++++------- 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/partials/user-register.html b/pollen-ui-angular/src/main/webapp/partials/user-register.html index 982c6fc..c658c84 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -21,11 +21,11 @@ <h2> Inscription sur Pollen</h2> <form ng-submit="submit()" class="form-horizontal"> <div class="control-group"> - <label for="formName" class="col-sm-5 text-right control-label"> - Nom d'utilisateur + <label for="formLogin" class="col-sm-5 text-right control-label"> + Identifiant </label> <div class="col-sm-6"> - <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.login"/> + <input type="text" id="formLogin" name="login" class="form-control" ng-model="data.user.login"/> </div> <div class="col-sm-1"> <info-error error="restError.login[0]" data="data.user.login"></info-error> @@ -33,39 +33,61 @@ </div> <div class="control-group"> - - <label for="formEmail" class="col-sm-5 text-right control-label"> - Adresse E-Mail + <label for="formPassword" class="col-sm-5 text-right control-label"> + Mot de passe </label> - <div class="col-sm-6"> - <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> + <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> + </div> + </div> + <div class="control-group"> + <label for="formPassword2" class="col-sm-5 text-right control-label"> + Confirmation + </label> + <div class="col-sm-6"> + <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> </div> <div class="col-sm-1"> - <info-error error="restError.email[0]" data="data.user.email"></info-error> + <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> </div> </div> + <div> + <div class="col-sm-3"></div> + <div class="col-sm-8"><hr/></div> + <div class="col-sm-1"></div> + </div> + <div class="control-group"> - <label for="formPassword" class="col-sm-5 text-right control-label"> - Mot de passe + + <label for="formEmail" class="col-sm-5 text-right control-label"> + Courriel </label> + <div class="col-sm-6"> - <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> + <input type="email" id="formEmail" name="email" class="form-control" ng-model="data.user.email"/> + </div> + <div class="col-sm-1"> + <info-error error="restError.email[0]" data="data.user.email"></info-error> </div> </div> + <div class="control-group"> - <label for="formPassword2" class="col-sm-5 text-right control-label"> - Confirmation + <label for="formName" class="col-sm-5 text-right control-label"> + Nom d'utilisateur </label> <div class="col-sm-6"> - <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> + <input type="text" id="formName" name="login" class="form-control" ng-model="data.user.name"/> </div> <div class="col-sm-1"> - <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> </div> </div> + <div> + <div class="col-sm-3"></div> + <div class="col-sm-8"><hr /></div> + <div class="col-sm-1"></div> + </div> <div class="control-group"> <div class="col-sm-5"></div> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.