Fixes OSQA-663, the user.username property should pass through the smart_unicode...

[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 c489da1922dc13e21026d828441a3ad2b7d44127..49ec02f7ec10ed365824d255d222bee0afadc7df 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
@@ -13,7 +14,7 @@
             <p>{% trans "You are not subscribed to this question." %}</p>\r
         {% endif %}\r
     </div>\r
-    <p><a class="ajax-command sidebar_button subscription_switch" href="{% url subscribe id=question.id %}">\r
+    <p><a class="ajax-command sidebar_button subscription_switch" href="{% url subscribe_simple id=question.id %}">\r
         {% if subscription %}\r
             {% trans "unsubscribe me" %}\r
         {% else %}\r
@@ -21,11 +22,22 @@
         {% endif %}\r
     </a></p>\r
     <p>\r
-        {% url user_subscriptions id=request.user.id,slug=request.user.username|slugify as subscriptions_url %}\r
-        {% blocktrans %}\r
+        {% blocktrans with request.user.get_user_subscriptions_url as subscriptions_url %}\r
             (you can adjust your notification settings on your <a href="{{ subscriptions_url }}">profile</a>)\r
         {% endblocktrans %}\r
     </p>\r
 {% 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