branch develop updated (34502c6 -> 2286ca9)
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 34502c6 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new b85f2a9 Corrections d'affichage new b8772e9 Modifications d'affichage new 2286ca9 Réorganisation des champs de la recherche avancée des documents The 3 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 2286ca9807006a22cd4a45039ee3d5fb02a7fb7f Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 18:58:05 2016 +0100 Réorganisation des champs de la recherche avancée des documents commit b8772e9e66bd71af4fb76c3e9108b92cb3304743 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 18:47:39 2016 +0100 Modifications d'affichage commit b85f2a901558c3fbf852d5eeadfd1599d8b17cf2 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 17:26:31 2016 +0100 Corrections d'affichage Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 20 +++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 7 ++-- coselmar-ui/src/main/webapp/i18n/fr.js | 7 ++-- coselmar-ui/src/main/webapp/index.html | 2 +- .../src/main/webapp/js/coselmar-controllers.js | 9 +++-- .../main/webapp/views/documents/editDocument.html | 4 +-- .../webapp/views/documents/modalDocumentEdit.html | 2 +- .../views/documents/modalDocumentSearch.html | 2 +- .../main/webapp/views/documents/newdocument.html | 4 +-- .../src/main/webapp/views/documents/toolsPart.html | 30 ++++++++-------- coselmar-ui/src/main/webapp/views/home.html | 40 +++++++++++----------- .../main/webapp/views/questions/editquestion.html | 8 ++--- .../views/questions/modalQuestionSearch.html | 4 +-- .../src/main/webapp/views/questions/questions.html | 14 ++++---- .../src/main/webapp/views/questions/toolsPart.html | 5 ++- .../main/webapp/views/questions/viewquestion.html | 2 +- .../main/webapp/views/referential/referential.html | 10 +++--- .../src/main/webapp/views/users/edituser.html | 2 +- .../src/main/webapp/views/users/searchPart.html | 13 ++++--- 19 files changed, 104 insertions(+), 81 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 b85f2a901558c3fbf852d5eeadfd1599d8b17cf2 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 17:26:31 2016 +0100 Corrections d'affichage --- coselmar-ui/src/main/webapp/i18n/en.js | 2 +- coselmar-ui/src/main/webapp/i18n/fr.js | 2 +- coselmar-ui/src/main/webapp/views/users/edituser.html | 2 +- coselmar-ui/src/main/webapp/views/users/searchPart.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 896f386..af389cc 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -265,7 +265,7 @@ var translateEN = { "user.message.enterMail" : "Please enter your email", "user.message.unknownMail" : "This email does not exist.", "user.message.newPasswordSent" : "A new password has been sent.", -"user.message.wannaSimpleLogin" : "Use simple login, not a mail (Warning : no password could be sent)", +"user.message.wannaSimpleLogin" : "I want to use a simple login, not a mail (Warning : no password could be sent)", "user.message.invalidLogin" : "Login is mandatory.", "user.message.created" : "User well created.", "user.message.updated" : "User well modified.", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index a8bd20a..7c06f61 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -265,7 +265,7 @@ var translateFR = { "user.message.enterMail" : "Veuillez entrer votre courriel", "user.message.unknownMail" : "Ce courriel est inconnu.", "user.message.newPasswordSent" : "Un nouveau mot de passe a été envoyé.", -"user.message.wannaSimpleLogin" : "Utiliser un simple identifiant et non un courriel (Attention : aucun mot de passe ne pourra être envoyé.)", +"user.message.wannaSimpleLogin" : "Je souhaite utiliser un simple identifiant et non un courriel (Attention : aucun mot de passe ne pourra être envoyé.)", "user.message.invalidLogin" : "L'identifiant est obligatoire.", "user.message.created" : "Utilisateur créé.", "user.message.updated" : "Utilisateur modifié.", diff --git a/coselmar-ui/src/main/webapp/views/users/edituser.html b/coselmar-ui/src/main/webapp/views/users/edituser.html index 2d0ee19..d18fd3d 100644 --- a/coselmar-ui/src/main/webapp/views/users/edituser.html +++ b/coselmar-ui/src/main/webapp/views/users/edituser.html @@ -93,7 +93,7 @@ ng-if="simpleLogin" /> <p ng-show="context.currentUser && (context.currentUser.role == 'ADMIN' || context.currentUser.role == 'SUPERVISOR') && context.currentUser.userId != user.id"> - <input type="checkbox" ng-model="simpleLogin">{{ 'user.message.wannaSimpleLogin' | translate }} + <input type="checkbox" ng-model="simpleLogin">{{ 'user.message.wannaSimpleLogin' | translate }}</input> </p> <p ng-show="userForm.mail.$invalid && !userForm.mail.$pristine" class="help-block" ng-if="!simpleLogin">{{ 'user.message.invalidMail' | translate }}</p> <p ng-show="userForm.mail.$invalid && !userForm.mail.$pristine" class="help-block" ng-if="simpleLogin">{{ 'user.message.invalidLogin' | translate }}</p> diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html index dd5d238..0b8b8e9 100644 --- a/coselmar-ui/src/main/webapp/views/users/searchPart.html +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -97,12 +97,12 @@ <label class="col-md-1 control-label">{{ 'user.metadata.organization' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="MI-6" ng-model="example.organization" /> + <input class="form-control" type="search" class="form-control" placeholder="Ifremer" ng-model="example.organization" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.qualification' | translate }}</label> <div class="col-md-2"> - <input class="form-control" type="search" class="form-control" placeholder="007" ng-model="example.qualification" /> + <input class="form-control" type="search" class="form-control" placeholder="Ingénieur" ng-model="example.qualification" /> </div> <label class="col-md-1 control-label">{{ 'user.metadata.status' | translate }}</label> -- 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 b8772e9e66bd71af4fb76c3e9108b92cb3304743 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 18:47:39 2016 +0100 Modifications d'affichage --- coselmar-ui/src/main/webapp/css/coselmar.css | 20 +++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 5 +-- coselmar-ui/src/main/webapp/i18n/fr.js | 5 +-- coselmar-ui/src/main/webapp/index.html | 2 +- .../src/main/webapp/js/coselmar-controllers.js | 9 +++-- .../main/webapp/views/documents/editDocument.html | 4 +-- .../webapp/views/documents/modalDocumentEdit.html | 2 +- .../views/documents/modalDocumentSearch.html | 2 +- .../main/webapp/views/documents/newdocument.html | 4 +-- .../src/main/webapp/views/documents/toolsPart.html | 5 ++- coselmar-ui/src/main/webapp/views/home.html | 40 +++++++++++----------- .../main/webapp/views/questions/editquestion.html | 8 ++--- .../views/questions/modalQuestionSearch.html | 4 +-- .../src/main/webapp/views/questions/questions.html | 14 ++++---- .../src/main/webapp/views/questions/toolsPart.html | 5 ++- .../main/webapp/views/questions/viewquestion.html | 2 +- .../main/webapp/views/referential/referential.html | 10 +++--- .../src/main/webapp/views/users/searchPart.html | 9 +++-- 18 files changed, 87 insertions(+), 63 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 0a5b1fc..002de35 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -100,6 +100,10 @@ body { font-weight: normal; } +.navbar .navbar-form.navbar-right .mail { + min-width: 250px; +} + /* Sticky footer styles -------------------------------------------------- */ .footer { @@ -131,6 +135,7 @@ body { -------------------------------------------------- */ a { color: #008EB4; + cursor: pointer; } .float-right { @@ -319,6 +324,17 @@ dl > dd { background: #FFF; } +.search-zone .form-group { + padding-left: 10px; + margin-left: 10px; + border-left: 1px solid #EEE; +} + +.search-zone .form-group:first-child { + border: 0; + margin-left: 0; +} + .status-open, .status-in_progress , .status-closed, @@ -459,6 +475,10 @@ a.dropdown-toggle:hover .caret { font-size: 12px; } +.table-responsive { + overflow: visible; +} + .btn.disabled, .btn[disabled] { opacity: 0.45; } diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index af389cc..7d56ce2 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -279,7 +279,7 @@ var translateEN = { "user.button.add.client" : "Add a client", "user.button.disable" : "Disable", "user.button.enable" : "Enable", -"user.button.showDisable" : "Show disable", +"user.button.showDisable" : "Show disable users", "user.button.newPassword" : "Send", //Referential part @@ -317,6 +317,7 @@ var translateEN = { "common.button.cancel" : "Cancel", "common.button.close" : "Close", "common.button.search" : "Search", +"common.button.searchField" : "Search : ", "common.button.advanceSearch" : "Advance search", "common.button.simpleSearch" : "Simple search", "common.button.csvExport" : "Export results as CSV", @@ -349,6 +350,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", +"common.message.info.searchKeywords" : "You can use several keywords separating them by coma. Search will match all 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 7c06f61..f43ed95 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -279,7 +279,7 @@ var translateFR = { "user.button.add.client" : "Ajouter un client", "user.button.disable" : "Désactiver", "user.button.enable" : "Activer", -"user.button.showDisable" : "Montrer les désactivés", +"user.button.showDisable" : "Montrer les utilisateurs désactivés", "user.button.newPassword" : "Envoyer", //Referential part @@ -317,6 +317,7 @@ var translateFR = { "common.button.cancel" : "Annuler", "common.button.close" : "Fermer", "common.button.search" : "Rechercher", +"common.button.searchField" : "Recherche : ", "common.button.advanceSearch" : "Recherche avancée", "common.button.simpleSearch" : "Recherche simple", "common.button.csvExport" : "Exporter les résultats en CSV", @@ -350,6 +351,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.", +"common.message.info.searchKeywords" : "Vous pouvez utiliser plusieurs mots-clefs en les séparant par une virgule. La recherche sera faite avec tous les mots-clefs.", } \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/index.html b/coselmar-ui/src/main/webapp/index.html index 08fe120..cbc40e5 100644 --- a/coselmar-ui/src/main/webapp/index.html +++ b/coselmar-ui/src/main/webapp/index.html @@ -133,7 +133,7 @@ {{ 'user.message.login' | translate}} (<a href="#/users/forgotPassword">{{ 'user.message.forgotPassword' | translate }}</a> ) </div> <div class="form-group"> - <input type="text" placeholder="Mail" class="form-control" ng-model="loginMail"> + <input type="text" placeholder="Mail" class="form-control mail" ng-model="loginMail"> </div> <div class="form-group"> <input type="password" placeholder="Password" class="form-control" ng-model="loginPassword"> diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 6812755..742dbea 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -989,7 +989,10 @@ coselmarControllers.controller("QuestionsCtrl", ['$scope', '$route', '$routePara var names = ""; for(var i=0; i < users.length; i++) { - names += users[i].firstName + " " + users[i].name + "<br />"; + names += users[i].firstName + " " + users[i].name; + if (i != (users.length -1)) { + names += ", "; + } } return names; @@ -1000,7 +1003,9 @@ coselmarControllers.controller("QuestionsCtrl", ['$scope', '$route', '$routePara var titles = ""; for(var i=0; i < documents.length; i++) { titles += documents[i].name; - titles += "<br />"; + if (i != (documents.length)) { + titles += ", "; + } } return titles; diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 189c022..ecb198c 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -95,7 +95,7 @@ <div> <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> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'document.message.info.privacy' | translate }}"></span> </label> <div class="col-md-4"> @@ -181,7 +181,7 @@ && !documentForm.keywords.$pristine) || keywordsError}"> <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> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'document.message.info.keywords' | translate }}"></span> </label> <div class="col-md-2"> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index f5e116e..8cf2001 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -155,7 +155,7 @@ && !documentForm.keywords.$pristine) || keywordsError }"> <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> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'document.message.info.keywords' | translate }}"></span> </label> <div class="col-md-2"> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html index 7f570be..b0f9be8 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html @@ -34,7 +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> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ '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 460483d..ebb5b79 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -104,7 +104,7 @@ <div> <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> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'document.message.info.privacy' | translate }}"></span> </label> <div class="col-md-4"> @@ -175,7 +175,7 @@ && !documentForm.keywords.$pristine) || keywordsError}"> <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> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'document.message.info.keywords' | translate }}"></span> </label> <div class="col-md-2"> diff --git a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html index 4d515e0..123fc16 100644 --- a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html @@ -33,11 +33,10 @@ <form class="form-inline pull-right search-zone" role="documentOptions" ng-submit="searchDocuments()" ng-show="!advanced"> <div class="form-group"> + {{ 'common.button.searchField' | translate }} <span class="fa fa-info-circle" tooltip-placement="bottom" - tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> + uib-tooltip="{{ 'common.message.info.searchKeywords' | translate }}"></span> <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="search.searchKeywords" ng-list /> - </div> - <div class="form-group"> <button type="submit" class="btn btn-primary fa fa-search"></button> </div> <div class="form-group" ng-show="!advanced"> diff --git a/coselmar-ui/src/main/webapp/views/home.html b/coselmar-ui/src/main/webapp/views/home.html index 533ee40..4fe27c3 100644 --- a/coselmar-ui/src/main/webapp/views/home.html +++ b/coselmar-ui/src/main/webapp/views/home.html @@ -53,7 +53,7 @@ <tr ng-repeat="question in questions" > <td ng-if="context.currentUser && context.currentUser.role != 'MEMBER'"> <span class="status-{{question.status|lowercase}}" title="{{question.status | translate}}"></span> - <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a> + <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" uib-tooltip="{{question.summary | limitTo: 250 }}">{{question.title}}</a> </td> <td ng-if="!context.currentUser || context.currentUser.role == 'MEMBER'">{{question.title}}</td> @@ -64,28 +64,28 @@ <td>{{question.deadline | date:'mediumDate'}}</td> <!-- clients : we use ng-if for better tooltip management --> - <td ng-if="context.currentUser && question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> + <td ng-if="context.currentUser && question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center"> + <span tooltip-placement="bottom" uib-tooltip="{{getUserNames(question.clients)}}" >{{getUserNames(question.clients)}} {{question.clients.length}}</span> </td> - <td ng-if="context.currentUser && !question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <td ng-if="context.currentUser && !question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center">0</td> <!-- participants --> - <td ng-if="context.currentUser && question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> + <td ng-if="context.currentUser && question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center"> + <span tooltip-placement="bottom" uib-tooltip="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> </td> - <td ng-if="context.currentUser && !question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <td ng-if="context.currentUser && !question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center">0</td> <!-- related documents --> - <td ng-if="context.currentUser && question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getDocumentTitles(question.relatedDocuments)}}" tooltip-trigger="mouseenter" >{{question.relatedDocuments.length}}</span> + <td ng-if="context.currentUser && question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center"> + <span tooltip-placement="bottom" uib-tooltip="{{getDocumentTitles(question.relatedDocuments)}}" tooltip-trigger="mouseenter" >{{question.relatedDocuments.length}}</span> </td> - <td ng-if="context.currentUser && !question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <td ng-if="context.currentUser && !question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center">0</td> </tr> <tr ng-repeat="question in closedQuestions" > <td ng-if="context.currentUser && context.currentUser.role != 'MEMBER'"> <span class="status-{{question.status|lowercase}}" title="{{question.status | translate}}"></span> - <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a> + <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" uib-tooltip="{{question.summary | limitTo: 250 }}">{{question.title}}</a> </td> <td ng-if="!context.currentUser || context.currentUser.role == 'MEMBER'">{{question.title}}</td> @@ -96,22 +96,22 @@ <td>{{question.deadline | date:'mediumDate'}}</td> <!-- clients : we use ng-if for better tooltip management --> - <td ng-if="context.currentUser && question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> + <td ng-if="context.currentUser && question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center"> + <span tooltip-placement="bottom" uib-tooltip="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> </td> - <td ng-if="context.currentUser && !question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <td ng-if="context.currentUser && !question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center">0</td> <!-- participants --> - <td ng-if="context.currentUser && question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> + <td ng-if="context.currentUser && question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center"> + <span tooltip-placement="bottom" uib-tooltip="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> </td> - <td ng-if="context.currentUser && !question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <td ng-if="context.currentUser && !question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center">0</td> <!-- related documents --> - <td ng-if="context.currentUser && question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> - <span tooltip-placement="bottom" tooltip-html-unsafe="{{getDocumentTitles(question.relatedDocuments)}}" tooltip-trigger="mouseenter" >{{question.relatedDocuments.length}}</span> + <td ng-if="context.currentUser && question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center"> + <span tooltip-placement="bottom" uib-tooltip="{{getDocumentTitles(question.relatedDocuments)}}" tooltip-trigger="mouseenter" >{{question.relatedDocuments.length}}</span> </td> - <td ng-if="context.currentUser && !question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <td ng-if="context.currentUser && !question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center">0</td> </tr> </tbody> </table> diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index a035b03..38e1958 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -43,7 +43,7 @@ <div class="" ng-class="{'has-error' : questionForm.type.$invalid && !questionForm.type.$pristine}"> <label class="col-md-2 control-label">{{ 'question.metadata.type' | translate }} * - <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'question.message.info.type' | translate }}"></span> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'question.message.info.type' | translate }}"></span> </label> <div class="col-md-3 "> @@ -64,7 +64,7 @@ <div class=""> <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> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'question.message.info.privacy' | translate }}"></span> </label> <div class="col-md-2"> @@ -118,7 +118,7 @@ <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> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'question.message.info.themes' | translate }}"></span> </label> <div class="col-md-2" > @@ -175,7 +175,7 @@ <tbody> <tr ng-repeat="parent in question.parents"> <td> - <div tooltip-placement="bottom" tooltip-html-unsafe="{{parent.summary}}"> + <div tooltip-placement="bottom" uib-tooltip="{{parent.summary | limitTo: 250 }}"> {{parent.title}} </div> </td> diff --git a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html index 9359a35..ef8a554 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"> - <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ '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"> @@ -53,7 +53,7 @@ <tr ng-repeat="question in questions"> <td> <a href="#/questions/{{question.id}}" target="_blank" - tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}"> + tooltip-placement="bottom" uib-tooltip="{{question.summary | limitTo: 250 }}"> {{question.title}} </a> </td> diff --git a/coselmar-ui/src/main/webapp/views/questions/questions.html b/coselmar-ui/src/main/webapp/views/questions/questions.html index fe77ca4..70e7d43 100644 --- a/coselmar-ui/src/main/webapp/views/questions/questions.html +++ b/coselmar-ui/src/main/webapp/views/questions/questions.html @@ -50,7 +50,7 @@ <tr ng-repeat="question in questions" > <td ng-if="context.currentUser.role != 'MEMBER'"> <span class="status-{{question.status|lowercase}}" title="{{question.status | translate}}"></span> - <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" uib-tooltip="{{question.summary}}">{{question.title}}</a> + <a href="#/questions/{{question.id}}" class="paddingLeft10" tooltip-placement="bottom" uib-tooltip="{{question.summary | limitTo: 250 }}">{{question.title}}</a> </td> <td ng-if="context.currentUser.role == 'MEMBER'">{{question.title}}</td> @@ -61,22 +61,22 @@ <td>{{question.deadline | date:'mediumDate'}}</td> <!-- clients : we use ng-if for better tooltip management --> - <td ng-if="question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> + <td ng-if="question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center"> <span tooltip-placement="bottom" uib-tooltip="{{getUserNames(question.clients)}}" >{{question.clients.length}}</span> </td> - <td ng-if="!question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <td ng-if="!question.clients && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center">0</td> <!-- participants --> - <td ng-if="question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> + <td ng-if="question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center"> <span tooltip-placement="bottom" uib-tooltip="{{getUserNames(question.participants)}}" >{{question.participants.length}}</span> </td> - <td ng-if="!question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <td ng-if="!question.participants && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center">0</td> <!-- related documents --> - <td ng-if="question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> + <td ng-if="question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center"> <span tooltip-placement="bottom" uib-tooltip="{{getDocumentTitles(question.relatedDocuments)}}" tooltip-trigger="mouseenter" >{{question.relatedDocuments.length}}</span> </td> - <td ng-if="!question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'">0</td> + <td ng-if="!question.relatedDocuments && context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'" class="text-center">0</td> <td ng-if="context.currentUser.role != 'MEMBER' && context.currentUser.role != 'CLIENT'"> <!--<a class="btn btn-action btn-disable" ng-click="closeQuestion(question.id)"--> diff --git a/coselmar-ui/src/main/webapp/views/questions/toolsPart.html b/coselmar-ui/src/main/webapp/views/questions/toolsPart.html index 332c44a..4f6e03d 100644 --- a/coselmar-ui/src/main/webapp/views/questions/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/questions/toolsPart.html @@ -33,10 +33,9 @@ <form class="form-inline pull-right search-zone" role="questionOptions" ng-submit="searchQuestions()" ng-show="!advanced"> <div class="form-group"> - <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> + {{ 'common.button.searchField' | translate }} + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'common.message.info.searchKeywords' | translate }}"></span> <input type="search" class="form-control" placeholder="keyword1,keyword2,..." ng-model="searchOptions.fullTextSearch" ng-list /> - </div> - <div class="form-group"> <button type="submit" class="btn btn-primary glyphicon glyphicon-search"></button> </div> <div class="form-group" ng-show="!advanced"> diff --git a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html index 0e4a949..6036320 100644 --- a/coselmar-ui/src/main/webapp/views/questions/viewquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/viewquestion.html @@ -205,7 +205,7 @@ </dl> <dl> <dt> - {{ 'question.metadata.contributors' | translate }} <span class="fa fa-info-circle marginLeft10" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'question.message.info.contributors' | translate }}"></span> + {{ 'question.metadata.contributors' | translate }} <span class="fa fa-info-circle marginLeft10" tooltip-placement="bottom" uib-tooltip="{{ 'question.message.info.contributors' | translate }}"></span> </dt> <dd> <ul> diff --git a/coselmar-ui/src/main/webapp/views/referential/referential.html b/coselmar-ui/src/main/webapp/views/referential/referential.html index bf27b19..53fd8d6 100644 --- a/coselmar-ui/src/main/webapp/views/referential/referential.html +++ b/coselmar-ui/src/main/webapp/views/referential/referential.html @@ -30,7 +30,7 @@ <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 }} - <span class="fa fa-info-circle" tooltip-placement="bottom" tooltip-html-unsafe="{{ 'common.message.info.searchKeywords' | translate }}"></span> + <span class="fa fa-info-circle" tooltip-placement="bottom" uib-tooltip="{{ 'common.message.info.searchKeywords' | translate }}"></span> </label> <div class="col-md-4"> @@ -75,7 +75,7 @@ <p ng-if="result.documents.length > 1">{{result.documents.length}} {{ 'referential.search.multipleDocumentsFound' | translate }}</p> <p ng-if="result.documents.length < 2">{{result.documents.length}} {{ 'referential.search.singleDocumentFound' | translate }}</p> - <table class="table" title="Documents"> + <table class="table"> <thead> <tr> <th>{{ 'document.metadata.name' | translate }}</th> @@ -88,7 +88,7 @@ <tr ng-repeat="document in result.documents"> <td> <a href="#/documents/{{document.id}}" target="_blank" - tooltip-placement="bottom" tooltip-html-unsafe="{{document.summary}}">{{document.name}}</a> + tooltip-placement="bottom" uib-tooltip="{{document.summary | limitTo: 250 }}">{{document.name}}</a> </td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td>{{document.authors}}</td> @@ -112,7 +112,7 @@ <p ng-if="result.questions.length < 2">{{result.questions.length}} {{ 'referential.search.singleQuestionFound' | translate }}</p> - <table class="table" title="Questions"> + <table class="table"> <thead> <tr> <th>{{ 'question.metadata.title' | translate }}</th> @@ -125,7 +125,7 @@ <tr ng-repeat="question in result.questions"> <td ng-if="context.currentUser.role != 'MEMBER'"> <a href="#/questions/{{question.id}}" target="_blank" - tooltip-placement="bottom" tooltip-html-unsafe="{{question.summary}}">{{question.title}}</a> + tooltip-placement="bottom" uib-tooltip="{{question.summary | limitTo: 250 }}">{{question.title}}</a> </td> <td>{{question.submissionDate | date:'mediumDate'}}</td> <td><span ng-repeat="theme in question.themes">{{theme}}<span ng-if="!$last">, </span> </span></td> diff --git a/coselmar-ui/src/main/webapp/views/users/searchPart.html b/coselmar-ui/src/main/webapp/views/users/searchPart.html index 0b8b8e9..6f2b6b4 100644 --- a/coselmar-ui/src/main/webapp/views/users/searchPart.html +++ b/coselmar-ui/src/main/webapp/views/users/searchPart.html @@ -36,14 +36,13 @@ <form class="form-inline pull-right search-zone" name="userOptions" role="userOptions" ng-submit="searchUsers()" ng-show="!advanced"> <div class="form-group"> - <input type="checkbox" class="form-control" ng-model="example.showDisable" /> - <span>{{ 'user.button.showDisable' | translate }}</span> - </div> - <div class="form-group marginLeft20"> + {{ 'common.button.searchField' | translate }} <input type="search" class="form-control" placeholder="Search an user" ng-model="example.fullTextSearch" ng-list/> + <button type="submit" class="btn btn-primary glyphicon glyphicon-search"></button> </div> <div class="form-group"> - <button type="submit" class="btn btn-primary glyphicon glyphicon-search"></button> + <input type="checkbox" ng-model="example.showDisable" /> + <span>{{ 'user.button.showDisable' | translate }}</span> </div> <div class="form-group" ng-show="!advanced"> <a ng-click="searchMode('advanced')" class="btn btn-action"><span class="glyphicon glyphicon-resize-full" aria-hidden="true"></span> {{ 'common.button.advanceSearch' | translate }}</a> -- 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 2286ca9807006a22cd4a45039ee3d5fb02a7fb7f Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Thu Jan 14 18:58:05 2016 +0100 Réorganisation des champs de la recherche avancée des documents --- .../src/main/webapp/views/documents/toolsPart.html | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html index 123fc16..4a4167a 100644 --- a/coselmar-ui/src/main/webapp/views/documents/toolsPart.html +++ b/coselmar-ui/src/main/webapp/views/documents/toolsPart.html @@ -80,15 +80,24 @@ <input class="form-control" type="search" class="form-control" placeholder="Nom et/ou Prénom" ng-model="example.authors" /> </div> - <label class="col-md-2 control-label">{{ 'document.metadata.depositor' | translate }}</label> + <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }}</label> <div class="col-md-4"> - <input type="search" class="form-control" placeholder="Prénom Nom" ng-model="example.ownerName" /> - + <select class="form-control" name="privacy" + ng-model="example.privacy"> + <option value="PRIVATE">{{ 'common.privacy.private' | translate }}</option> + <option value="PUBLIC">{{ 'common.privacy.public' | translate }}</option> + <option value="RESTRICTED">{{ 'common.privacy.restricted' | translate }}</option> + </select> </div> </div> <div class="form-group row"> + <label class="col-md-2 control-label">{{ 'document.metadata.depositor' | translate }}</label> + <div class="col-md-4"> + <input type="search" class="form-control" placeholder="Prénom Nom" ng-model="example.ownerName" /> + + </div> <label class="col-md-2 control-label">{{ 'document.metadata.type' | translate }}</label> <div class="col-md-4"> @@ -110,16 +119,6 @@ </select> </div> - <label class="col-md-2 control-label">{{ 'document.metadata.privacy' | translate }}</label> - <div class="col-md-4"> - <select class="form-control" name="privacy" - ng-model="example.privacy"> - <option value="PRIVATE">{{ 'common.privacy.private' | translate }}</option> - <option value="PUBLIC">{{ 'common.privacy.public' | translate }}</option> - <option value="RESTRICTED">{{ 'common.privacy.restricted' | translate }}</option> - </select> - </div> - </div> <div class="form-group row"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm