From 6273efb0f90255dea2c8db3e94de466f8022335a Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Tue, 30 Oct 2012 19:37:32 +0100 Subject: Do some CSS refactoring --- hyperkitty/templates/api.html | 4 -- hyperkitty/templates/base.html | 75 +++++++++++++--------------- hyperkitty/templates/message.html | 8 +-- hyperkitty/templates/messages/message.html | 13 +++-- hyperkitty/templates/month_view.html | 6 +-- hyperkitty/templates/thread.html | 8 +-- hyperkitty/templates/threads/month_list.html | 18 +++---- 7 files changed, 55 insertions(+), 77 deletions(-) (limited to 'hyperkitty/templates') diff --git a/hyperkitty/templates/api.html b/hyperkitty/templates/api.html index 0fa38c9..c6e2b85 100644 --- a/hyperkitty/templates/api.html +++ b/hyperkitty/templates/api.html @@ -1,9 +1,5 @@ {% extends "base.html" %} -{% block additional_stylesheets %} - -{% endblock %} - {% block content %}

REST API

diff --git a/hyperkitty/templates/base.html b/hyperkitty/templates/base.html index c679687..53d0ada 100644 --- a/hyperkitty/templates/base.html +++ b/hyperkitty/templates/base.html @@ -14,47 +14,40 @@ {% load i18n %} -

-
-
-
- - {% if user.is_authenticated %} -
  • - Logout -
    • -
  • - {{ user.username }} -
    • - {% else %} -
  • - Login -
    • -
  • - Sign Up -
    • - {% endif %} - - - -
    -
    -
    -
    - +
    +
    +
    +
    + + + + + +
    +
    +
    +
    {% block content %} {% endblock %} diff --git a/hyperkitty/templates/message.html b/hyperkitty/templates/message.html index 6c26c4f..5ae2fb1 100644 --- a/hyperkitty/templates/message.html +++ b/hyperkitty/templates/message.html @@ -3,18 +3,14 @@ {% load hk_generic %} {% load storm %} -{% block additional_stylesheets %} - -{% endblock %} - {% block content %} -
    +

    {{ message.subject }}

    -
    +
    {% include 'messages/first_email.html' with first_mail=message %} diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html index 6ff6c15..415bc58 100644 --- a/hyperkitty/templates/messages/message.html +++ b/hyperkitty/templates/messages/message.html @@ -12,19 +12,18 @@ {% endifchanged %} {{email.date|date:"H:i:s e"}} -
    - {% gravatar_img_for_email email.email 40 %} +
    + {% gravatar_img_for_email email.email 40 %} +
    diff --git a/hyperkitty/templates/month_view.html b/hyperkitty/templates/month_view.html index 00b7a96..a6239fe 100644 --- a/hyperkitty/templates/month_view.html +++ b/hyperkitty/templates/month_view.html @@ -7,7 +7,7 @@
    -
    +
    {{ mlist.display_name|default:mlist.name|escapeatsign }}
    {{ month|date:"F Y"|capfirst }}
    +
    {% for email in threads %} @@ -95,7 +95,7 @@ {% empty %} - Sorry no emails could be found for your search. + Sorry no emails could be found for this month. {% endfor %} {% include "paginator.html" %} diff --git a/hyperkitty/templates/thread.html b/hyperkitty/templates/thread.html index be2d875..c55d445 100644 --- a/hyperkitty/templates/thread.html +++ b/hyperkitty/templates/thread.html @@ -4,13 +4,9 @@ {% load hk_generic %} {% load storm %} -{% block additional_stylesheets %} - -{% endblock %} - {% block content %} -
    +
    {% for thread in neighbors %} {% if thread %} {{ subject }} -
    + {% include 'threads/right_col.html' %} diff --git a/hyperkitty/templates/threads/month_list.html b/hyperkitty/templates/threads/month_list.html index d642567..85af7b6 100644 --- a/hyperkitty/templates/threads/month_list.html +++ b/hyperkitty/templates/threads/month_list.html @@ -3,15 +3,13 @@ -- cgit