01/01: fix print error in register and voter name, edit text for login error, Force charset utf-8
This is an automated email from the git hooks/post-receive script. unknown user pushed a commit to branch devel in repository Pollen. commit 6e0b4142fa9ebdd0ec50ca61521aa0a00c2c6ca3 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed May 21 14:40:46 2014 +0200 fix print error in register and voter name, edit text for login error, Force charset utf-8 --- pollen-ui-angular/src/main/webapp/index.html | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 2 +- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/user-login.html | 2 +- .../src/main/webapp/partials/user-register.html | 36 +++++++++++++--------- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/index.html b/pollen-ui-angular/src/main/webapp/index.html index 70f9b0f..63a7910 100644 --- a/pollen-ui-angular/src/main/webapp/index.html +++ b/pollen-ui-angular/src/main/webapp/index.html @@ -22,6 +22,7 @@ <html lang="en" ng-app="pollen"> <head> <title>Pollen</title> + <meta chaset="utf-8" /> <link href="http://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css" rel="stylesheet"/> <link rel="stylesheet" href="css/style.css"/> 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 6857fa7..87a3a70 100644 --- a/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js +++ b/pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js @@ -50,7 +50,7 @@ }) SessionStorage.save({'token':data.permission}); }, function (error) { - $scope.restError = {connexion : "Utilisateur ou Mot de passe faux"}; + $scope.restError = {connexion : "Erreur sur le nom d'utilisateur ou le mot de passe"}; }); delete $scope.data.user; } 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 b3d0f9d..9decf83 100644 --- a/pollen-ui-angular/src/main/webapp/partials/inline-poll.html +++ b/pollen-ui-angular/src/main/webapp/partials/inline-poll.html @@ -52,7 +52,7 @@ <tr ng-show="!globalVariables.editMode"> <td class="pollChoice"> <input type="text" class="form-control" placeholder="votre nom" ng-model="data.vote.voterName" /> - <info-error error="data.vote.restError.voterName" data="data.vote.voteName"></info-error> + <info-error error="data.vote.restError.voterName[0]" data="data.vote.voteName"></info-error> </td> <td ng-repeat="choice in data.vote.choice" class="pollChoice"> <input type="checkbox" name="{{choice.choiceId}}" ng-model="choice.voteValue" /> diff --git a/pollen-ui-angular/src/main/webapp/partials/user-login.html b/pollen-ui-angular/src/main/webapp/partials/user-login.html index 01c7d11..a14be4c 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-login.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-login.html @@ -2,7 +2,7 @@ <div class="control-group"> <label class="control-label"> - Utilisateur + Nom d'Utilisateur <info-error error="restError.connexion" data="data.user"></info-error> </label> <input type="text" name='login' ng-model="data.user.login" class="form-control"/> 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 3557b89..5d0d583 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -18,49 +18,57 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<div> + <h2> Inscription sur Pollen</h2> + <br/><br/><br/> <form ng-submit="submit()" class="form-horizontal"> <div class="form-group"> - <label for="formName" class="col-sm-4 text-right"> - Nom d'utilisateur : - <info-error error="restError.login[0]" data="data.user.login"></info-error> + <label for="formName" class="col-sm-3 text-right"> + Nom d'utilisateur </label> <div class="col-sm-8"> <input type="text" id="formName" 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> + </div> </div> <div class="form-group"> - <label for="formEmail" class="col-sm-4 text-right"> - E-Mail : - <info-error error="restError.email[0]" data="data.user.email"></info-error> + + <label for="formEmail" class="col-sm-3 text-right"> + Adresse E-Mail </label> + <div class="col-sm-8"> <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="form-group"> - <label for="formPassword" class="col-sm-4 text-right"> - Mot de passe : + <label for="formPassword" class="col-sm-3 text-right"> + Mot de passe </label> <div class="col-sm-8"> <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> </div> <div class="form-group"> - <label for="formPassword2" class="col-sm-4 text-right"> - Confirmation : - <span class="glyphicon glyphicon-exclamation-sign danger" tooltip="Mot de passe différent" ng-if="data.user.password != data.user.password2"></span> + <label for="formPassword2" class="col-sm-3 text-right"> + Confirmation </label> <div class="col-sm-8"> <input type="password" id="formPassword2" name="password2" class="form-control" ng-model="data.user.password2"/> </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 class="form-group"> <button class="btn btn-primary" type="submit">Envoyer</button> </div> - </form> -</div> \ No newline at end of file + </form> \ 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