branch develop updated (5978299 -> 5bc95a1)
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 5978299 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new 5bc95a1 Fixes #6503: Move edit button on question view page 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 5bc95a1904adefc64edf0fbe18cfb60fdd258456 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 16:52:37 2015 +0100 Fixes #6503: Move edit button on question view page Summary of changes: coselmar-ui/src/main/webapp/views/questions/question.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 5bc95a1904adefc64edf0fbe18cfb60fdd258456 Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Tue Jan 27 16:52:37 2015 +0100 Fixes #6503: Move edit button on question view page --- coselmar-ui/src/main/webapp/views/questions/question.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index d7bc855..72696b5 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -25,9 +25,6 @@ <div class="page-header" style="margin: 0"> <h2> {{question.title}} - <a class="btn btn-action btn-edit pull-right" ng-click="edit()" ng-if="editSession != true && currentUser.role == 'SUPERVISOR'"> - <span class="fa fa-edit" aria-hidden="true"></span>{{ 'common.button.edit' | translate }} - </a> </h2> </div> @@ -66,6 +63,10 @@ </div> <div class="text-center" ng-if="!question.closingDate && currentUser.role == 'SUPERVISOR' && editSession == false && !closeSession"> + <a class="btn btn-action btn-edit" ng-click="edit()" ng-if="editSession != true && 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> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm