From 431677576603b58c42fc488f174ef0254a7a430c Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Mon, 21 Jan 2013 12:00:02 -0600 Subject: Switch to a fluid layout --- hyperkitty/templates/base.html | 14 +- hyperkitty/templates/login.html | 6 + hyperkitty/templates/message.html | 28 ++-- hyperkitty/templates/month_view.html | 183 ++++++++++++++------------- hyperkitty/templates/recent_activities.html | 163 +++++++++++++----------- hyperkitty/templates/search.html | 4 + hyperkitty/templates/thread.html | 92 ++++++++------ hyperkitty/templates/threads/month_list.html | 2 +- hyperkitty/templates/threads/right_col.html | 11 +- 9 files changed, 282 insertions(+), 221 deletions(-) (limited to 'hyperkitty/templates') diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index 515b430..7f3d146 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -14,10 +14,11 @@ {% load i18n %} -
-
+
+
+
-
+
    {% if user.is_authenticated %} @@ -49,13 +50,14 @@
-
- {% block content %} {% endblock %} -
+ {% block content %} {% endblock %} + {% block footer %} {% endblock %} +
+ {% block additionaljs %} {% endblock %} diff --git a/hyperkitty/templates/login.html b/hyperkitty/templates/login.html index f271b80..6c708bf 100644 --- a/hyperkitty/templates/login.html +++ b/hyperkitty/templates/login.html @@ -8,6 +8,9 @@ {% block content %} +
+
+

Login with username and password

+
+ {% endblock %} {% block additionaljs %} diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html index 78462b5..c4df974 100644 --- a/hyperkitty/templates/message.html +++ b/hyperkitty/templates/message.html @@ -10,16 +10,26 @@ {% block content %} -
- - {# the background image will be a "back to thread" button #} -

{{ message.subject }}

-
+
+ +{% include 'threads/month_list.html' %} + +
+ +
+ + {# the background image will be a "back to thread" button #} +

{{ message.subject }}

+
-
- {% include 'messages/first_email.html' with first_mail=message %} -
+
+ {% include 'messages/first_email.html' with first_mail=message %} +
+ +
+ +
{% endblock %} diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html index 71921c8..f9d381f 100644 --- a/hyperkitty/templates/month_view.html +++ b/hyperkitty/templates/month_view.html @@ -10,112 +10,123 @@ {% block content %} -
+
-
-
{{ mlist.display_name|default:mlist.name|escapeemail }}
-
{{ month|date:"F Y"|capfirst }}
-
    -
  • - {{ month_participants }} participants -
    • -
  • - {{ month_discussions }} discussions -
    • -
- {% if mlist.display_name %} -

- {{ list_address|escapeemail }} -

- {% endif %} -
+{% include 'threads/month_list.html' %} - {% for thread in threads %} - -
-
- {{ thread.starting_email.subject|strip_subject:mlist }} - {{thread.date_active|timesince }} -
-
- {% if thread.category_tag %} -
- {{thread.category}} -
- {% endif %} - {% if thread.category %} -
- {{thread.category}} -
- {% endif %} -
- {% if thread.starting_email.sender_email %} - {% gravatar thread.starting_email.sender_email 40 %} -
- {% endif %} - {{ thread.starting_email.sender_name|escapeemail }} -
-
- - {{ thread.starting_email.content|wordwrap:90|urlizetrunc:76|escapeemail }} - -
-
-
-
    - {% if thread.tags|length %} -
  • - Tags: -
    • - {% for tag in thread.tags %} -
  • - {{tag}} -
    • - {% endfor %} - {% endif %} -
-
    +
    + +
    +
    {{ mlist.display_name|default:mlist.name|escapeemail }}
    +
    {{ month|date:"F Y"|capfirst }}
    +
    • - {{ thread.participants|length }} participants + {{ month_participants }} participants
    • - {{ thread|length }} comments + {{ month_discussions }} discussions
    -
      - {% include "messages/like_form.html" with hashid=thread.thread_id object=thread %} -
    - Show discussion + {% if mlist.display_name %} +

    + {{ list_address|escapeemail }} +

    + {% endif %}
    + + {% for thread in threads %} + +
    +
    + {{ thread.starting_email.subject|strip_subject:mlist }} + {{thread.date_active|timesince }} +
    +
    + {% if thread.category_tag %} +
    + {{thread.category}} +
    + {% endif %} + {% if thread.category %} +
    + {{thread.category}} +
    + {% endif %} +
    + {% if thread.starting_email.sender_email %} + {% gravatar thread.starting_email.sender_email 40 %} +
    + {% endif %} + {{ thread.starting_email.sender_name|escapeemail }} +
    +
    + +
    +
    +
    +
      + {% if thread.tags|length %} +
    • + Tags: +
      • + {% for tag in thread.tags %} +
    • + {{tag}} +
      • + {% endfor %} + {% endif %} +
    +
      +
    • + {{ thread.participants|length }} participants +
      • +
    • + {{ thread|length }} comments +
      • +
    +
      + {% include "messages/like_form.html" with hashid=thread.thread_id object=thread %} +
    + Show discussion +
    +
    + + {% empty %} + Sorry no emails could be found for this month. + {% endfor %} + + {% include "paginator.html" %} +
    - - {% empty %} - Sorry no emails could be found for this month. - {% endfor %} - {% include "paginator.html" %}
-{% include 'threads/month_list.html' %} - {% endblock %} {% block additionaljs %} - {% endblock %} diff --git a/hyperkitty/templates/recent_activities.html b/hyperkitty/templates/recent_activities.html index 59b5a73..326f933 100644 --- a/hyperkitty/templates/recent_activities.html +++ b/hyperkitty/templates/recent_activities.html @@ -8,101 +8,112 @@ {{ mlist.display_name|default:mlist.name|escapeemail }} - {{ app_name|title }} {% endblock %} -{% block additional_stylesheets %} - -{% endblock %} {% block content %} -
- -
-

Activities on the list over the last 30 days

-
- -
-
- -
-

Recently active discussions

- {% for thread in most_active_threads %} - {% include "threads/summary_thread.html" with counter=forloop.counter %} - {% endfor %} -
+
-
-

Top discussions the last 30 days

- {% for thread in top_threads %} - {% include "threads/summary_thread.html" with counter=forloop.counter %} - {% endfor %} -
+{% include 'threads/month_list.html' %} - {% if top_author %} -
-

Prominent discussion maker

- {% for author in top_author %} - -
-
- #{{forloop.counter}} +
+ +
+

Activities on the list over the last 30 days

+
+
-
- {% if author.email %} - {% gravatar author.email 40 %} -
- {% endif %} +
+ +
+ +
+
+

Recently active discussions

+ {% for thread in most_active_threads %} + {% include "threads/summary_thread.html" with counter=forloop.counter %} + {% endfor %} +
-
- {{author.name}} -
- +{{author.kudos}} kudos + +
+
+

Top discussions the last 30 days

+ {% for thread in top_threads %} + {% include "threads/summary_thread.html" with counter=forloop.counter %} + {% endfor %} +
+
- - {% endfor %} +
+ +
+ {% if top_author %} +
+

Prominent discussion maker

+ {% for author in top_author %} + +
+
+ #{{forloop.counter}} +
+
+ {% if author.email %} + {% gravatar author.email 40 %} +
+ {% endif %} +
+
+ {{author.name}} +
+ +{{author.kudos}} kudos +
+
+ + {% endfor %} -

Tag cloud

-
- {% endif %} - - {% if threads_per_category %} -
-

Discussion by topic the last 30 days

- {% for category, thread in threads_per_category.items %} -
-

{{category}}

-
    - {% for email in thread %} -
  • - {{email.title}} -
    • +

    Tag cloud

    +
+ {% endif %} +
+ + +
+ {% if threads_per_category %} +
+

Discussion by topic the last 30 days

+ {% for category, thread in threads_per_category.items %} +
+

{{category}}

+
    + {% for email in thread %} +
  • + {{email.title}} +
    • + {% endfor %} +
+
{% endfor %} - +
+ {% endif %} +
+
- {% endfor %} -
- {% endif %} -
+
-{% include 'threads/month_list.html' %} +
{% endblock %} {% block additionaljs %} - - {% endblock %} {# vim: set noet: #} diff --git a/hyperkitty/templates/search.html b/hyperkitty/templates/search.html index ac3b3e5..a80d9ff 100644 --- a/hyperkitty/templates/search.html +++ b/hyperkitty/templates/search.html @@ -9,6 +9,8 @@ {% block content %} +
+ {% if threads.object_list %} {% endif %} +
+ {% endblock %} {% block additionaljs %} diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index dd17cb2..3fa401b 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -11,46 +11,64 @@ {% block content %} -
- {% for thread in neighbors %} - {% if thread %} - {{ thread.subject|strip_subject:mlist|truncatesmart:"22" }} - {% endif %} - {% endfor %} -

{{ subject }}

-
+
+ +{% include 'threads/month_list.html' %} + +
- {% include 'threads/right_col.html' %} - - -
- - - {% include 'messages/first_email.html' %} - - -

- {% if sort_mode == "date" %} - Show replies by thread - {% else %} - Show replies by date - {% endif %} -

- - {% for email in replies %} -
- - {% include 'messages/message.html' %} - +
+ {% for thread in neighbors %} + {% if thread %} + {{ thread.subject|strip_subject:mlist|truncatesmart:"22" }} + {% endif %} + {% endfor %} +

{{ subject }}

- {% endfor %} -
+
+ +
+ +
+ + + {% include 'messages/first_email.html' %} + + +

+ {% if sort_mode == "date" %} + Show replies by thread + {% else %} + Show replies by date + {% endif %} +

+ + {% for email in replies %} +
+ + {% include 'messages/message.html' %} + +
+ {% endfor %} + +
+
+ +
+ {% include 'threads/right_col.html' %} +
+ +
+ +
+ +
{% endblock %} diff --git a/hyperkitty/templates/threads/month_list.html b/hyperkitty/templates/threads/month_list.html index 4781ec4..66aa3f9 100644 --- a/hyperkitty/templates/threads/month_list.html +++ b/hyperkitty/templates/threads/month_list.html @@ -1,6 +1,6 @@ {% load hk_generic %} -
+
{% for year, months in archives_length|sort %}

{{ year }}

    diff --git a/hyperkitty/templates/threads/right_col.html b/hyperkitty/templates/threads/right_col.html index 7fa1743..73194df 100644 --- a/hyperkitty/templates/threads/right_col.html +++ b/hyperkitty/templates/threads/right_col.html @@ -4,19 +4,19 @@
    -
    -
    +
    +
    {{ days_inactive }}
    -
    +
    days
    inactive
    -
    +
    {{ days_old }}
    -
    +
    days
    old @@ -28,7 +28,6 @@

    {% endif %} -
    {% include 'threads/tags.html' %}
    -- cgit