branch develop updated (e0ddaee -> e2a425b)
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 e0ddaee fixes #6593 review management of question.themes in UI and in services new e2a425b fix validate button in question create/edit 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 e2a425b190e68ca077ee1f42c28255947575badb Author: Yannick Martel <martel@©odelutin.com> Date: Fri Jan 30 14:54:04 2015 +0100 fix validate button in question create/edit Summary of changes: coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/views/questions/editquestion.html | 4 ---- coselmar-ui/src/main/webapp/views/questions/newquestion.html | 2 +- coselmar-ui/src/main/webapp/views/questions/question.html | 4 ++++ 5 files changed, 7 insertions(+), 5 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 e2a425b190e68ca077ee1f42c28255947575badb Author: Yannick Martel <martel@©odelutin.com> Date: Fri Jan 30 14:54:04 2015 +0100 fix validate button in question create/edit --- coselmar-ui/src/main/webapp/i18n/en.js | 1 + coselmar-ui/src/main/webapp/i18n/fr.js | 1 + coselmar-ui/src/main/webapp/views/questions/editquestion.html | 4 ---- coselmar-ui/src/main/webapp/views/questions/newquestion.html | 2 +- coselmar-ui/src/main/webapp/views/questions/question.html | 4 ++++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 005cf2b..449e58a 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -249,6 +249,7 @@ var translateEN = { "common.privacy.public" : "Public", "common.privacy.restricted" : "Restricted", +"common.button.validate" : "Validate", "common.button.delete" : "Delete", "common.button.edit" : "Modify", "common.button.add" : "Add", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index b7f20a6..b09568b 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -249,6 +249,7 @@ var translateFR = { "common.privacy.public" : "Publique", "common.privacy.restricted" : "Restreint", +"common.button.validate" : "Valider", "common.button.delete" : "Supprimer", "common.button.edit" : "Éditer", "common.button.add" : "Ajouter", diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 06725af..b7fcee8 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -334,10 +334,6 @@ </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> <!-- End Line with External Experts and Supervisor --> diff --git a/coselmar-ui/src/main/webapp/views/questions/newquestion.html b/coselmar-ui/src/main/webapp/views/questions/newquestion.html index 822dc4d..7f21552 100644 --- a/coselmar-ui/src/main/webapp/views/questions/newquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/newquestion.html @@ -34,7 +34,7 @@ <div ng-include="src='views/questions/editquestion.html'"></div> <div class="form-group actions"> - <input type="submit" value="Validate" class="btn btn-action" ng-click="saveQuestion()" ng-disabled="questionForm.$invalid || question.themes.length == 0"/> + <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> </div> diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index 4df990d..84eb363 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -41,6 +41,10 @@ <div style="padding-bottom: 50px" ng-if="editSession == true"> <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> </form> </div> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm