summaryrefslogtreecommitdiff
path: root/static/website
diff options
context:
space:
mode:
authorholyantony2015-05-08 12:03:49 +0530
committerholyantony2015-05-08 12:03:49 +0530
commitfd3d3d3c33d078cf497ca69937dc1a5402b4326c (patch)
treeb98c5a571a0e58583306261ce6b4466d97875066 /static/website
parentf691ef58933bf33033389a1a468f655af19c1e16 (diff)
parent8cf7e60d250f8f6f43d7f66ed7b96e451f379502 (diff)
downloadFOSSEE-Forum-fd3d3d3c33d078cf497ca69937dc1a5402b4326c.tar.gz
FOSSEE-Forum-fd3d3d3c33d078cf497ca69937dc1a5402b4326c.tar.bz2
FOSSEE-Forum-fd3d3d3c33d078cf497ca69937dc1a5402b4326c.zip
Merge branch 'fossee-forum' of https://github.com/FOSSEE/spoken-tutorial-forums into fossee-forum
Diffstat (limited to 'static/website')
-rw-r--r--static/website/templates/filter.html1
-rw-r--r--static/website/templates/notify.html10
2 files changed, 6 insertions, 5 deletions
diff --git a/static/website/templates/filter.html b/static/website/templates/filter.html
index c444e78..d0c57f0 100644
--- a/static/website/templates/filter.html
+++ b/static/website/templates/filter.html
@@ -27,7 +27,6 @@
<table class="table table-bordered">
<th> FOSS </th>
- <!--<th> Tutorial</th>-->
<th> Question</th>
<th> Date</th>
<th> Views</th>
diff --git a/static/website/templates/notify.html b/static/website/templates/notify.html
index a98d21a..2ea55c5 100644
--- a/static/website/templates/notify.html
+++ b/static/website/templates/notify.html
@@ -1,15 +1,17 @@
<div class="notification">
+
{% if notification.cid != 0 and notification.aid != 0 %}
<small>
- <a href="">New <strong>Comment</strong> on "{{ question.title }}"</a>
+ <a href="{% url 'website:get_question' answer.question.id %}#answer{{ answer.id }}">New <strong>Comment</strong> on "{{ question.title }}"</a>
</small>
+
{% elif notification.cid == 0 %}
- <a href="">New <strong>Answer</strong> on "{{ question.title }}"</a>
+
+ <a href="{% url 'website:get_question' answer.question.id %}#answer{{ answer.id }}"+ >New <strong>Answer</strong> on <strong>"{{ question.title }}"</strong></a>
{% endif %}
- <!-- <a href=""><strong>{{ answer.user }}</strong> answers to <strong>{{ question.title }}</strong></a> -->
- <a class="remove" data-nid="{{ notification.id }}" href="#">
+ <a class="remove" data-nid="{{ notification.id }}" href= "">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
</div> <!-- /.notification -->