From cd03c79c3f3b4ce245f7c03cc645a4cfb31752c7 Mon Sep 17 00:00:00 2001
From: Sergio Oliveira <sergio@tracy.com.br>
Date: Mon, 4 Nov 2013 16:57:37 -0200
Subject: [PATCH] Adding a box to allow users reply in thread

---
 src/super_archives/templates/message-thread.html                 | 56 ++++++--------------------------------------------------
 src/super_archives/templates/superarchives/includes/message.html | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 50 deletions(-)
 create mode 100644 src/super_archives/templates/superarchives/includes/message.html

diff --git a/src/super_archives/templates/message-thread.html b/src/super_archives/templates/message-thread.html
index 66ab5dd..4c7581c 100644
--- a/src/super_archives/templates/message-thread.html
+++ b/src/super_archives/templates/message-thread.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n gravatar superarchives %}
+{% load i18n superarchives %}
 
 {% trans "Anonymous" as anonymous %}
 
@@ -99,56 +99,12 @@
   <div class="col-lg-9 col-md-9 col-sm-12">
     <ul class="unstyled-list">
     {% for email in emails %}
-      {% with email.from_address.user.get_absolute_url as profile_link %}
-      <li>
-        {% spaceless %}
-        <div class="email-message" id="msg-{{ email.id }}">
-          <div class="panel panel-default">
-            <div class="panel-heading clearfix">
-              <div class="col-lg-6 col-md-6 col-sm-6">
-                {% if profile_link %}
-                <a href="{{ profile_link }}">
-                {% endif %}
-                {% gravatar email.from_address 34 %}
-                <strong class="user-fullname">{{ email.from_address.get_full_name_or_anonymous }}</strong>
-                {% if profile_link %}
-                </a>
-                {% endif %}
-              </div>
-
-              <div class="col-lg-6 col-md-6 col-sm-6">
-                <div class="pull-right text-right">
-                  <span class="date">
-                    {{ email.received_time|date:'DATETIME_FORMAT' }}
-                  </span>
-
-                  <div class="btn-group">
-                    <button class="btn btn-default vote-count disabled">
-                      {{ email.votes_count }}
-                    </button>
-                    {% if user in email.vote_list %}
-                    <button class="btn btn-success vote" data-loading-text="...">
-                    {% else %}
-                    <button class="btn btn-default vote" data-loading-text="...">
-                    {% endif %}
-                      <span class="glyphicon glyphicon-thumbs-up"></span>
-                    </button>
-                  </div>
-                </div>
-              </div>
-
-            </div>
-            <div class="panel-collapse in">
-              <div class="panel-body">
-                {% display_message email %}
-              </div>
-            </div>
-          </div>
-        </div>
-      {% endspaceless %}
-      </li>
-      {% endwith %}
+      {% include "superarchives/includes/message.html" with userprofile=email.from_address.user emailaddress=email.from_address fullname=email.from_address.get_full_name_or_anonymous %}
     {% endfor %}
+
+    {% if user.is_active %}
+      {% include "superarchives/includes/message.html" with userprofile=user emailaddress=user.email fullname=user.get_full_name reply=True %}
+    {% endif %}
     </ul>
   </div>
 
diff --git a/src/super_archives/templates/superarchives/includes/message.html b/src/super_archives/templates/superarchives/includes/message.html
new file mode 100644
index 0000000..2fdb7ef
--- /dev/null
+++ b/src/super_archives/templates/superarchives/includes/message.html
@@ -0,0 +1,62 @@
+{% load gravatar superarchives i18n %}
+<li>
+  {% spaceless %}
+  <div class="email-message" id="msg-{{ email.id }}">
+    <div class="panel panel-default">
+      <div class="panel-heading clearfix">
+        <div class="col-lg-6 col-md-6 col-sm-6">
+          {% if userprofile.get_absolute_url %}
+          <a href="{{ userprofile.get_absolute_url }}">
+          {% endif %}
+          {% gravatar emailaddress 34 %}
+          <strong class="user-fullname">{{ fullname }}</strong>
+          {% if userprofile.get_absolute_url %}
+          </a>
+          {% endif %}
+        </div>
+
+        {% if not reply %}
+        <div class="col-lg-6 col-md-6 col-sm-6">
+          <div class="pull-right text-right">
+            <span class="date">
+              {{ email.received_time|date:'DATETIME_FORMAT' }}
+            </span>
+
+            <div class="btn-group">
+              <button class="btn btn-default vote-count disabled">
+                {{ email.votes_count }}
+              </button>
+              {% if user in email.vote_list %}
+              <button class="btn btn-success vote" data-loading-text="...">
+              {% else %}
+              <button class="btn btn-default vote" data-loading-text="...">
+              {% endif %}
+                <span class="glyphicon glyphicon-thumbs-up"></span>
+              </button>
+            </div>
+          </div>
+        </div>
+        {% endif %}
+
+      </div>
+      <div class="panel-collapse in">
+        <div class="panel-body">
+          {% if not reply %}
+            {% display_message email %}
+          {% else %}
+            <p>
+              <textarea placeholder="{% trans 'Send a message' %}" rows="5" class="form-control"></textarea>
+            </p>
+            <div class="col-lg-11 col-md-9 col-sm-9 col-xs-8">
+              <p class="quiet">{% trans "After sending a message it will take few minutes before it shows up in here. Why don't you grab a coffee?" %}</p>
+            </div>
+            <div class="col-lg-1 col-md-3 col-sm-3 col-xs-4 text-right">
+              <button class="btn btn-success">{% trans 'Send' %}</button>
+            </div>
+          {% endif %}
+        </div>
+      </div>
+    </div>
+  </div>
+{% endspaceless %}
+</li>
--
libgit2 0.21.2