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 4f9147d9652fc4592a8b4e68d118b7015854712e Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Feb 10 18:27:54 2016 +0100 Fixes #7981 Add message for input language when language is different from english --- coselmar-ui/src/main/webapp/css/coselmar.css | 7 +++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/views/documents/editDocument.html | 6 ++++++ .../src/main/webapp/views/documents/modalDocumentEdit.html | 12 +++++++++--- coselmar-ui/src/main/webapp/views/documents/newdocument.html | 6 ++++++ coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html | 6 ++++++ .../src/main/webapp/views/questions/editquestion.html | 5 +++++ 7 files changed, 40 insertions(+), 3 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 8ccaa98..8d775cd 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -649,7 +649,14 @@ input[type="file"] { position: absolute; left: auto; right: 40px; + top: 15px; z-index: 99; + padding-right: 30px; +} + +.cg-notify-message .cg-notify-close { + padding-top: 15px; + padding-right: 5px; } /* Nuage de mots diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index de2076b..aa75c90 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -337,6 +337,7 @@ var translateFR = { "common.message.missingMandatoryFields" : "Certains champs obligatoires (*) n'ont pas été remplis.", "common.message.notYetAvailable" : "Pas encore disponible.", "common.message.mandatoryFieldsInfo" : "Les champs avec un <strong><big>*</big></strong> sont obligatoires.", +"common.message.mandatoryInputLanguage" : "Les champs sont à saisir en anglais.", "common.message.internalError" : "Erreur durant le traitement. Si le problème persiste, veuillez contacter l'administrateur de l'application.", "common.search.noResult" : "Aucun résultat.", diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index fb60c4d..a514906 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -25,6 +25,12 @@ <h2>{{document.name}}</h2> </div> + <div class="cg-notify-message alert-warning" + ng-if="locale != 'en'" + style="visibility: visible;" + translate="common.message.mandatoryInputLanguage"> + </div> + <div style="padding-bottom: 50px"> <div class=""> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index d94e040..32d5446 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -27,6 +27,12 @@ <span translate="common.message.mandatoryFieldsInfo" class="marginLeft20"></span> </div> + <div class="cg-notify-message alert-warning" + ng-if="locale != 'en'" + style="visibility: visible;" + translate="common.message.mandatoryInputLanguage"> + </div> + <form class="form-horizontal" name="documentForm" role="form" ng-submit="create(documentForm.$valid)"> @@ -283,14 +289,14 @@ </div> <!-- End Line with Citation --> + </div> + + <div class="modal-footer"> <!-- In case of errors --> <div ng-if="documentForm.$invalid || hasErrors" class="has-error"> <div class="text-center help-block">{{ 'common.message.missingMandatoryFields' | translate }}</div> </div> - </div> - - <div class="modal-footer"> <button class="btn btn-action btn-disable" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> <input type="submit" value="{{ 'common.button.validate' | translate}}" class="btn btn-action btn-success float-right" ng-disabled="documentForm.$invalid || keywordsError || (!document.externalUrl && !upload.file)" /> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 086bed2..7a42306 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -27,6 +27,12 @@ <span translate="common.message.mandatoryFieldsInfo"></span> </div> + <div class="cg-notify-message alert-warning" + ng-if="locale != 'en'" + style="visibility: visible;" + translate="common.message.mandatoryInputLanguage"> + </div> + <div class="info-panel"> <!-- Summary goes here --> <p translate="document.create.info"></p> diff --git a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html index aa6ae28..35ae2b1 100644 --- a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html +++ b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html @@ -28,6 +28,12 @@ <span translate="common.message.mandatoryFieldsInfo" class="marginLeft20"></span> </div> + <div class="cg-notify-message alert-warning" + ng-if="locale != 'en'" + style="visibility: visible;" + translate="common.message.mandatoryInputLanguage"> + </div> + <form class="form-horizontal" name="linkForm" role="form" ng-submit="create()"> <div class="modal-body"> diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 670c2f2..9787260 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -21,6 +21,11 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> + <div class="cg-notify-message alert-warning" + ng-if="locale != 'en'" + style="visibility: visible;" + translate="common.message.mandatoryInputLanguage"> + </div> <!-- Line with Title --> <div class="form-group row" ng-class="{'has-error' : questionForm.title.$invalid && !questionForm.title.$pristine }"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.