From 5071591286b89bd05fb9febed308fc219bf7deca Mon Sep 17 00:00:00 2001 From: Aamir Khan Date: Wed, 20 Jun 2012 02:54:17 -0400 Subject: removing all base_*.html template files. All templates now extends single base.html --- templates/api.html | 2 +- templates/base.html | 24 +++++----- templates/base_message.html | 80 --------------------------------- templates/base_simple.html | 26 ----------- templates/base_thread.html | 95 ---------------------------------------- templates/message.html | 4 +- templates/month_view.html | 27 ++++++------ templates/recent_activities.html | 10 +++-- templates/search.html | 28 ++++++------ templates/thread.html | 30 ++++++------- 10 files changed, 64 insertions(+), 262 deletions(-) delete mode 100644 templates/base_message.html delete mode 100644 templates/base_simple.html delete mode 100644 templates/base_thread.html diff --git a/templates/api.html b/templates/api.html index afabbb4..fdc78e3 100644 --- a/templates/api.html +++ b/templates/api.html @@ -2,7 +2,7 @@ {% block title %}{{ app_name }}{% endblock %} -{% block additional_headers %} +{% block additional_stylesheets %} {% endblock %} diff --git a/templates/base.html b/templates/base.html index 65433ed..25b079f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,15 +4,15 @@ - {% block title %}Mail app{% endblock %} - + {% block title %}{{ app_name }}{% endblock %} + - - {% block additional_headers %} + {% block additional_stylesheets %} {% endblock %} + {% load i18n %} @@ -79,17 +79,17 @@
- {% endblock %} - -
- {% block content %} - {% endblock %}
+ + + {% block content %} + {% endblock %} - - {% block additionaljs %} - {% endblock %} + + + {% block additionaljs %} + {% endblock %} diff --git a/templates/base_message.html b/templates/base_message.html deleted file mode 100644 index 663450e..0000000 --- a/templates/base_message.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - {% block title %}Mail app{% endblock %} - - - - - - - {% block additional_headers %} - {% endblock %} - - - - - -
-
- -

- - {{list_address}} - -

-

- - All lists - -

-
-
-
    - {{ search_form.as_ul }} -
-
-
-
- -
- -
- - question - -
- {{message.email.Subject}} -
    -
  • {{participants|length}} participants
    • -
  • {{answers}} comments
    • -
-
- -
- - -
-
-
- -
- {% block content %} - {% endblock %} -
- - {% block additionaljs %} - {% endblock %} - - - diff --git a/templates/base_simple.html b/templates/base_simple.html deleted file mode 100644 index 9af40b8..0000000 --- a/templates/base_simple.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - {% block title %}Mail app{% endblock %} - - - - - - - {% block additional_headers %} - {% endblock %} - - - - -
- {% block content %} - {% endblock %} -
- - - diff --git a/templates/base_thread.html b/templates/base_thread.html deleted file mode 100644 index dea3b2d..0000000 --- a/templates/base_thread.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - {% block title %}Mail app{% endblock %} - - - - - - - {% block additional_headers %} - {% endblock %} - - - - - -
-
- -
-
-
    - {{ search_form.as_ul }} -
-
-
-
-

- - {{list_address}} - -

-

- - All lists - -

-
- {% if next_thread %} -
- - New thread - -
- {{next_thread}} -
- {% endif %} - -
- - question - -
- {{first_mail.email.subject}} -
    -
  • {{participants|length}} participants
    • -
  • {{answers}} comments
    • -
-
- - {% if prev_thread %} -
- - New thread - -
- {{prev_thread}} -
- {% endif %} - -
- - -
-
-
- -
- {% block content %} - {% endblock %} -
- - - diff --git a/templates/message.html b/templates/message.html index 12b9075..ce2f7f3 100644 --- a/templates/message.html +++ b/templates/message.html @@ -1,9 +1,9 @@ -{% extends "base_message.html" %} +{% extends "base.html" %} {% load gravatar %} {% block title %}{{ app_name }}{% endblock %} -{% block additional_headers %} +{% block additional_stylesheets %} {% endblock %} diff --git a/templates/month_view.html b/templates/month_view.html index 731b9ca..7ac3ebe 100644 --- a/templates/month_view.html +++ b/templates/month_view.html @@ -4,19 +4,6 @@ {% block title %}{{ app_name }}{% endblock %} -{% block additional_headers %} - - - -{% endblock %} - {% block content %}
@@ -101,3 +88,17 @@ {% endblock %} + +{% block additionaljs %} + + +{% endblock %} + + diff --git a/templates/recent_activities.html b/templates/recent_activities.html index 6c89719..933e118 100644 --- a/templates/recent_activities.html +++ b/templates/recent_activities.html @@ -4,9 +4,8 @@ {% block title %} {{ app_name }} {% endblock %} -{% block additional_headers %} - - +{% block additional_stylesheets %} + {% endblock %} {% block content %} @@ -211,3 +210,8 @@ vis.render(); {% endfor %} {% endblock %} + +{% block addtionaljs %} + +{% endblock %} + diff --git a/templates/search.html b/templates/search.html index 3871a9e..c173ebf 100644 --- a/templates/search.html +++ b/templates/search.html @@ -2,21 +2,6 @@ {% load poll_extras %} {% load gravatar %} -{% block title %}{{ app_name }}{% endblock %} - -{% block additional_headers %} - - - -{% endblock %} - {% block content %} {% if threads.object_list %} @@ -115,3 +100,16 @@ {% endif %} {% endblock %} + +{% block additionaljs %} + + +{% endblock %} + diff --git a/templates/thread.html b/templates/thread.html index 41c3aa7..b480128 100644 --- a/templates/thread.html +++ b/templates/thread.html @@ -1,22 +1,10 @@ -{% extends "base_thread.html" %} +{% extends "base.html" %} {% load gravatar %} {% block title %}{{ app_name }}{% endblock %} -{% block additional_headers %} - - - - - +{% block additional_stylesheets %} + {% endblock %} {% block content %} @@ -138,3 +126,15 @@
{% endblock %} + +{% block addtionaljs %} + + +{% endblock %} -- cgit