branch develop updated (86bd254 -> 0611219)
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 86bd254 fix english translation for welcome page new 0611219 Fixes #6581 : Fix display issue when closing a question 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 06112190bc6443f56ac051ac7e3f4c33571597db Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Jan 30 10:04:01 2015 +0100 Fixes #6581 : Fix display issue when closing a question Summary of changes: .../src/main/webapp/views/questions/closeQuestion.html | 17 +++++++++-------- .../src/main/webapp/views/questions/question.html | 3 ++- 2 files changed, 11 insertions(+), 9 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 06112190bc6443f56ac051ac7e3f4c33571597db Author: Léo Kaufmann <kaufmann@codelutin.com> Date: Fri Jan 30 10:04:01 2015 +0100 Fixes #6581 : Fix display issue when closing a question --- .../src/main/webapp/views/questions/closeQuestion.html | 17 +++++++++-------- .../src/main/webapp/views/questions/question.html | 3 ++- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html index 583e98d..5400524 100644 --- a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html @@ -24,20 +24,19 @@ <!-- Close part : conclusion and conclusion documents --> <div class=""> - <div class="form-group cold-md-12" + <div class="form-group col-md-8" ng-class="{'has-error' : questionForm.summary.$invalid && !questionForm.summary.$pristine}"> <dl> <dt>{{ 'question.metadata.conclusion' | translate }}</dt> + <dd> + <textarea type="text" class="form-control" name="summary" rows="8" + ng-model="question.conclusion" required/> + </dd> </dl> - - <dd> - <textarea type="text" class="form-control" name="summary" rows="8" - ng-model="question.conclusion" required/> - </dd> </div> - <div class="form-group col-md-12"> + <div class="form-group col-md-8"> <dl> @@ -72,8 +71,10 @@ </div> +</div> + +<div class="actions"> <a class="btn btn-action btn-success" ng-click="closeQuestion()"> <span class="fa fa-check-square-o" aria-hidden="true"></span>{{ 'question.button.close.fullText' | translate }} </a> - </div> \ No newline at end of file diff --git a/coselmar-ui/src/main/webapp/views/questions/question.html b/coselmar-ui/src/main/webapp/views/questions/question.html index 68d2dc6..e8bd1c3 100644 --- a/coselmar-ui/src/main/webapp/views/questions/question.html +++ b/coselmar-ui/src/main/webapp/views/questions/question.html @@ -53,7 +53,8 @@ </div> <div ng-include="src='views/questions/closeQuestion.html'" - ng-if="currentUser.role == 'SUPERVISOR' && closeSession"> + ng-if="currentUser.role == 'SUPERVISOR' && closeSession" + class="clear"> </div> <div class="actions" ng-if="question.closingDate && currentUser.role == 'SUPERVISOR' && editSession == false"> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm