Merge pull request #125 from pinax/messages-thread-delete

Messages thread delete

pinax_theme_bootstrap/__init__.py

@@ -1 +1 @@
-__version__ = "7.10.0"
+__version__ = "7.10.1"

pinax_theme_bootstrap/docs/changelog.md

@@ -0,0 +1,21 @@
+# ChangeLog
+
+## 7.10.1
+
+ - add "thread_confirm_delete.html" for pinax-messages
+ - add delete link to "thread_detail.html" for pinax-messages
+
+## 7.10.0
+
+ - fix copy_from_theme management command
+ - update AUTHORS
+ - add pinax-messages templates
+
+## 7.9.0
+
+ - payment method styling improvements
+ - add pinax-cohorts templates
+
+## 7.8.0
+
+ - add pinax-likes templates

pinax_theme_bootstrap/templates/pinax/messages/thread_confirm_delete.html

@@ -0,0 +1,31 @@
+{% extends "site_base.html" %}
+
+{% load i18n bootstrap %}
+
+{% block head_title %}Confirm Delete: {{ thread.subject }}{% endblock %}
+
+{% block body_class %}threads{% endblock %}
+
+{% block body %}
+    <h1>{% trans "Delete Thread?" %}</h1>
+
+    {% url "pinax_messages:thread_delete" thread.pk as post_url %}
+
+    <div class="alert alert-warning" role="alert">
+
+        <p class="lead">
+            {% trans "Are you sure you want to delete this thread?" %}
+        </p>
+
+    </div>
+
+    <p><b>{{ thread }}</b></p>
+
+    <form action="{{ post_url }}" method="POST" class="form form-horizontal">
+        {% csrf_token %}
+        <div class="form-actions">
+            <a href="{% url "pinax_messages:inbox" %}" class="btn">{% trans "Cancel" %}</a>
+            <button type="submit" class="btn btn-danger">{% trans "Delete" %}</button>
+        </div>
+    </form>
+{% endblock %}

pinax_theme_bootstrap/templates/pinax/messages/thread_detail.html

@@ -25,4 +25,8 @@ <h2>{{ thread.subject }}</h2>
         </form>
         <a class="btn btn-default" href="{% url "pinax_messages:inbox" %}">Cancel</a>
     </section>
+
+    <section>
+        <a class="btn" href="{% url "pinax_messages:thread_delete" thread.pk %}">Delete Thread</a>
+    </section>
 {% endblock %}