From b5ccb15c5aa463d6f281f63bfeb026bab7cfce42 Mon Sep 17 00:00:00 2001
From: Glen Chiacchieri <www@glench.com>
Date: Tue, 20 Aug 2013 20:05:19 +0000
Subject: [PATCH] add subscribe UI

---
 djangobb_forum/forms.py                       |  2 +-
 .../scratch_default_theme_copy/style.css      |  4 ++
 .../djangobb_forum/includes/post_form.html    | 39 +++++++++++++------
 djangobb_forum/views.py                       |  4 +-
 4 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/djangobb_forum/forms.py b/djangobb_forum/forms.py
index d276215..62c6f03 100644
--- a/djangobb_forum/forms.py
+++ b/djangobb_forum/forms.py
@@ -54,7 +54,7 @@ class AddPostForm(forms.ModelForm):
     name = forms.CharField(label=_('Subject'), max_length=155,
                            widget=forms.TextInput(attrs={'size':'115'}))
     attachment = forms.FileField(label=_('Attachment'), required=False)
-    subscribe = forms.BooleanField(label=_('Subscribe'), help_text=_("Subscribe this topic."), required=False)
+    subscribe = forms.BooleanField(label=_('Subscribe'), help_text=_("Subscribe to this topic."), required=False)
 
     class Meta:
         model = Post
diff --git a/djangobb_forum/static/djangobb_forum/themes/scratch_default_theme_copy/style.css b/djangobb_forum/static/djangobb_forum/themes/scratch_default_theme_copy/style.css
index 2620e9f..b4774b4 100644
--- a/djangobb_forum/static/djangobb_forum/themes/scratch_default_theme_copy/style.css
+++ b/djangobb_forum/static/djangobb_forum/themes/scratch_default_theme_copy/style.css
@@ -346,6 +346,10 @@ td .tclcon {
     width: 100%;
 }
 
+.djangobb #subscribe {
+    margin: -10px 0;
+}
+
 .djangobb .markItUpEditor {
     width: 100%;
     vertical-align: top;
diff --git a/djangobb_forum/templates/djangobb_forum/includes/post_form.html b/djangobb_forum/templates/djangobb_forum/includes/post_form.html
index 3002d87..ab31d30 100644
--- a/djangobb_forum/templates/djangobb_forum/includes/post_form.html
+++ b/djangobb_forum/templates/djangobb_forum/includes/post_form.html
@@ -41,18 +41,35 @@
                 {{ form.body.errors }}
                 {{ form.body }}
             </label>
-            {% if forum_settings.ATTACHMENT_SUPPORT %}
-            <div class="inform">
-                <fieldset>
-                    <legend>{% trans "Attachment" %}</legend>
-                    <div class="infldset">
-                        {{ form.attachment.errors }}
-                        <div class="rbox">
-                            {{ form.attachment }}
-                        </div>
+
+            <label id="subscribe">
+                {% if subscribed %}
+                    {% trans "You are receiving notifications for updates to this topic." %}
+                    <a href="{% url djangobb:forum_delete_subscription topic.id %}">{% trans 'Unsubscribe?' %}</a>
+                    <div class="success" style="display: none">
+                        {% trans "Unsubscribed! You will no longer receive notifications for updates to this topic." %}
                     </div>
-                </fieldset>
-            </div>
+                    <div class="error" style="dispaly: none">
+                        {% trans "Hmm, something went wrong. Please try again." %}
+                    </div>
+                {% else %}
+                    <div {% if subscribed %}style="display: none"{% endif %}>
+                        {{ form.subscribe }} {% trans "Notify me of updates to this topic" %}{{ form.subscribe.errors }}<br />
+                    </div>
+                {% endif %}
+            </label>
+            {% if forum_settings.ATTACHMENT_SUPPORT %}
+                <div class="inform">
+                    <fieldset>
+                        <legend>{% trans "Attachment" %}</legend>
+                        <div class="infldset">
+                            {{ form.attachment.errors }}
+                            <div class="rbox">
+                                {{ form.attachment }}
+                            </div>
+                        </div>
+                    </fieldset>
+                </div>
             {% endif %}
             <div class="form-submit">
                 <button type="submit" class="grey button" name="{{ form.FORM_NAME }}"><span>{% trans "Submit" %}</span></button>
diff --git a/djangobb_forum/views.py b/djangobb_forum/views.py
index 8bf37a6..158c5f1 100644
--- a/djangobb_forum/views.py
+++ b/djangobb_forum/views.py
@@ -433,7 +433,7 @@ def show_topic(request, topic_id, full=True):
             reply_form = AddPostForm(
                 initial={
                     'markup': request.user.forum_profile.markup,
-                    'subscribe': request.user.forum_profile.auto_subscribe,
+                    'subscribe': True,
                 },
                 **post_form_kwargs
             )
@@ -587,7 +587,7 @@ def add_topic(request, forum_id, full=True):
         form = AddPostForm(
             initial={
                 'markup': request.user.forum_profile.markup,
-                'subscribe': request.user.forum_profile.auto_subscribe,
+                'subscribe': True,
             },
             **post_form_kwargs
         )