X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/f23e8f623a0670883682399799d40abda730ff16..6ebde88b50458c1ba0d81d42ab3bc59e131537b1:/forum/skins/default/templates/subscription_status.html?ds=sidebyside

diff --git a/forum/skins/default/templates/subscription_status.html b/forum/skins/default/templates/subscription_status.html
index c489da1..49ec02f 100644
--- a/forum/skins/default/templates/subscription_status.html
+++ b/forum/skins/default/templates/subscription_status.html
@@ -1,6 +1,7 @@
-{% load i18n %}
-
-<h3 class="subtitle">{% trans "Subscription" %}:</h3>
+{% spaceless %}
+{% load i18n extra_tags %}
+<h3 class="subtitle">{% trans "Follow this question" %}</h3>
+<strong>{% trans "By Email" %}:</strong>
 {% if request.user.is_authenticated %}
     <div class="subscription-status">
         {% if subscription %}
@@ -13,7 +14,7 @@
             <p>{% trans "You are not subscribed to this question." %}</p>
         {% endif %}
     </div>
-    <p><a class="ajax-command sidebar_button subscription_switch" href="{% url subscribe id=question.id %}">
+    <p><a class="ajax-command sidebar_button subscription_switch" href="{% url subscribe_simple id=question.id %}">
         {% if subscription %}
             {% trans "unsubscribe me" %}
         {% else %}
@@ -21,11 +22,22 @@
         {% endif %}
     </a></p>
     <p>
-        {% url user_subscriptions id=request.user.id,slug=request.user.username|slugify as subscriptions_url %}
-        {% blocktrans %}
+        {% blocktrans with request.user.get_user_subscriptions_url as subscriptions_url %}
             (you can adjust your notification settings on your <a href="{{ subscriptions_url }}">profile</a>)
         {% endblocktrans %}
     </p>
 {% else %}
     <p>{% trans "Once you sign in you will be able to subscribe for any updates here" %}</p>
 {% endif %}
+<strong>{% trans "By RSS" %}:</strong>
+<p>
+    <a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');"
+        href="{{ question.get_absolute_url }}?type=rss" title="{% trans "subscribe to answers" %}"></a>
+    {% trans "Answers" %}
+</p>
+<p>
+    <a class="feed-icon" style="background-image:url('{% media "media/images/feed-icon-small.png" %}');"
+        href="{{ question.get_absolute_url }}?type=rss&comments=yes" title="{% trans "subscribe to comments and answers" %}"></a>
+    {% trans "Answers and Comments" %}
+</p>
+{% endspaceless %}