diff options
| author | ashwinishinde | 2015-05-13 16:47:55 +0530 |
|---|---|---|
| committer | ashwinishinde | 2015-05-13 16:47:55 +0530 |
| commit | 0e3fdb61376f2037a7f0745bc363b946eafd5517 (patch) | |
| tree | 9bdc42547545cef5e7892b1e793b575182b00bf1 /static/website/templates | |
| parent | b0351d0df6ae7fef2a461706542410a7e7ecea35 (diff) | |
| download | FOSSEE-Forum-0e3fdb61376f2037a7f0745bc363b946eafd5517.tar.gz FOSSEE-Forum-0e3fdb61376f2037a7f0745bc363b946eafd5517.tar.bz2 FOSSEE-Forum-0e3fdb61376f2037a7f0745bc363b946eafd5517.zip | |
Subject:resolved conflict in new comment_id and old
Description:
1) Bug in add comment
2) TextArea id is same as old comment id then
niceEditor of add comment overlaps the old
comment value.
3) Answer CSS change.
Diffstat (limited to 'static/website/templates')
| -rw-r--r-- | static/website/templates/get-question.html | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html index 04d9118..c31259b 100644 --- a/static/website/templates/get-question.html +++ b/static/website/templates/get-question.html @@ -107,7 +107,7 @@ <div class="comments pull-right col-lg-11 col-md-11 col-sm-11 col-xs-11"> <!-- displaying comments --> {% for comment in answer.answercomment_set.all %} - <div class="comment" id="comment{{ comment.id }}"> + <div class="comment comment{{ comment.id }}"> <div class="body" id="cbody{{ comment.id }}"> {{ comment.body|safe }} </div> @@ -137,25 +137,33 @@ <!-- form to add comment --> {% if user.is_authenticated %} + <form id="form{{ answer.id }}" method="post" action="/answer-comment/"> {% csrf_token %} - <input type="hidden" name="answer_id" value="{{answer.id}}"> + <input type="hidden" name="answer_id" value="{{ answer.id }}"> <textarea name="body" class="new-comment form-control" id="comment{{ answer.id }}" rows="2"></textarea> </form> + + <a class="add-comment" href="#" data-target="comment{{ answer.id }}"> <small>add comment</small> </a> + + <a class="post-comment" href="#" data-target="comment{{ answer.id }}" data-aid="{{ answer.id }}" data-form="form{{ answer.id }}"> <small>post comment</small> </a> + <a class="cancel-comment" href="#" data-target="comment{{ answer.id }}"> <small>cancel comment</small> </a> + {% else %} <br> <a class="btn btn-xs btn-success vs" href="/accounts/login"> Login to add comment </a> {% endif %} + </div> <!-- comments --> </div> <!-- /.row --> <br> <hr> |