summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Yves Chibon <pingou@pingoured.fr>2012-03-23 18:36:51 +0100
committerPierre-Yves Chibon <pingou@pingoured.fr>2012-03-23 18:36:51 +0100
commite2ad1c98414750d37ab259befe7b03886880651a (patch)
tree2d79563a24afb7d2b63c09a8882f7e5016543e12
parent86c18f08b9621dcc373556ec14d0c6480d0aae65 (diff)
downloadhyperkitty-e2ad1c98414750d37ab259befe7b03886880651a.tar.gz
hyperkitty-e2ad1c98414750d37ab259befe7b03886880651a.tar.xz
hyperkitty-e2ad1c98414750d37ab259befe7b03886880651a.zip
work on the thread view
Diffstat
-rw-r--r--static/css/thread.css17
-rw-r--r--templates/base_thread.html81
-rw-r--r--templates/thread.html82
3 files changed, 106 insertions, 74 deletions
diff --git a/static/css/thread.css b/static/css/thread.css
index d39ceb1..a31c2b5 100644
--- a/static/css/thread.css
+++ b/static/css/thread.css
@@ -217,8 +217,16 @@
padding: 5px;
min-height: 40px;
background-color: rgb(255, 255, 255);
+ white-space: pre;
+ display: inline-block;
}
+#first_email_body {
+ white-space: pre;
+ display: inline-block;
+}
+
+
.email_body a {
float: right;
padding: 3px 10px 0px 0px;
@@ -228,3 +236,12 @@
padding: 0px;
margin-top: 5px;
}
+
+.thread_email {
+ padding-left: 20px;
+ margin-left: 21px;
+ display: inline-block;
+ vertical-align: top;
+ white-space: pre;
+}
+
diff --git a/templates/base_thread.html b/templates/base_thread.html
new file mode 100644
index 0000000..f9e0579
--- /dev/null
+++ b/templates/base_thread.html
@@ -0,0 +1,81 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <meta name="ROBOTS" content="INDEX, FOLLOW" />
+
+ <title>{% block title %}Mail app{% endblock %}</title>
+ <meta name="author" content="" />
+
+ <meta name="dc.language" content="en" />
+
+ <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/style.css" />
+
+ {% block additional_headers %}
+ {% endblock %}
+</head>
+
+<body>
+
+ <!-- Header -->
+ <div class="header">
+ <div id="headline">
+ <ul class="inline-block">
+ <li id="list_name"><a href="/2/">{{list_name}}</a></li>
+ <li id="page_date">{{month}}</li>
+ </ul>
+ <div id="top_right">
+ <form action="#search" method="get">
+ <input type="text" name="search_text"
+ placeholder="Search this list."/>
+ </form>
+ </div>
+ </div>
+ <p id="list_email">
+ <a href="mailto:devel@list.fedoraproject.org">
+ devel@list.fedoraproject.org
+ </a>
+ </p>
+
+ <div id="thread_nav">
+ <div id="newewthread" class="inline-block">
+ <a href="{{ next_thread_id }}">
+ <img src="{{ STATIC_URL }}img/button_newer.png" alt="New thread" />
+ </a>
+ <br />
+ {{next_thread}}
+ </div>
+
+ <div class="inline-block thread_title">
+ <span class="type type_question">
+ <a href="/tag/question"> question </a>
+ </span>
+ <br />
+ {{first_mail.email.Subject}}
+ <ul class="inline thread_info">
+ <li class="participant"> {{participants|length}} participants</li>
+ <li class="discussion"> {{answers}} comments</li>
+ </ul>
+ </div>
+
+ <div id="olderhread" class="inline-block right">
+ <a href="{{ prev_thread_id }}">
+ <img src="{{ STATIC_URL }}img/button_older.png" alt="New thread" />
+ </a>
+ <br />
+ {{prev_thread}}
+ </div>
+ </div>
+
+
+ <hr id="white"/>
+ <hr />
+ </div>
+
+ <div class="content">
+ {% block content %}
+ {% endblock %}
+ </div>
+
+</body>
+</html>
diff --git a/templates/thread.html b/templates/thread.html
index bf2efda..b413c5a 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -1,15 +1,8 @@
-<!DOCTYPE HTML>
-<html>
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <meta name="ROBOTS" content="INDEX, FOLLOW" />
+{% extends "base_thread.html" %}
- <title>Fedora mail app</title>
- <meta name="author" content="" />
+{% block title %}{{ app_name }}{% endblock %}
- <meta name="dc.language" content="en" />
-
- <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/style.css" />
+{% block additional_headers %}
<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" />
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script>
@@ -22,62 +15,9 @@
});
});
</script>
-</head>
-
-<body>
- <!-- Header -->
- <div class="header">
- <div id="headline">
- <ul class="inline-block">
- <li id="list_name"> Fedora Development</li>
- </ul>
- <div id="top_right">
- <form action="#search" method="get">
- <input type="text" name="search_text"
- placeholder="Search this list."/>
- </form>
- </div>
- </div>
- <p id="list_email">
- <a href="mailto:devel@list.fedoraproject.org">
- devel@list.fedoraproject.org
- </a>
- </p>
-
- <div id="thread_nav">
- <div id="newewthread" class="inline-block">
- <a href="{{ next_thread_id }}">
- <img src="{{ STATIC_URL }}img/button_newer.png" alt="New thread" />
- </a>
- <br />
- {{next_thread}}
- </div>
-
- <div class="inline-block thread_title">
- <span class="type type_question">
- <a href="/tag/question"> question </a>
- </span>
- <br />
- {{first_mail.email.Subject}}
- <ul class="inline thread_info">
- <li class="participant"> {{participants|length}} participants</li>
- <li class="discussion"> {{answers}} comments</li>
- </ul>
- </div>
-
- <div id="olderhread" class="inline-block right">
- <a href="{{ prev_thread_id }}">
- <img src="{{ STATIC_URL }}img/button_older.png" alt="New thread" />
- </a>
- <br />
- {{prev_thread}}
- </div>
- </div>
+{% endblock %}
-
- <hr id="white"/>
- <hr />
- </div>
+{% block content %}
<div class="content">
@@ -145,7 +85,7 @@
</div>
</div>
<div id="first_email_body">
- {{first_mail.email.body}}
+ {{first_mail.email.Content}}
</div>
<ul class="email_info inline">
<li class="neutral"> 0</li>
@@ -166,20 +106,15 @@
<div class="email_author inline-block">
<span class="name">{{email.email.From}}</span>
<br />
-<!--
<span class="rank">Rank 8</span>
--->
</div>
<div class="email_date inline-block right">
<span class="date">{{email.email.Date}}</span>
<br />
-<!--
- <span class="time">00:25:50 UTC</span>
--->
</div>
</div>
<div class="email_body">
- {{email.email.body}}
+ {{email.email.Content}}
</div>
<ul class="email_info inline">
<li class="neutral"> 0</li>
@@ -194,5 +129,4 @@
</section>
</div> <!-- end of content -->
-</body>
-</html>
+{% endblock %}
generated by cgit (git 2.34.1) at 2025-09-18 11:01:03 +0000