branch develop updated (caeb07f -> aeb9248)
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 caeb07f Merge branch 'feature/6020-close-question' into develop new aeb9248 add forgotten file for close 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 aeb924812e4f83ce0f32949cbe81fb3ef442ab86 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 11 10:47:43 2014 +0100 add forgotten file for close question Summary of changes: .../main/webapp/views/questions/closeQuestion.html | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 coselmar-ui/src/main/webapp/views/questions/closeQuestion.html -- 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 aeb924812e4f83ce0f32949cbe81fb3ef442ab86 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Dec 11 10:47:43 2014 +0100 add forgotten file for close question --- .../main/webapp/views/questions/closeQuestion.html | 56 ++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html new file mode 100644 index 0000000..2de1658 --- /dev/null +++ b/coselmar-ui/src/main/webapp/views/questions/closeQuestion.html @@ -0,0 +1,56 @@ +<!-- Close part : conclusion and conclusion documents --> +<div class=""> + + <div class="form-group cold-md-12" + ng-class="{'has-error' : questionForm.summary.$invalid && !questionForm.summary.$pristine}"> + + <dl> + <dt>Conclusion</dt> + </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"> + + <dl> + + <dt>Conclusion Documents</dt> + + <dd> + <table class="table table-bordered table-condensed"> + <tr> + <th>Name</th> + <th>Owner</th> + <th>Keywords</th> + <th>Deposit Date</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> + </tr> + <tr ng-repeat="document in question.closingDocuments"> + <td>{{document.name}}</a></td> + <td>{{document.ownerName}}</td> + <td><span + ng-repeat="keyword in document.keywords">{{keyword}}, </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> + </tr> + </table> + </dd> + </dl> + + </div> + + <a class="btn btn-action btn-success" ng-click="closeQuestion()"> + <span class="fa fa-check-square-o" aria-hidden="true"></span>Close this question + </a> + +</div> \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm