Django 1.3 fix.

[osqa.git] / forum / skins / default / templates / users / subscriptions_settings.html

diff --git a/forum/skins/default/templates/users/subscriptions_settings.html b/forum/skins/default/templates/users/subscriptions_settings.html
index 9c88602970db81862a963db271af0a3186decc3e..6232d135bacae4c98085fdc55bdfbb60be798b50 100644 (file)
--- a/forum/skins/default/templates/users/subscriptions_settings.html
+++ b/forum/skins/default/templates/users/subscriptions_settings.html
@@ -7,15 +7,6 @@
     {% blocktrans %}\r
     Here you can decide which types of notifications you wish to receive, and their frequency.<br />\r
     {% endblocktrans %}\r
     {% blocktrans %}\r
     Here you can decide which types of notifications you wish to receive, and their frequency.<br />\r
     {% endblocktrans %}\r

-    {% if notificatons_on %}\r
-    {% blocktrans %}\r
-    Currently you have notifications enabled. You can always stop all notifications without losing your settings and restart them afterwards.<br />\r
-    {% endblocktrans %}\r
-    {% else %}\r
-    {% blocktrans %}\r
-    Currently you have notifications disabled. You can enable them by clicking on the <strong>Start notifications</strong> button below.<br />\r
-    {% endblocktrans %}\r
-    {% endif %}\r

 </p>\r
 <div class='inline-block'>\r
 <form method="POST">\r
 </p>\r
 <div class='inline-block'>\r
 <form method="POST">\r


@@ -50,17 +41,6 @@
                 <strong>{% trans "Auto subscribe me to:" %}</strong>\r
             </td>\r
         </tr>\r
                 <strong>{% trans "Auto subscribe me to:" %}</strong>\r
             </td>\r
         </tr>\r

-        <tr>\r
-            <td>\r
-                {{ form.questions_asked }}{% trans "Questions I ask" %}\r
-            </td>\r
-            <td>\r
-                {{ form.questions_answered }}{% trans "Questions I answer" %}\r
-            </td>\r
-            <td>\r
-                {{ form.questions_commented }}{% trans "Questions I comment" %}\r
-            </td>\r
-        </tr>\r

         <tr>\r
             <td>\r
                 {{ form.questions_viewed }}{% trans "Questions I view" %}\r
         <tr>\r
             <td>\r
                 {{ form.questions_viewed }}{% trans "Questions I view" %}\r


@@ -101,27 +81,27 @@
     <table class="form-as-table check-table">\r
         <tr>\r
             <td>\r
     <table class="form-as-table check-table">\r
         <tr>\r
             <td>\r

-                <strong>{% trans "More:" %}</strong>\r
+                <strong>{% trans "Daily Digest:" %}</strong>\r

             </td>\r
         </tr>\r
         <tr>\r
             <td>\r
             </td>\r
         </tr>\r
         <tr>\r
             <td>\r

-                {{ form.notify_reply_to_comments }}{% trans "Notify me when someone replies to one of my comments on any post using the <pre>@username</pre> notation" %}\r
+                {{ form.send_digest }}{% trans "Send me the daily digest with information about the site activity" %}\r

             </td>\r
         </tr>\r
         <tr>\r
             <td>\r
             </td>\r
         </tr>\r
         <tr>\r
             <td>\r

-                {{ form.send_digest }}{% trans "Send me the daily digest with information about the site activity" %}\r
+                <strong>{% trans "Notify When I'm Discussed:" %}</strong>\r
+            </td>\r
+        </tr>\r
+        <tr>\r
+            <td>\r
+                {{ form.notify_reply_to_comments }}{% trans "Notify me when someone replies to one of my comments on any post using the <pre>@username</pre> notation" %}\r

             </td>\r
         </tr>\r
     </table>\r
     <div class="submit-row">\r
         <input type="submit" class="submit" name="save" value="{% trans "Update" %}"/>\r
             </td>\r
         </tr>\r
     </table>\r
     <div class="submit-row">\r
         <input type="submit" class="submit" name="save" value="{% trans "Update" %}"/>\r

-        {% if notificatons_on %}\r
-        <input type="submit" class="submit" name="notswitch" value="{% trans "Stop notifications" %}"/>\r
-        {% else %}\r
-        <input type="submit" class="submit" name="notswitch" value="{% trans "Start notifications" %}"/>\r
-        {% endif %}\r

     </div>\r
 </form>\r
 </div>\r
     </div>\r
 </form>\r
 </div>\r