From e2ad1c98414750d37ab259befe7b03886880651a Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Fri, 23 Mar 2012 18:36:51 +0100 Subject: work on the thread view --- static/css/thread.css | 17 ++++++++++ templates/base_thread.html | 81 +++++++++++++++++++++++++++++++++++++++++++++ templates/thread.html | 82 +++++----------------------------------------- 3 files changed, 106 insertions(+), 74 deletions(-) create mode 100644 templates/base_thread.html 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 @@ + + + + + + + {% block title %}Mail app{% endblock %} + + + + + + + {% block additional_headers %} + {% endblock %} + + + + + +
+
+ +
+
+ +
+
+
+

+ + devel@list.fedoraproject.org + +

+ +
+
+ + New thread + +
+ {{next_thread}} +
+ +
+ + question + +
+ {{first_mail.email.Subject}} +
    +
  • {{participants|length}} participants
    • +
  • {{answers}} comments
    • +
+
+ +
+ + New thread + +
+ {{prev_thread}} +
+
+ + +
+
+
+ +
+ {% block content %} + {% endblock %} +
+ + + 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 @@ - - - - - +{% extends "base_thread.html" %} - Fedora mail app - +{% block title %}{{ app_name }}{% endblock %} - - - +{% block additional_headers %} @@ -22,62 +15,9 @@ }); }); - - - - -
-
-
    -
  • Fedora Development
    • -
-
-
- -
-
-
-

- - devel@list.fedoraproject.org - -

- -
-
- - New thread - -
- {{next_thread}} -
- -
- - question - -
- {{first_mail.email.Subject}} -
    -
  • {{participants|length}} participants
    • -
  • {{answers}} comments
    • -
-
- -
- - New thread - -
- {{prev_thread}} -
-
+{% endblock %} - -
-
-
+{% block content %}
@@ -145,7 +85,7 @@
- {{first_mail.email.body}} + {{first_mail.email.Content}}