merging notification-config -> trunk, changes from revision 695, 696, 697, 698, 699...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@846 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/skins/default/templates/auth/complete.html b/forum/skins/default/templates/auth/complete.html
index 20880ec497f6d3fb27fe663083a8094f447050b8..5b293ebe41b75c30ac7d1f265c9ee89bf030a21a 100644 (file)
--- a/forum/skins/default/templates/auth/complete.html
+++ b/forum/skins/default/templates/auth/complete.html
@@ -74,14 +74,6 @@
                 {{ form1.recaptcha }}
                 </div>
             {% endif %}
-            <p>{% trans "receive updates motivational blurb" %}</p>
-            <div class='simple-subscribe-options'>
-            {{email_feeds_form.subscribe}}
-            {% if email_feeds_form.errors %}
-            <p class="error">{% trans "please select one of the options above" %}</p>
-            {% endif %}
-            </div>
-            <p class='space-above'>{% trans "Tag filter tool will be your right panel, once you log in." %}</p>
             <div class="submit-row"><input type="submit" class="submit" name="bnewaccount" id="bnewaccount" value="{% trans "create account" %}"/></div>
                </form>
        </div>
@@ -95,9 +87,6 @@
                                <div class="form-row"><label for="id_username">{% trans "user name" %}</label><br/>{{ form2.username }}</div>
                                <div class="form-row"><label for="id_passwordl">{% trans "password" %}</label><br/>{{ form2.password }}</div>
                 <p><span class='big strong'>(Optional) receive updates by email</span> - only sent when there are any.</p>
-                <div class='simple-subscribe-options'>
-                {{email_feeds_form.subscribe}}
-                </div>
                                <!--todo double check translation from chinese 确认 = "Register" -->
                                <div class="submit-row">
                                        <input type="submit" class="submit" name="bverify" value="{% trans "Register" %}"/> 

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
-    {% 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
@@ -50,17 +41,6 @@
                 <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
@@ -101,27 +81,27 @@
     <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
-                {{ 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
-                {{ 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
-        {% 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

diff --git a/forum/templatetags/email_tags.py b/forum/templatetags/email_tags.py
index 63b3a8d147509d38c79bd31075fb47b150269b6b..0699f15bfda7d6df1a89f025a0f112a12dc7ae2c 100644 (file)
--- a/forum/templatetags/email_tags.py
+++ b/forum/templatetags/email_tags.py
@@ -2,6 +2,7 @@ from django import template
 from forum import settings
 from forum.utils.mail import create_and_send_mail_messages
 from django.template.defaulttags import url as default_url
+import logging
 
 register = template.Library()