diff options
| author | Jayaram Pai | 2014-04-15 16:01:00 +0530 |
|---|---|---|
| committer | Jayaram Pai | 2014-04-15 16:01:00 +0530 |
| commit | 83063012ac3eac51983c83d3b1681595aa59eb1d (patch) | |
| tree | ed7fb51e09e70ac0490f48c3ddf0c15a573d69ad /static/website/templates/get-question.html | |
| parent | 7c74b30aafb85b026ce846de8d2fb6a514d6e4ae (diff) | |
| download | FOSSEE-Forum-83063012ac3eac51983c83d3b1681595aa59eb1d.tar.gz FOSSEE-Forum-83063012ac3eac51983c83d3b1681595aa59eb1d.tar.bz2 FOSSEE-Forum-83063012ac3eac51983c83d3b1681595aa59eb1d.zip | |
major changes done, category logos added
Diffstat (limited to 'static/website/templates/get-question.html')
| -rw-r--r-- | static/website/templates/get-question.html | 31 |
1 files changed, 27 insertions, 4 deletions
diff --git a/static/website/templates/get-question.html b/static/website/templates/get-question.html index 3d2d3f0..48aa427 100644 --- a/static/website/templates/get-question.html +++ b/static/website/templates/get-question.html @@ -73,7 +73,7 @@ <span class="meta"> <small> <i> - {{ question.date_created|date:"y-d-m" }}, {{ question.date_created|time }} + {{ question.date_created|date:"d-m-y" }}, {{ question.date_created|time }} </i> </small> @@ -125,15 +125,31 @@ {{ comment.body|safe }} </div> - <span class="modify" style="display:block"> - <a class="edit btn btn-xs btn-info vs" href="#cbody{{ comment.id }}" data-target="cbody{{ comment.id }}">Edit</a> - <a class="save btn btn-xs btn-success vs" data-target="cbody{{ comment.id }}" data-cid="{{ comment.id }}" href="#">Save</a> + <span class="meta"> + <small> + <i> + {{ question.date_created|date:"d-m-y" }}, {{ question.date_created|time }} + </i> + </small> + + <span class="user"> + {{ question.user }} + </span> </span> + {% if user|can_edit:comment %} + <div class="modify-wrapper"> + <span class="modify" style="display:block"> + <a class="edit btn btn-xs btn-info vs" href="#cbody{{ comment.id }}" data-target="cbody{{ comment.id }}">Edit</a> + <a class="save btn btn-xs btn-success vs" data-target="cbody{{ comment.id }}" data-cid="{{ comment.id }}" href="#">Save</a> + </span> + </div> + {% endif %} </div> <!-- /.comment --> {% endfor %} <!-- 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}}"> <textarea name="body" class="new-comment form-control" id="comment{{ answer.id }}" rows="2"></textarea> @@ -147,6 +163,12 @@ <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> @@ -246,6 +268,7 @@ <option value="Tux-Typing">Tux-Typing</option> <option value="What-is-Spoken-Tutorial">What-is-Spoken-Tutorial</option> <option value="Xfig">Xfig</option> + <option value="General">General FOSS</option> </select> </div> <div class="col-lg-4 col-md-4 col-sm-4"> |