branch develop updated (a73f267 -> fc0ae77)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from a73f267 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new fc0ae77 fixes #6434 add some placeholders 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 fc0ae77d0c921662d7b23312260f4db8e45af0ed Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 14 11:31:58 2015 +0100 fixes #6434 add some placeholders Summary of changes: coselmar-ui/src/main/webapp/views/documents/documents.html | 2 +- .../src/main/webapp/views/documents/modalDocumentEdit.html | 11 ++++++++++- coselmar-ui/src/main/webapp/views/documents/newdocument.html | 11 ++++++++++- coselmar-ui/src/main/webapp/views/questions/editquestion.html | 4 ++++ .../src/main/webapp/views/questions/modalQuestionSearch.html | 2 +- coselmar-ui/src/main/webapp/views/questions/questions.html | 2 +- .../src/main/webapp/views/referential/referential.html | 2 +- coselmar-ui/src/main/webapp/views/users/edituser.html | 9 ++++++++- 8 files changed, 36 insertions(+), 7 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.codelutin.com/coselmar.git commit fc0ae77d0c921662d7b23312260f4db8e45af0ed Author: Yannick Martel <martel@©odelutin.com> Date: Wed Jan 14 11:31:58 2015 +0100 fixes #6434 add some placeholders --- coselmar-ui/src/main/webapp/views/documents/documents.html | 2 +- .../src/main/webapp/views/documents/modalDocumentEdit.html | 11 ++++++++++- coselmar-ui/src/main/webapp/views/documents/newdocument.html | 11 ++++++++++- coselmar-ui/src/main/webapp/views/questions/editquestion.html | 4 ++++ .../src/main/webapp/views/questions/modalQuestionSearch.html | 2 +- coselmar-ui/src/main/webapp/views/questions/questions.html | 2 +- .../src/main/webapp/views/referential/referential.html | 2 +- coselmar-ui/src/main/webapp/views/users/edituser.html | 9 ++++++++- 8 files changed, 36 insertions(+), 7 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/documents/documents.html b/coselmar-ui/src/main/webapp/views/documents/documents.html index 1009e30..524653e 100644 --- a/coselmar-ui/src/main/webapp/views/documents/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents/documents.html @@ -36,7 +36,7 @@ </div> <form class="form-inline pull-right" role="documentOptions" ng-submit="searchDocuments()"> <div class="form-group"> - <input type="search" class="form-control" placeholder="Search a document" ng-model="searchKeywords" ng-list /> + <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> </div> <div class="form-group"> <button type="submit" class="btn btn-default glyphicon glyphicon-search"></button> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index 478cdcc..03920ac 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -42,7 +42,8 @@ <div class="col-md-4"> <input type="text" class="form-control" name="name" - ng-model="document.name" required/> + placeholder="Document Name" + ng-model="document.name" required /> <p ng-show="documentForm.name.$invalid && !documentForm.name.$pristine" class="help-block">Document name is required.</p> @@ -86,6 +87,7 @@ <div class="col-md-4"> <input type="input" class="form-control" name="externalUrl" + placeholder="http://website" ng-model="document.externalUrl" ng-minlength="6"/> </div> @@ -106,6 +108,7 @@ <div class="col-md-2"> <input type="text" class="form-control" name="keywords" + placeholder="Validate with add" data-ng-model="modalToAddKeyword" list="modalExistingKeywords"/> <p ng-show="document.keywords.length < 1 && !documentForm.keywords.$pristine" @@ -142,6 +145,7 @@ <div class="col-md-4"> <div class="input-group"> <input type="text" class="form-control" name="publicationDate" + placeholder="dd/MM/yyyy" ng-model="document.publicationDate" datepicker-popup="dd/MM/yyyy" is-open="publicationDateOpened" @@ -178,6 +182,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="authors" + placeholder="Name Firstname" ng-model="document.authors" required/> <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" @@ -190,6 +195,7 @@ <div class="col-md-3"> <input type="text" class="form-control" name="language" + placeholder="en,fr,..." ng-model="document.language"/> </div> </div> @@ -204,6 +210,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="copyright" + placeholder="Copyright owner" ng-model="document.copyright" required/> <p ng-show="documentForm.copyright.$invalid && !documentForm.copyright.$pristine" @@ -216,6 +223,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="licence" + placeholder="License of document" ng-model="document.licence"/> </div> </div> @@ -229,6 +237,7 @@ <div class="col-md-10"> <textarea type="text" class="form-control" name="summary" rows="5" + placeholder="Tape the document summary, it will help to retrieve document" ng-model="document.summary" required/> <p ng-show="documentForm.summary.$invalid && !documentForm.summary.$pristine" diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 8309149..d8e2306 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -53,6 +53,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="name" + placeholder="Document Name" ng-model="document.name" required/> <p ng-show="documentForm.name.$invalid && !documentForm.name.$pristine" @@ -114,12 +115,13 @@ <div class="col-md-4"> <input type="input" class="form-control" name="externalUrl" + placeholder="http://website" ng-model="document.externalUrl" /> </div> </div> <p ng-show="!document.externalUrl && !file.upload" - class="help-block text-center clear">A File or an external URL is + class="help-block text-center clear">At least a File or an external URL is required.</p> </div> @@ -132,6 +134,7 @@ <div class="col-md-2"> <input type="text" class="form-control" name="keywords" + placeholder="Validate with add" ng-model="toAddKeyword" list="existingKeywords" /> <p ng-show="document.keywords.length < 1 && !documentForm.keywords.$pristine" @@ -167,6 +170,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="authors" + placeholder="Name Firstname" ng-model="document.authors" required/> <p ng-show="documentForm.authors.$invalid && !documentForm.authors.$pristine" @@ -181,6 +185,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="copyright" + placeholder="Copyright owner" ng-model="document.copyright" required/> <p ng-show="documentForm.copyright.$invalid && !documentForm.copyright.$pristine" @@ -196,6 +201,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="licence" + placeholder="License of document" ng-model="document.licence"/> </div> </div> @@ -205,6 +211,7 @@ <div class="col-md-1"> <input type="text" class="form-control" name="language" + placeholder="en,fr,..." ng-model="document.language"/> </div> </div> @@ -215,6 +222,7 @@ <div class="col-md-2"> <div class="input-group"> <input type="text" class="form-control" name="publicationDate" + placeholder="dd/MM/yyyy" ng-model="document.publicationDate" datepicker-popup="dd/MM/yyyy" is-open="publicationDateOpened" ng-click="publicationDateOpened = true"/> @@ -232,6 +240,7 @@ <div class="col-md-10"> <textarea type="text" class="form-control" name="summary" rows="5" + placeholder="Tape the document summary, it will help to retrieve document" ng-model="document.summary" required/> <p ng-show="documentForm.summary.$invalid && !documentForm.summary.$pristine" diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 1973fb3..e5a90b0 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -28,6 +28,7 @@ <div class="col-md-10"> <input type="text" class="form-control" name="title" ng-minlength="10" + placeholder="Question Title" ng-model="question.title" required/> <p ng-show="questionForm.title.$invalid && !questionForm.title.$pristine" class="help-block">Title is required, minimum 10 characters.</p> </div> @@ -71,6 +72,7 @@ <div class="col-md-2"> <input type="text" class="form-control" name="deadline" + placeholder="dd/MM/yyyy" ng-model="question.deadline" datepicker-popup="dd/MM/yyyy" is-open="deadlineDateOpened" ng-click="deadlineDateOpened = true" /> @@ -89,6 +91,7 @@ <div class="col-md-10"> <textarea type="text" class="form-control" name="summary" rows="8" + placeholder="This summary can also be used to retrieve the question" ng-model="question.summary" required/> <p ng-show="questionForm.summary.$invalid && !questionForm.summary.$pristine" @@ -109,6 +112,7 @@ <div class="col-md-2"> <input type="text" class="form-control" name="themes" + placeholder="Validate with add" data-ng-model="toAddTheme" list="existingThemes" /> <p ng-show="question.themes.length < 1 && !questionForm.themes.$pristine" diff --git a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html index 8c39815..68a2ce8 100644 --- a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html +++ b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html @@ -33,7 +33,7 @@ <div> <form class="form-inline pull-right" role="questionOptions" ng-submit="searchQuestions(searchKeywords)"> <div class="form-group"> - <input type="search" class="form-control" placeholder="word1,word2,..." ng-model="searchKeywords" ng-list /> + <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> </div> <div class="form-group"> <button type="submit" class="btn btn-default fa fa-search"></button> diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index 4e0e31f..4eb4578 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -37,7 +37,7 @@ </div> <form class="form-inline pull-right" role="questionOptions" ng-submit="searchQuestions()"> <div class="form-group"> - <input type="search" class="form-control" placeholder="word1,word2,..." ng-model="searchOptions.keywords" ng-list /> + <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchOptions.keywords" ng-list /> </div> <div class="form-group"> <button type="submit" class="btn btn-default fa fa-search"></button> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index 922565d..5a32ab4 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -32,7 +32,7 @@ <div class="col-md-4"> <input type="text" class="form-control" name="keywords" - ng-model="search.keywords" ng-list placeholder="keyword 1, keyword2"/> + ng-model="search.keywords" ng-list placeholder="keyword1,keyword2,..."/> </div> <div class="col-md-2"> diff --git a/coselmar-ui/src/main/webapp/views/users/edituser.html b/coselmar-ui/src/main/webapp/views/users/edituser.html index 057f72e..4bc5827 100644 --- a/coselmar-ui/src/main/webapp/views/users/edituser.html +++ b/coselmar-ui/src/main/webapp/views/users/edituser.html @@ -30,6 +30,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="firstName" + placeholder="FirstName" ng-model="user.firstName" required/> <p ng-show="userForm.firstName.$invalid && !userForm.firstName.$pristine" class="help-block">First name is required.</p> </div> @@ -40,6 +41,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="name" + placeholder="Name" ng-model="user.name" required/> <p ng-show="userForm.name.$invalid && !userForm.name.$pristine" class="help-block">Name is required.</p> </div> @@ -65,6 +67,7 @@ <div class="col-md-5"> <input type="email" class="form-control" name="mail" + placeholder="example@provider.mail" ng-model="user.mail" required/> <p ng-show="userForm.mail.$invalid && !userForm.mail.$pristine" class="help-block">Enter a valid mail.</p> </div> @@ -76,6 +79,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="phoneNumber" + placeholder="+33912345678" ng-model="user.phoneNumber" /> </div> @@ -86,6 +90,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="organization" + placeholder="organization" ng-model="user.organization" /> </div> @@ -96,6 +101,7 @@ <div class="col-md-5"> <input type="text" class="form-control" name="qualification" + placeholder="qualification" ng-model="user.qualification" required/> <p ng-show="userForm.qualification.$invalid && !userForm.qualification.$pristine" class="help-block">Qualification is required.</p> </div> @@ -109,6 +115,7 @@ <div class="col-md-5"> <input type="password" class="form-control" name="password" + placeholder="current password" ng-model="user.password" required/> <p ng-show="userForm.password.$invalid && !userForm.password.$pristine" class="help-block">Password is required to validate modification.</p> </div> @@ -120,7 +127,7 @@ <div class="col-md-5"> <input type="password" class="form-control" name="newPassword" - ng-model="user.newPassword" ng-minlength="6" placeholder="change password"/> + ng-model="user.newPassword" ng-minlength="6" placeholder="new password"/> </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