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 a3c9015b438fa9d1bd258096100639fe88c89fb4 Author: Adrien Garandel <a.garandel@dralagen.fr> Date: Wed May 28 15:51:36 2014 +0200 change favoriteDefaultPageSize to favoriteListDefaultPageSize --- pollen-ui-angular/src/main/webapp/js/conf.js.exemple | 4 ++-- .../src/main/webapp/partials/user-register.html | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple index 1291f2c..adcbae6 100644 --- a/pollen-ui-angular/src/main/webapp/js/conf.js.exemple +++ b/pollen-ui-angular/src/main/webapp/js/conf.js.exemple @@ -8,6 +8,6 @@ var conf = { // Comment number per page commentDefaultPageSize : 10, - // Favorite poll number per page - favoriteDefaultPageSize : 15, + // Favorite list number per page + favoriteListDefaultPageSize : 15, } \ No newline at end of file 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 5d0d583..81cf1c3 100644 --- a/pollen-ui-angular/src/main/webapp/partials/user-register.html +++ b/pollen-ui-angular/src/main/webapp/partials/user-register.html @@ -21,8 +21,8 @@ <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-3 text-right"> + <div class="control-group"> + <label for="formName" class="col-sm-3 text-right control-label"> Nom d'utilisateur </label> <div class="col-sm-8"> @@ -33,9 +33,9 @@ </div> </div> - <div class="form-group"> + <div class="control-group"> - <label for="formEmail" class="col-sm-3 text-right"> + <label for="formEmail" class="col-sm-3 text-right control-label"> Adresse E-Mail </label> @@ -47,7 +47,7 @@ </div> </div> - <div class="form-group"> + <div class="control-group"> <label for="formPassword" class="col-sm-3 text-right"> Mot de passe </label> @@ -55,7 +55,7 @@ <input type="password" id="formPassword" name="password" class="form-control" ng-model="data.user.password"/> </div> </div> - <div class="form-group"> + <div class="control-group"> <label for="formPassword2" class="col-sm-3 text-right"> Confirmation </label> -- To stop receiving notification emails like this one, please contact Chorem.org SCM administrator <admin+scm@chorem.org>.