Applys patches by Sandeep Ghael to fix OSQA-355, OSQA-324, OSQA-411 and OSQA 149.

[osqa.git] / forum / skins / default / templates / subscription_status.html

diff --git a/forum/skins/default/templates/subscription_status.html b/forum/skins/default/templates/subscription_status.html
index 6539ddd95798f2dfdaf1b8ff740866ce14aa4f58..46ad235beaeb75728646588cb392afaf18c3781f 100644 (file)
--- a/forum/skins/default/templates/subscription_status.html
+++ b/forum/skins/default/templates/subscription_status.html
@@ -1,6 +1,7 @@
-{% load i18n %}\r
-\r
-<h3 class="subtitle">{% trans "Subscription" %}:</h3>\r
+{% spaceless %}\r
+{% load i18n extra_tags %}\r
+<h3 class="subtitle">{% trans "Follow this question" %}</h3>\r
+<strong>{% trans "By Email" %}:</strong>\r
 {% if request.user.is_authenticated %}\r
     <div class="subscription-status">\r
         {% if subscription %}\r
@@ -21,7 +22,7 @@
         {% endif %}\r
     </a></p>\r
     <p>\r
-        {% url user_subscriptions id=request.user.id as subscriptions_url %}\r
+        {% url user_subscriptions id=request.user.id,slug=request.user.username|slugify as subscriptions_url %}\r
         {% blocktrans %}\r
             (you can adjust your notification settings on your <a href="{{ subscriptions_url }}">profile</a>)\r
         {% endblocktrans %}\r
@@ -29,3 +30,15 @@
 {% else %}\r
     <p>{% trans "Once you sign in you will be able to subscribe for any updates here" %}</p>\r
 {% endif %}\r
+<strong>{% trans "By RSS" %}:</strong>\r
+<p>\r
+    <a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');"\r
+        href="{{ question.get_absolute_url }}?type=rss" title="{% trans "subscribe to answers" %}"></a>\r
+    {% trans "Answers" %}\r
+</p>\r
+<p>\r
+    <a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');"\r
+        href="{{ question.get_absolute_url }}?type=rss&comments=yes" title="{% trans "subscribe to comments and answers" %}"></a>\r
+    {% trans "Answers and Comments" %}\r
+</p>\r
+{% endspaceless %}\r