summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--templates/message.html26
-rw-r--r--templates/messages/first_email.html28
-rw-r--r--templates/messages/message.html24
-rw-r--r--templates/thread.html114
-rw-r--r--templates/threads/right_col.html48
5 files changed, 113 insertions, 127 deletions
diff --git a/templates/message.html b/templates/message.html
index ce2f7f3..13a267f 100644
--- a/templates/message.html
+++ b/templates/message.html
@@ -14,32 +14,8 @@
<!-- main section, the email thread -->
<section id="thread_content">
-
<!-- Start first email -->
- <div class="first_email">
- <div class="email_header">
- {% gravatar_img_for_email message.email 40 %}
- <div class="email_author inline-block">
- <span class="name">{{message.sender}}</span>
- <br />
- <span class="rank">Rank 10</span>
- </div>
- <div class="email_date inline-block right">
- <span class="date">{{message.date}}</span>
- <br />
- <span class="time"></span>
- </div>
- </div>
- <div id="first_email_body">
- {{message.content}}
- </div>
- <ul class="email_info inline">
- <li class="neutral"> 0 </li>
- <li id="voteup"><a href="#"> Like </a></li>
- <li id="votedown"><a href="#"> Dislike</a></li>
- <li class="discussion add_comment"> <a href="#comment"> Add your own comment</a></li>
- </ul>
- </div>
+ {% include 'messages/first_email.html' with first_mail=message %}
<!-- End first email -->
</section>
diff --git a/templates/messages/first_email.html b/templates/messages/first_email.html
new file mode 100644
index 0000000..b319c31
--- /dev/null
+++ b/templates/messages/first_email.html
@@ -0,0 +1,28 @@
+{% load gravatar %}
+<div class="first_email">
+ <div class="email_header">
+ {% gravatar_img_for_email first_mail.email 40 %}
+ <div class="email_author inline-block">
+ <span class="name">
+ <a href="/message/{{list_address}}/{{first_mail.message_id}}">{{first_mail.sender}}</a>
+ </span>
+ <br />
+ <span class="rank">Rank 10</span>
+ </div>
+ <div class="email_date inline-block right">
+ <span class="date">{{first_mail.date}}</span>
+ <br />
+ <span class="time"></span>
+ </div>
+ </div>
+ <div id="first_email_body">
+ {{first_mail.content}}
+ </div>
+ <ul class="email_info inline">
+ <li class="neutral"> 0</li>
+ <li class="youlike"> <a href="#like"> Like</a></li>
+ <li class="youdislike"> <a href="#dislike"> Dislike</a></li>
+ <li class="discussion add_comment"> <a href="#comment"> Add your own comment</a></li>
+ </ul>
+ </div>
+
diff --git a/templates/messages/message.html b/templates/messages/message.html
new file mode 100644
index 0000000..25452bd
--- /dev/null
+++ b/templates/messages/message.html
@@ -0,0 +1,24 @@
+{% load gravatar %}
+
+ <div class="email_header">
+ {% gravatar_img_for_email email.email 40 %}
+ <div class="email_author inline-block">
+ <a href="/message/{{list_address}}/{{email.message_id}}">{{email.sender}}</a>
+ <br />
+ <span class="rank">Rank 8</span>
+ </div>
+ <div class="email_date inline-block right">
+ <span class="date">{{email.date}}</span>
+ <br />
+ </div>
+ </div>
+ <div class="email_body">
+ {{email.content}}
+ </div>
+ <ul class="email_info inline">
+ <li class="neutral"> 0</li>
+ <li class="youlike"> <a href="#like"> Like</a></li>
+ <li class="youdislike"> <a href="#dislike"> Dislike</a></li>
+ <li class="discussion add_comment"> <a href="#comment">Reply</a></li>
+ </ul>
+
diff --git a/templates/thread.html b/templates/thread.html
index b480128..7d08701 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -1,7 +1,6 @@
{% extends "base.html" %}
-{% load gravatar %}
-{% block title %}{{ app_name }}{% endblock %}
+{% load gravatar %}
{% block additional_stylesheets %}
<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" />
@@ -10,114 +9,23 @@
{% block content %}
<div class="content">
-
- <!-- right column -->
- <section id="thread_overview_info">
- <!-- Start dates -->
- <div id="thread_date_info">
- <div class="days_num inline-block">21</div>
- <div class="days_text inline-block">
- days<br /> inactive
- </div>
- <div id="days_old" class="days_num inline-block">24</div>
- <div class="days_text inline-block">
- days <br /> old
- </div>
- </div>
- <p id="add_to_fav">
- <a href="#AddFav" class="notsaved">Add to favorite discussions</a>
- </p>
- <!-- End dates -->
- <hr id="grey"/>
- <div id="tags">
- <span id="tag_title">tags </span>({{tags|length}})
- <ul class="inline">
- {% for tag in tags %}
- <li> {{ tag }} |</li>
- {% endfor %}
- </ul>
- </div>
- <div id="add_tag">
- <form action="/addtag/{{list_address}}/{{first_mail.message_id}}/" method="post">
- {% csrf_token %}
- {{ addtag_form.as_p }}
- <button type="submit">Add a tag</button>
- </form>
- </div>
- <div id="participants">
- <span id="participants_title"> participants </span>({{participants|length}})
- <ul>
- {% for key,value in participants.items %}
- <li>
- {% gravatar_img_for_email value.email 20%}
- {{key}}
- </li>
- {% endfor %}
- </ul>
- </div>
- </section>
+
+ {% include 'threads/right_col.html' %}
<!-- main section, the email thread -->
<section id="thread_content">
<!-- Start first email -->
- <div class="first_email">
- <div class="email_header">
- {% gravatar_img_for_email first_mail.email 40 %}
- <div class="email_author inline-block">
- <span class="name">
- <a href="/message/{{list_address}}/{{first_mail.message_id}}">{{first_mail.sender}}</a>
- </span>
- <br />
- <span class="rank">Rank 10</span>
- </div>
- <div class="email_date inline-block right">
- <span class="date">{{first_mail.date}}</span>
- <br />
- <span class="time"></span>
- </div>
- </div>
- <div id="first_email_body">
- {{first_mail.content}}
- </div>
- <ul class="email_info inline">
- <li class="neutral"> 0</li>
- <li class="youlike"> <a href="#like"> Like</a></li>
- <li class="youdislike"> <a href="#dislike"> Dislike</a></li>
- <li class="discussion add_comment"> <a href="#comment"> Add your own comment</a></li>
- </ul>
- </div>
+ {% include 'messages/first_email.html' %}
<!-- End first email -->
{% for email in threads %}
- <!-- Start email -->
- <div class="even">
- <!-- Start email -->
- <div class="email" style="padding-left: {{email.level}}em">
- <div class="email_header">
- {% gravatar_img_for_email email.email 40 %}
- <div class="email_author inline-block">
- <a href="/message/{{list_address}}/{{email.message_id}}">{{email.sender}}</a>
- <br />
- <span class="rank">Rank 8</span>
- </div>
- <div class="email_date inline-block right">
- <span class="date">{{email.date}}</span>
- <br />
- </div>
- </div>
- <div class="email_body">
- {{email.content}}
- </div>
- <ul class="email_info inline">
- <li class="neutral"> 0</li>
- <li class="youlike"> <a href="#like"> Like</a></li>
- <li class="youdislike"> <a href="#dislike"> Dislike</a></li>
- <li class="discussion add_comment"> <a href="#comment">Reply</a></li>
- </ul>
- </div>
- <!-- End of email -->
- </div>
+ <!-- Start email -->
+ <div class="even">
+ {% include 'messages/message.html' %}
+ </div>
+ <!-- End of email -->
+
{% empty %}
Sorry no emails could be found for your search.
{% endfor %}
@@ -127,6 +35,8 @@
</div> <!-- end of content -->
{% endblock %}
+
+
{% block addtionaljs %}
<script src="{{ STATIC_URL }}jquery.expander.js"></script>
<script>
diff --git a/templates/threads/right_col.html b/templates/threads/right_col.html
new file mode 100644
index 0000000..200e47a
--- /dev/null
+++ b/templates/threads/right_col.html
@@ -0,0 +1,48 @@
+{% load gravatar %}
+
+<!-- right column -->
+ <section id="thread_overview_info">
+ <!-- Start dates -->
+ <div id="thread_date_info">
+ <div class="days_num inline-block">21</div>
+ <div class="days_text inline-block">
+ days<br /> inactive
+ </div>
+ <div id="days_old" class="days_num inline-block">24</div>
+ <div class="days_text inline-block">
+ days <br /> old
+ </div>
+ </div>
+ <p id="add_to_fav">
+ <a href="#AddFav" class="notsaved">Add to favorite discussions</a>
+ </p>
+ <!-- End dates -->
+ <hr id="grey"/>
+ <div id="tags">
+ <span id="tag_title">tags </span>({{tags|length}})
+ <ul class="inline">
+ {% for tag in tags %}
+ <li> {{ tag }} |</li>
+ {% endfor %}
+ </ul>
+ </div>
+ <div id="add_tag">
+ <form action="/addtag/{{list_address}}/{{first_mail.message_id}}/" method="post">
+ {% csrf_token %}
+ {{ addtag_form.as_p }}
+ <button type="submit">Add a tag</button>
+ </form>
+ </div>
+ <div id="participants">
+ <span id="participants_title"> participants </span>({{participants|length}})
+ <ul>
+ {% for key,value in participants.items %}
+ <li>
+ {% gravatar_img_for_email value.email 20%}
+ {{key}}
+ </li>
+ {% endfor %}
+ </ul>
+ </div>
+ </section>
+
generated by cgit (git 2.34.1) at 2025-07-09 14:48:27 +0000