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 68cd77f2c7e84df8952dbeff6f2bfa485e737180 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Mon Feb 1 12:18:52 2016 +0100 Refs #7913 : Modifications d'affichage des messages sous les boutons d'actions --- coselmar-ui/src/main/webapp/i18n/fr.js | 2 +- .../src/main/webapp/views/documents/viewDocument.html | 2 +- .../src/main/webapp/views/questions/closeQuestion.html | 2 +- .../src/main/webapp/views/questions/editquestion.html | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index aaef867..03ebe5a 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -127,7 +127,7 @@ var translateFR = { <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.message.info.referredInProjects" : "Le document est référencé par des projets et ne peut donc être modifié.", +"document.message.info.referredInProjects" : "Le document est référencé par des projets et ne peut donc être édité.", "document.button.download" : "Télécharger", "document.button.openLink" : "Ouvrir le lien", diff --git a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html index 63529f1..62ab54e 100644 --- a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html @@ -163,7 +163,7 @@ <span class="fa fa-remove" aria-hidden="true"></span>{{ 'common.button.delete' | translate }} </a> </div> - <div ng-if="!canEdit" class="actions"> + <div ng-if="!canEdit" class="actions-notification"> {{ 'document.message.info.referredInProjects' | translate }} </div> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html index 5498089..c0fa63f 100644 --- a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html @@ -60,7 +60,7 @@ <td>{{document.name}}</a></td> <td>{{document.ownerName}}</td> <td><span - ng-repeat="keyword in document.keywords">{{keyword}}, </span></td> + ng-repeat="keyword in document.keywords">{{keyword}}<span ng-if="!$last">, </span></span></td> <td>{{document.depositDate | date:'mediumDate'}}</td> <td><a class="btn fa fa-minus" title="Remove document" ng-click="removeDocument(document, question.closingDocuments)" /></td> diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 6d39e51..8bb4497 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -252,14 +252,14 @@ ng-disabled="disabled" class="form-control"> <ui-select-match placeholder="Select expert..."> - {{$item.firstName}} {{$item.name}} ({{$item.organization}}) + {{$item.firstName}} {{$item.name}}<span ng-if="$item.organization"> ({{$item.organization}})</span> </ui-select-match> <ui-select-choices repeat="expert in ( users.participants | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search} ) track by expert.id " refresh="refreshExperts($select.search)" refresh-delay="500"> - {{expert.firstName}} {{expert.name}} ({{expert.organization}}) + {{expert.firstName}} {{expert.name}}<span ng-if="expert.organization"> ({{expert.organization}})</span> </ui-select-choices> </ui-select> @@ -277,14 +277,14 @@ ng-disabled="disabled" class="form-control"> <ui-select-match placeholder="Select client..."> - {{$item.firstName}} {{$item.name}} ({{$item.organization}}) + {{$item.firstName}} {{$item.name}}<span ng-if="$item.organization"> ({{$item.organization}})</span> </ui-select-match> <ui-select-choices repeat="expert in users.clients | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}" refresh="refreshClients($select.search)" refresh-delay="500"> - {{expert.firstName}} {{expert.name}} ({{expert.organization}}) + {{expert.firstName}} {{expert.name}}<span ng-if="expert.organization"> ({{expert.organization}})</span> </ui-select-choices> </ui-select> @@ -325,14 +325,14 @@ ng-disabled="disabled" class="form-control"> <ui-select-match placeholder="Select supervisor..."> - {{$item.firstName}} {{$item.name}} ({{$item.organization}}) + {{$item.firstName}} {{$item.name}}<span ng-if="$item.organization"> ({{$item.organization}})</span> </ui-select-match> <ui-select-choices repeat="expert in ( users.supervisors | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search} ) track by expert.id" refresh="refreshSupervisors($select.search)" refresh-delay="500"> - {{expert.firstName}} {{expert.name}} ({{expert.organization}}) + {{expert.firstName}} {{expert.name}}<span ng-if="expert.organization"> ({{expert.organization}})</span> </ui-select-choices> </ui-select> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.