branch develop updated (097bc5f -> 0339661)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.forge.codelutin.com/coselmar.git from 097bc5f Merge branch 'feature/7974-cloud-tag-on-project' into develop new 0339661 make citation field mandatory The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 03396610ce633ba2f6f7c392b5d06703c58b43ba Author: Yannick Martel <martel@©odelutin.com> Date: Fri Feb 19 10:57:17 2016 +0100 make citation field mandatory Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../main/webapp/views/documents/editDocument.html | 9 +++++--- .../webapp/views/documents/modalDocumentEdit.html | 26 +++++++++++++--------- .../main/webapp/views/documents/newdocument.html | 8 +++++-- 5 files changed, 29 insertions(+), 16 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 03396610ce633ba2f6f7c392b5d06703c58b43ba Author: Yannick Martel <martel@©odelutin.com> Date: Fri Feb 19 10:57:17 2016 +0100 make citation field mandatory --- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + .../main/webapp/views/documents/editDocument.html | 9 +++++--- .../webapp/views/documents/modalDocumentEdit.html | 26 +++++++++++++--------- .../main/webapp/views/documents/newdocument.html | 8 +++++-- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 0d6afcc..1f4d7c4 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -117,6 +117,7 @@ var translateEN = { "document.message.requiredAuthors" : "Document authors is required.", "document.message.requiredCopyright" : "Document copyright is required.", "document.message.requiredSummary" : "A summary is required.", +"document.message.requiredCitation" : "Citation is required.", "document.privacy.questionRestricted" : "Restricted to Project participants", "document.privacy.restricted.info" : "Restricted to selected experts and to projects using document", "document.message.created" : "Document well created.", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 88f8f0f..127cb24 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -117,6 +117,7 @@ var translateFR = { "document.message.requiredAuthors" : "Le ou les auteur(s) du document est requis.", "document.message.requiredCopyright" : "Le copyright du document est requis.", "document.message.requiredSummary" : "Un résumé est requis.", +"document.message.requiredCitation" : "La citation est requise.", "document.privacy.questionRestricted" : "Restreint aux participants de projet.", "document.privacy.restricted.info" : "Restreint aux experts indiqués et aux projets incluant le document", "document.message.created" : "Document créé.", diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 85e57c1..9465065 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -288,13 +288,16 @@ </div> <!-- Citation --> - <div class="form-group" > - <label class="col-md-2 control-label">{{ 'document.metadata.citation' | translate }}</label> + <div class="form-group" + ng-class="{'has-error' : documentForm.citation.$invalid && !documentForm.citation.$pristine}"> + <label class="col-md-2 control-label">{{ 'document.metadata.citation' | translate }} *</label> <div class="col-md-10"> <textarea type="text" class="form-control" name="citation" rows="2" - ng-model="document.citation" /> + ng-model="document.citation" required /> + <p ng-show="documentForm.citation.$invalid && !documentForm.citation.$pristine" + class="help-block">{{ 'document.message.requiredCitation' | translate }}</p> </div> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index 0194fef..8bd2919 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -265,29 +265,33 @@ </div> <!-- End Line with Summary --> - <!-- Line with Comment --> - <div class="form-group" > - <label class="col-md-2 control-label">{{ 'document.metadata.comment' | translate }}</label> + <!-- Line with Citation --> + <div class="form-group" + ng-class="{'has-error' : documentForm.citation.$invalid && !documentForm.citation.$pristine}"> + <label class="col-md-2 control-label">{{ 'document.metadata.citation' | translate }} *</label> <div class="col-md-10"> - <textarea type="text" class="form-control" name="comment" rows="5" - ng-model="document.comment" /> + <input type="text" class="form-control" name="citation" + ng-model="document.citation" required /> + + <p ng-show="documentForm.citation.$invalid && !documentForm.citation.$pristine" + class="help-block">{{ 'document.message.requiredCitation' | translate }}</p> </div> </div> - <!-- End Line with Comment --> + <!-- End Line with Citation --> - <!-- Line with Citation --> + <!-- Line with Comment --> <div class="form-group" > - <label class="col-md-2 control-label">{{ 'document.metadata.citation' | translate }}</label> + <label class="col-md-2 control-label">{{ 'document.metadata.comment' | translate }}</label> <div class="col-md-10"> - <input type="text" class="form-control" name="citation" - ng-model="document.citation" /> + <textarea type="text" class="form-control" name="comment" rows="5" + ng-model="document.comment" /> </div> </div> - <!-- End Line with Citation --> + <!-- End Line with Comment --> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index e10f668..20c41fb 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -281,13 +281,17 @@ </div> <!-- Citation --> - <div class="form-group" > - <label class="col-md-2 control-label">{{ 'document.metadata.citation' | translate }}</label> + <div class="form-group" + ng-class="{'has-error' : documentForm.citation.$invalid && !documentForm.citation.$pristine}"> + <label class="col-md-2 control-label">{{ 'document.metadata.citation' | translate }} *</label> <div class="col-md-10"> <textarea type="text" class="form-control" name="citation" rows="2" ng-model="document.citation" /> + <p ng-show="documentForm.citation.$invalid && !documentForm.citation.$pristine" + class="help-block">{{ 'document.message.requiredCitation' | translate }}</p> + </div> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm