From c6fe5ef7d8e2c42066e0f096d4d1c90a356c5b94 Mon Sep 17 00:00:00 2001
From: jordan <jordan@0cfe37f9-358a-4d5e-be75-b63607b5c754>
Date: Tue, 15 Mar 2011 23:50:48 +0000
Subject: [PATCH] merging notification-config -> trunk, changes from revision
 695, 696, 697, 698, 699, 702

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@846 0cfe37f9-358a-4d5e-be75-b63607b5c754
---
 .../default/templates/auth/complete.html      | 11 ------
 .../users/subscriptions_settings.html         | 36 +++++--------------
 forum/templatetags/email_tags.py              |  1 +
 3 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/forum/skins/default/templates/auth/complete.html b/forum/skins/default/templates/auth/complete.html
index 20880ec..5b293eb 100644
--- 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 9c88602..6232d13 100644
--- a/forum/skins/default/templates/users/subscriptions_settings.html
+++ b/forum/skins/default/templates/users/subscriptions_settings.html
@@ -7,15 +7,6 @@
     {% blocktrans %}
     Here you can decide which types of notifications you wish to receive, and their frequency.<br />
     {% endblocktrans %}
-    {% if notificatons_on %}
-    {% blocktrans %}
-    Currently you have notifications enabled. You can always stop all notifications without losing your settings and restart them afterwards.<br />
-    {% endblocktrans %}
-    {% else %}
-    {% blocktrans %}
-    Currently you have notifications disabled. You can enable them by clicking on the <strong>Start notifications</strong> button below.<br />
-    {% endblocktrans %}
-    {% endif %}
 </p>
 <div class='inline-block'>
 <form method="POST">
@@ -50,17 +41,6 @@
                 <strong>{% trans "Auto subscribe me to:" %}</strong>
             </td>
         </tr>
-        <tr>
-            <td>
-                {{ form.questions_asked }}{% trans "Questions I ask" %}
-            </td>
-            <td>
-                {{ form.questions_answered }}{% trans "Questions I answer" %}
-            </td>
-            <td>
-                {{ form.questions_commented }}{% trans "Questions I comment" %}
-            </td>
-        </tr>
         <tr>
             <td>
                 {{ form.questions_viewed }}{% trans "Questions I view" %}
@@ -101,27 +81,27 @@
     <table class="form-as-table check-table">
         <tr>
             <td>
-                <strong>{% trans "More:" %}</strong>
+                <strong>{% trans "Daily Digest:" %}</strong>
             </td>
         </tr>
         <tr>
             <td>
-                {{ 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" %}
+                {{ form.send_digest }}{% trans "Send me the daily digest with information about the site activity" %}
             </td>
         </tr>
         <tr>
             <td>
-                {{ form.send_digest }}{% trans "Send me the daily digest with information about the site activity" %}
+                <strong>{% trans "Notify When I'm Discussed:" %}</strong>
+            </td>
+        </tr>
+        <tr>
+            <td>
+                {{ 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" %}
             </td>
         </tr>
     </table>
     <div class="submit-row">
         <input type="submit" class="submit" name="save" value="{% trans "Update" %}"/>
-        {% if notificatons_on %}
-        <input type="submit" class="submit" name="notswitch" value="{% trans "Stop notifications" %}"/>
-        {% else %}
-        <input type="submit" class="submit" name="notswitch" value="{% trans "Start notifications" %}"/>
-        {% endif %}
     </div>
 </form>
 </div>
diff --git a/forum/templatetags/email_tags.py b/forum/templatetags/email_tags.py
index 63b3a8d..0699f15 100644
--- 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()
 
-- 
2.39.5