branch develop updated (e2da9f9 -> 1362497)
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 e2da9f9 on user edit, keep information if login is not a mail internal-test #6307 new 1362497 add some tolltips in forms internal-test #6164 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 13624977b9df1a5869fcf5ed246398bb110cab20 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Feb 18 18:28:02 2015 +0100 add some tolltips in forms internal-test #6164 Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 15 +++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 15 +++++++++++++++ .../src/main/webapp/views/documents/documents.html | 1 + .../src/main/webapp/views/documents/editDocument.html | 8 ++++++-- .../main/webapp/views/documents/modalDocumentSearch.html | 1 + .../src/main/webapp/views/documents/newdocument.html | 8 ++++++-- .../src/main/webapp/views/questions/editquestion.html | 8 ++++++-- .../main/webapp/views/questions/modalQuestionSearch.html | 1 + .../src/main/webapp/views/questions/questions.html | 1 + .../src/main/webapp/views/referential/referential.html | 4 +++- 10 files changed, 55 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 13624977b9df1a5869fcf5ed246398bb110cab20 Author: Yannick Martel <martel@©odelutin.com> Date: Wed Feb 18 18:28:02 2015 +0100 add some tolltips in forms internal-test #6164 --- coselmar-ui/src/main/webapp/i18n/en.js | 15 +++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 15 +++++++++++++++ .../src/main/webapp/views/documents/documents.html | 1 + .../src/main/webapp/views/documents/editDocument.html | 8 ++++++-- .../main/webapp/views/documents/modalDocumentSearch.html | 1 + .../src/main/webapp/views/documents/newdocument.html | 8 ++++++-- .../src/main/webapp/views/questions/editquestion.html | 8 ++++++-- .../main/webapp/views/questions/modalQuestionSearch.html | 1 + .../src/main/webapp/views/questions/questions.html | 1 + .../src/main/webapp/views/referential/referential.html | 4 +++- 10 files changed, 55 insertions(+), 7 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 2630856..92c317b 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -114,6 +114,13 @@ var translateEN = { "document.message.updated" : "Document well modified.", "document.message.deleted" : "Document well deleted.", +"document.message.info.privacy" : "Visibility defined who can access to document :<ul>\ + <li>Public : everyone,</li>\ + <li>Private : only you and supervisor,</li>\ + <li>Restricted : you, the defined experts and members of project using this document</li>\ + </ul>", +"document.message.info.keywords" : "Keywords enable to classify document and make search easier. Each input keyword should be validated with button \"Add\".", + "document.button.download" : "Download", "document.button.openLink" : "Open link", "document.button.removeFile" : "Remove file", @@ -177,6 +184,12 @@ var translateEN = { <li>Expertise</li>\ <li>Project : all around project life such as arrangement or brainstorming</li>\ </ul>", +"question.message.info.privacy" : "Visibility defined who can access to project content :<ul>\ + <li>Private : only assigned experts,</li>\ + <li>Public : all experts from application.</li>\ + </ul>\ + Please note that all project clients have also access to the project.", +"question.message.info.themes" : "Themes enable to classify project and make search easier. Each input theme should be validated with button \"Add\".", //Users part @@ -318,4 +331,6 @@ var translateEN = { "error.message.notFound.title" : "Nothing Here", "error.message.notFound.body" : "The page you try to access does not exist.", +"common.message.info.searchKeywords" : "You can use several keywords separating them by coma. Search will match <b><u>all</u></b> given keywords", + } \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 0e97338..9f436e7 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -114,6 +114,13 @@ var translateFR = { "document.message.updated" : "Document modifié.", "document.message.deleted" : "Document supprimé.", +"document.message.info.privacy" : "La visibilité définit qui pourra accéder au document :<ul>\ + <li>Privé : seulement vous et les superviseurs,</li>\ + <li>Publique : tout le monde.</li>\ + <li>Restreint : vous, les experts selectionnés et les membres des projets utilisant le document.</li>\ + </ul>", +"document.message.info.keywords" : "Les mots-clefs permettent de classifier le projet et faciliter sa recherche. Chaque mot-clef saisi doit être validé avec le bouton \"Ajouter\".", + "document.button.download" : "Télécharger", "document.button.openLink" : "Ouvrir le lien", "document.button.removeFile" : "Supprimer le fichier", @@ -177,6 +184,12 @@ var translateFR = { <li>Expertise</li>\ <li>Projet : tout ce qui tourne autour d'un projet comme le montage ou les brainstorming</li>\ </ul>", +"question.message.info.privacy" : "La visibilité définit qui pourra accéder au contenu du projet :<ul>\ + <li>Privé : seuls les experts assignés,</li>\ + <li>Publique : tous les experts de l'application.</li>\ + </ul>\ + À noter que les clients du projet ont aussi accès à celui-ci.", +"question.message.info.themes" : "Les thèmes permettent de classifier le projet et faciliter sa recherche. Chaque thème saisi doit être validé avec le bouton \"Ajouter\".", //Users part @@ -319,4 +332,6 @@ var translateFR = { "error.message.notFound.title" : "Perdu ?", "error.message.notFound.body" : "Vous êtes ici, mais il n'y a rien ici.", +"common.message.info.searchKeywords" : "Vous pouvez utiliser plusieurs mots-clefs en les séparant par une virgule. La recherche sera faite avec <b><u>tous</u></b> les mots-clefs.", + } \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/documents/documents.html b/coselmar-ui/src/main/webapp/views/documents/documents.html index 360bbeb..f6ee3a4 100644 --- a/coselmar-ui/src/main/webapp/views/documents/documents.html +++ b/coselmar-ui/src/main/webapp/views/documents/documents.html @@ -36,6 +36,7 @@ </div> <form class="form-inline pull-right search-zone" role="documentOptions" ng-submit="searchDocuments()"> <div class="form-group"> + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> </div> <div class="form-group"> diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 8ebbfd8..9e17d46 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -94,7 +94,9 @@ <div> - <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }}</label> + <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }} + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'document.message.info.privacy' | translate }}"></span> + </label> <div class="col-md-4"> <select class="form-control" name="privacy" @@ -175,7 +177,9 @@ <div ng-class="{'has-error' : (document.keywords.length == 0 && !documentForm.keywords.$pristine) || keywordsError}"> - <label class="col-md-2 control-label">{{ 'document.metadata.keywords' | translate }} *</label> + <label class="col-md-2 control-label">{{ 'document.metadata.keywords' | translate }} * + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'document.message.info.keywords' | translate }}"></span> + </label> <div class="col-md-2"> <input type="text" class="form-control" name="keywords" diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html index b190606..7f570be 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html @@ -34,6 +34,7 @@ <div> <form class="form-inline pull-right" role="documentOptions" ng-submit="searchDocuments(searchKeywords)"> <div class="form-group"> + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> </div> <div class="form-group"> diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 3033fb9..bf98b85 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -103,7 +103,9 @@ <div> - <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }}</label> + <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }} + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'document.message.info.privacy' | translate }}"></span> + </label> <div class="col-md-4"> <select class="form-control" name="privacy" @@ -169,7 +171,9 @@ <div ng-class="{'has-error' : (document.keywords.length == 0 && !documentForm.keywords.$pristine) || keywordsError}"> - <label class="col-md-2 control-label">{{ 'document.metadata.keywords' | translate }} *</label> + <label class="col-md-2 control-label">{{ 'document.metadata.keywords' | translate }} * + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'document.message.info.keywords' | translate }}"></span> + </label> <div class="col-md-2"> <input type="text" class="form-control" name="keywords" diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 68e5750..fce4106 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -63,7 +63,9 @@ </div> <div class=""> - <label class="col-md-1 control-label">{{ 'question.metadata.privacy' | translate }}</label> + <label class="col-md-1 control-label">{{ 'question.metadata.privacy' | translate }} + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'question.message.info.privacy' | translate }}"></span> + </label> <div class="col-md-2"> <select class="form-control" name="privacy" ng-model="question.privacy"> @@ -115,7 +117,9 @@ ng-class="{'has-error' : (question.themes.$invalid && question.themes.length < 1 && !questionForm.themes.$pristine) || themesError == true}"> - <label class="col-md-2 control-label">{{ 'question.metadata.themes' | translate }} *</label> + <label class="col-md-2 control-label">{{ 'question.metadata.themes' | translate }} * + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'question.message.info.themes' | translate }}"></span> + </label> <div class="col-md-2" > <input type="text" class="form-control" name="themes" diff --git a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html index 8604653..9359a35 100644 --- a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html +++ b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html @@ -33,6 +33,7 @@ <div> <form class="form-inline pull-right" role="questionOptions" ng-submit="searchQuestions(searchKeywords)"> <div class="form-group"> + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchKeywords" ng-list /> </div> <div class="form-group"> diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index 371e94a..c0301b0 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -37,6 +37,7 @@ </div> <form class="form-inline pull-right search-zone" role="questionOptions" ng-submit="searchQuestions()"> <div class="form-group"> + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchOptions.keywords" ng-list /> </div> <div class="form-group"> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index c8cc60f..7e1e76a 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -29,7 +29,9 @@ <!-- Search Line --> <form class="search-zone" role="referentialSearch" ng-submit="searchInReferential()"> <div class="form-group row"> - <label class="col-md-2 control-label">{{ 'referential.search.keywords' | translate }}</label> + <label class="col-md-2 control-label">{{ 'referential.search.keywords' | translate }} + <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> + </label> <div class="col-md-4"> <input type="text" class="form-control" name="keywords" -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm