Merge pull request #26 from udacity/remove_dj_version

[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 8979915cc9a5757bf36f777cc6c41fd06ec6ebef..535ea1817c39b787403f335768d1a8f32b65c3ef 100644 (file)
--- a/forum/skins/default/templates/subscription_status.html
+++ b/forum/skins/default/templates/subscription_status.html
@@ -1,30 +1,43 @@
-{% load i18n %}\r
-\r
-<h3 class="subtitle">{% trans "Subscription" %}:</h3>\r
-{% if request.user.is_authenticated %}\r
-    <div class="subscription-status">\r
-        {% if subscription %}\r
-            {% if subscription.auto_subscription %}\r
-                <p>{% trans "You were automatically subscribed to this question." %}</p>\r
-            {% else %}\r
-                <p>{% trans "You are subscribed to this question." %}</p>\r
-            {% endif %}\r
-        {% else %}\r
-            <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
-        {% if subscription %}\r
-            {% trans "unsubscribe me" %}\r
-        {% else %}\r
-            {% trans "subscribe me" %}\r
-        {% endif %}\r
-    </a></p>\r
-    <p>\r
-        {% blocktrans with request.user.get_profile_url as profile_url %}\r
-            (you can adjust your notification settings on your <a href="{{ profile_url }}?sort=email_subscriptions">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
+{% 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 %}
+            {% if subscription.auto_subscription %}
+                <p>{% trans "You were automatically subscribed to this question." %}</p>
+            {% else %}
+                <p>{% trans "You are subscribed to this question." %}</p>
+            {% endif %}
+        {% else %}
+            <p>{% trans "You are not subscribed to this question." %}</p>
+        {% endif %}
+    </div>
+    <p><a class="ajax-command sidebar_button subscription_switch" href="{% url "subscribe_simple" id=question.id %}">
+        {% if subscription %}
+            {% trans "unsubscribe me" %}
+        {% else %}
+            {% trans "subscribe me" %}
+        {% endif %}
+    </a></p>
+    <p>
+        {% 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 %}