This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git commit 7a5a5cf7ba27094acdda84b9f48d3e8dd1e696ba Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Feb 24 11:45:13 2016 +0100 Affichage du nombre de résultats sur les pages de recherche --- coselmar-ui/src/main/webapp/css/coselmar.css | 17 ++++++++++++----- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/views/paginationTemplate.html | 5 ++++- .../src/main/webapp/views/users/newPassword.html | 2 +- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 34deb6a..bd49733 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -100,10 +100,6 @@ body { font-weight: normal; } -.navbar .navbar-form.navbar-right .mail { - min-width: 250px; -} - /* Sticky footer styles -------------------------------------------------- */ .footer { @@ -284,7 +280,8 @@ pagination-tool > .ng-scope:before { margin-top: 10px; } -pagination-tool > .ng-scope .pager-configuration { +pagination-tool > .ng-scope .pager-configuration, +pagination-tool > .ng-scope .pager-count { position: absolute; right: 0; background: #FFF; @@ -292,6 +289,12 @@ pagination-tool > .ng-scope .pager-configuration { padding: 0 0 0 15px; } +pagination-tool > .ng-scope .pager-count { + left: 0; + right: auto; + padding: 0 15px 0 0; +} + pagination-tool > .ng-scope .pager { padding: 0 15px; display: inline; @@ -340,6 +343,10 @@ pagination-tool > .ng-scope .pager .fa:hover { white-space: nowrap; } +input.mail { + min-width: 250px; +} + /* Tableaux -------------------------------------------------- */ diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 1f4d7c4..54eee19 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -372,6 +372,7 @@ var translateEN = { "pagination.results.perPage" : "Number of results per page", "pagination.results.page" : "Page", "pagination.results.of" : "of", +"pagination.results.results" : "Results: ", "placeholder.mail" : "Mail", "placeholder.password" : "Password", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 127cb24..b4b398b 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -374,6 +374,7 @@ var translateFR = { "pagination.results.perPage" : "Nombre de résultats par page", "pagination.results.page" : "Page", "pagination.results.of" : "sur", +"pagination.results.results" : "Résultats: ", "placeholder.mail" : "Courriel", "placeholder.password" : "Mot de passe", diff --git a/coselmar-ui/src/main/webapp/views/paginationTemplate.html b/coselmar-ui/src/main/webapp/views/paginationTemplate.html index 71f93b6..4545a4c 100644 --- a/coselmar-ui/src/main/webapp/views/paginationTemplate.html +++ b/coselmar-ui/src/main/webapp/views/paginationTemplate.html @@ -21,7 +21,10 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<div ng-controller="paginationController" class="clearfix"> +<div ng-controller="paginationController" class="clearfix" ng-show="paginationData.elements.length > 0"> + <div class="pager-count"> + {{'pagination.results.results' | translate}}{{paginationData.elements.length}} + </div> <div class="pager"> <span ng-if="pageContext.firstPage === false"> <i class="fa fa-chevron-circle-left" ng-click="toPreviousPage()"></i> diff --git a/coselmar-ui/src/main/webapp/views/users/newPassword.html b/coselmar-ui/src/main/webapp/views/users/newPassword.html index 48a79d8..55afe71 100644 --- a/coselmar-ui/src/main/webapp/views/users/newPassword.html +++ b/coselmar-ui/src/main/webapp/views/users/newPassword.html @@ -40,7 +40,7 @@ <div class="form-group"> <label class="control-label">{{ 'user.message.enterMail' | translate }}</label> - <input type="email" class="form-control" name="mail" + <input type="email" class="form-control mail" name="mail" placeholder="{{ 'placeholder.user.mail' | translate }}" ng-model="mail" required/> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.