branch develop updated (4f9147d -> 5b4386e)
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 4f9147d Fixes #7981 Add message for input language when language is different from english new 5b4386e Ajout d'un bouton Annuler partout où c'est faisable 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 5b4386eb2cd8d71b0423cd636a34366e409abf6f Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Feb 10 19:39:01 2016 +0100 Ajout d'un bouton Annuler partout où c'est faisable Summary of changes: coselmar-ui/src/main/webapp/css/coselmar.css | 8 +++++++ .../src/main/webapp/js/coselmar-controllers.js | 26 ++++++++++++++++++++++ .../main/webapp/views/documents/editDocument.html | 3 +++ .../webapp/views/documents/modalDocumentEdit.html | 2 +- .../views/documents/modalDocumentSearch.html | 2 +- .../main/webapp/views/documents/newdocument.html | 3 +++ .../src/main/webapp/views/links/modalLinkEdit.html | 2 +- .../main/webapp/views/questions/closeQuestion.html | 14 +++++++----- .../main/webapp/views/questions/editquestion.html | 2 +- .../webapp/views/questions/modalHierarchy.html | 2 +- .../views/questions/modalQuestionSearch.html | 2 +- .../main/webapp/views/questions/newquestion.html | 3 +++ .../src/main/webapp/views/questions/question.html | 19 ++++++++++------ .../src/main/webapp/views/users/edituser.html | 3 +++ 14 files changed, 73 insertions(+), 18 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 5b4386eb2cd8d71b0423cd636a34366e409abf6f Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Wed Feb 10 19:39:01 2016 +0100 Ajout d'un bouton Annuler partout où c'est faisable --- coselmar-ui/src/main/webapp/css/coselmar.css | 8 +++++++ .../src/main/webapp/js/coselmar-controllers.js | 26 ++++++++++++++++++++++ .../main/webapp/views/documents/editDocument.html | 3 +++ .../webapp/views/documents/modalDocumentEdit.html | 2 +- .../views/documents/modalDocumentSearch.html | 2 +- .../main/webapp/views/documents/newdocument.html | 3 +++ .../src/main/webapp/views/links/modalLinkEdit.html | 2 +- .../main/webapp/views/questions/closeQuestion.html | 14 +++++++----- .../main/webapp/views/questions/editquestion.html | 2 +- .../webapp/views/questions/modalHierarchy.html | 2 +- .../views/questions/modalQuestionSearch.html | 2 +- .../main/webapp/views/questions/newquestion.html | 3 +++ .../src/main/webapp/views/questions/question.html | 19 ++++++++++------ .../src/main/webapp/views/users/edituser.html | 3 +++ 14 files changed, 73 insertions(+), 18 deletions(-) diff --git a/coselmar-ui/src/main/webapp/css/coselmar.css b/coselmar-ui/src/main/webapp/css/coselmar.css index 8d775cd..c88166d 100644 --- a/coselmar-ui/src/main/webapp/css/coselmar.css +++ b/coselmar-ui/src/main/webapp/css/coselmar.css @@ -249,6 +249,14 @@ h2 { background-color: #d9534f !important; } +.btn-cancel { + color: #999 !important; + border-color: #999; +} +.btn-cancel:hover { + background-color: #999 !important; +} + .btn .fa { padding-right: 5px; } diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 8bd7ba3..5f240e5 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -384,6 +384,10 @@ coselmarControllers.controller("NewDocumentCtrl", ['$scope', '$location', 'notif }; + $scope.cancelDocumentCreation = function(){ + $location.path('/documents'); + } + $scope.addKeyword = function(keywordList) { if (keywordList) { var keywords = keywordList.split( /,\s*/ ); @@ -579,6 +583,10 @@ coselmarControllers.controller("DocumentViewCtrl", }; + $scope.cancelDocumentModification = function(){ + $location.search(""); + } + $scope.addKeyword = function(keywordList) { if (keywordList) { var keywords = keywordList.split( /,\s*/ ); @@ -855,6 +863,10 @@ coselmarControllers.controller("NewUserCtrl", ['$scope', '$route', '$location', } }; + + $scope.cancelUserModification = function(){ + $location.path('/users'); + }; }]); // Controller for single User View & Edit @@ -1007,6 +1019,9 @@ coselmarControllers.controller("UserViewCtrl", } }; + $scope.cancelUserModification = function(){ + $location.search(""); + }; } ]); coselmarControllers.controller("NewPasswordCtrl", ['$scope', '$translate', 'userService', function($scope, $translate, userService){ @@ -1147,6 +1162,10 @@ coselmarControllers.controller("QuestionsCtrl", ['$scope', '$route', '$routePara }, errorService.defaultFailOnCall); }; + $scope.cancelQuestionModification = function(){ + $location.search(""); + }; + $scope.getUserNames = function(users) { var names = ""; @@ -1391,6 +1410,13 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam } }; + $scope.cancelQuestionModification = function(){ + $location.search(""); + }; + $scope.cancelQuestionCreation = function(){ + $location.path('/questions'); + }; + $scope.closeQuestion = function(){ $scope.question.status = "CLOSED"; diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index a514906..074a5d0 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.html @@ -314,6 +314,9 @@ <div class="text-center help-block">{{ 'common.message.missingMandatoryFields' | translate }}</div> </div> <div class="actions"> + <a class="btn btn-action btn-cancel" ng-click="cancelDocumentModification()"> + {{ 'common.button.cancel' | translate }} + </a> <input type="submit" value="{{ 'common.button.validate' | translate}}" class="btn btn-action btn-success" ng-click="saveDocument()" ng-disabled="documentForm.$invalid || keywordsError" /> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html index 32d5446..0e5e190 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentEdit.html @@ -297,7 +297,7 @@ <div class="text-center help-block">{{ 'common.message.missingMandatoryFields' | translate }}</div> </div> - <button class="btn btn-action btn-disable" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> + <button class="btn btn-action btn-cancel" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> <input type="submit" value="{{ 'common.button.validate' | translate}}" class="btn btn-action btn-success float-right" ng-disabled="documentForm.$invalid || keywordsError || (!document.externalUrl && !upload.file)" /> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html index f6ecb69..bf5df80 100644 --- a/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html +++ b/coselmar-ui/src/main/webapp/views/documents/modalDocumentSearch.html @@ -71,6 +71,6 @@ <p ng-if="documents && documents.length == 0" translate="common.search.noResult" class="info"/> </div> <div class="modal-footer"> - <button class="btn btn-action btn-disable" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> + <button class="btn btn-action btn-cancel" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> </div> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/documents/newdocument.html b/coselmar-ui/src/main/webapp/views/documents/newdocument.html index 7a42306..6de000f 100644 --- a/coselmar-ui/src/main/webapp/views/documents/newdocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/newdocument.html @@ -303,6 +303,9 @@ </div> <div class="form-group actions" ng-if="privacy != 'RESTRICTED'"> + <a class="btn btn-action btn-cancel" ng-click="cancelDocumentCreation()"> + {{ 'common.button.cancel' | translate }} + </a> <input type="submit" value="{{ 'common.button.validate' | translate}}" class="btn btn-action" ng-disabled="documentForm.$invalid || keywordsError || (!document.externalUrl && !upload.file)"/> </div> diff --git a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html index 35ae2b1..00d3e03 100644 --- a/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html +++ b/coselmar-ui/src/main/webapp/views/links/modalLinkEdit.html @@ -77,7 +77,7 @@ </div> <div class="modal-footer"> - <button class="btn btn-action btn-disable" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> + <button class="btn btn-action btn-cancel" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> <input type="submit" value="{{ 'common.button.validate' | translate}}" class="btn btn-action btn-success float-right" ng-disabled="linkForm.$invalid" /> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html index c0fa63f..cade85a 100644 --- a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html @@ -49,11 +49,15 @@ <th>{{ 'document.metadata.depositor' | translate }}</th> <th>{{ 'document.metadata.keywords' | translate }}</th> <th>{{ 'document.metadata.depositDate' | translate }}</th> - <th> - <a class="btn fa fa-search" title="Search document" - ng-click="modalSearchDocuments(question.closingDocuments)"/> - <a class="btn fa fa-plus" title="Add new Document" - ng-click="modalCreateDocument(question.closingDocuments)"/> + <th class="cell-with-btn-icon text-right"> + <a class="btn btn-action-header btn-icon" title="Search document" + ng-click="modalSearchDocuments(question.closingDocuments)"> + <span class="fa fa-search"></span> + </a> + <a class="btn btn-action-header btn-icon" title="Add new Document" + ng-click="modalCreateDocument(question.closingDocuments)"> + <span class="fa fa-plus"></span> + </a> </th> </tr> <tr ng-repeat="document in question.closingDocuments | orderBy:'depositDate':true"> diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 9787260..14a0618 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -182,7 +182,7 @@ </div> </td> <td>{{parent.submissionDate | date:'mediumDate'}}</td> - <td><span ng-repeat="theme in parent.themes">{{theme}}, </span></td> + <td><span ng-repeat="theme in parent.themes">{{theme}}<span ng-if="!$last">, </span></span></td> <td><span class="status-{{parent.status|lowercase}}"></span>{{parent.status | translate}}</td> <td class="cell-with-btn-icon text-right"> <a class="btn btn-action btn-icon" title="Remove parent question" diff --git a/coselmar-ui/src/main/webapp/views/questions/modalHierarchy.html b/coselmar-ui/src/main/webapp/views/questions/modalHierarchy.html index db0ef5d..3bfdb63 100644 --- a/coselmar-ui/src/main/webapp/views/questions/modalHierarchy.html +++ b/coselmar-ui/src/main/webapp/views/questions/modalHierarchy.html @@ -34,7 +34,7 @@ </div> <div class="modal-footer"> - <button class="btn btn-action btn-disable" ng-click="cancel()">{{ 'common.button.close' | translate }}</button> + <button class="btn btn-action btn-cancel" ng-click="cancel()">{{ 'common.button.close' | translate }}</button> </div> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html index c7efa78..6250ba3 100644 --- a/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html +++ b/coselmar-ui/src/main/webapp/views/questions/modalQuestionSearch.html @@ -71,6 +71,6 @@ <p ng-if="questions && questions.length == 0" translate="common.search.noResult" class="info"/> </div> <div class="modal-footer"> - <button class="btn btn-action btn-disable" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> + <button class="btn btn-action btn-cancel" ng-click="cancel()">{{ 'common.button.cancel' | translate }}</button> </div> </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/questions/newquestion.html b/coselmar-ui/src/main/webapp/views/questions/newquestion.html index 80e580b..b188bef 100644 --- a/coselmar-ui/src/main/webapp/views/questions/newquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/newquestion.html @@ -34,6 +34,9 @@ <div ng-include="src='views/questions/editquestion.html'"></div> <div class="form-group actions"> + <a class="btn btn-action btn-cancel" ng-click="cancelQuestionCreation()"> + {{ 'common.button.cancel' | translate }} + </a> <input type="submit" value="{{ 'common.button.validate' | translate}}" class="btn btn-action" ng-click="saveQuestion()" ng-disabled="questionForm.$invalid || question.themes.length == 0"/> </div> </form> diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index 4b549b3..d6b93ee 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -42,9 +42,15 @@ <form name="questionForm" class="form-horizontal" role="form"> <div ng-include="src='views/questions/editquestion.html'"></div> - <div class="form-group actions"><a class="btn btn-action btn-success" ng-click="saveQuestion()" ng-disabled="questionForm.$invalid || question.themes.length == 0"> - <span class="fa fa-check-square-o" aria-hidden="true"></span>{{ 'question.button.validateChanges' | translate }} - </a></div> + <div class="form-group actions"> + <a class="btn btn-action btn-cancel" ng-click="cancelQuestionModification()"> + {{ 'common.button.cancel' | translate }} + </a> + + <a class="btn btn-action btn-success" ng-click="saveQuestion()" ng-disabled="questionForm.$invalid || question.themes.length == 0"> + <span class="fa fa-check-square-o" aria-hidden="true"></span>{{ 'question.button.validateChanges' | translate }} + </a> + </div> </form> </div> @@ -68,13 +74,12 @@ <a class="btn btn-action btn-edit" ng-click="edit()" ng-if="editSession != true && context.currentUser.role == 'SUPERVISOR'"> <span class="fa fa-edit" aria-hidden="true"></span>{{ 'common.button.edit' | translate }} </a> - - <a class="btn btn-action btn-success" ng-click="openCloseQuestionSession()"> - <span class="fa fa-check-square-o" aria-hidden="true"></span>{{ 'question.button.close' | translate }} - </a> <a class="btn btn-action btn-edit" ng-click="adjournQuestion()"> <span class="fa fa-edit" aria-hidden="true"></span>{{ 'question.button.adjourn' | translate }} </a> + <a class="btn btn-action btn-success" ng-click="openCloseQuestionSession()"> + <span class="fa fa-check-square-o" aria-hidden="true"></span>{{ 'question.button.close' | translate }} + </a> <a class="btn btn-action btn-disable" ng-confirm-message="question.message.delete" ng-confirm-click="deleteQuestion()"> diff --git a/coselmar-ui/src/main/webapp/views/users/edituser.html b/coselmar-ui/src/main/webapp/views/users/edituser.html index d18fd3d..0aa0842 100644 --- a/coselmar-ui/src/main/webapp/views/users/edituser.html +++ b/coselmar-ui/src/main/webapp/views/users/edituser.html @@ -183,6 +183,9 @@ <div class="actions"> + <a class="btn btn-action btn-cancel" ng-click="cancelUserModification()"> + {{ 'common.button.cancel' | translate }} + </a> <input type="submit" value="{{ 'common.button.validate' | translate}}" class="btn btn-action" ng-disabled="userForm.$invalid"/> </div> </form> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm