removing all base_*.html template files. All templates now extends single base.html

author: Aamir Khan <syst3m.w0rm@gmail.com> 2012-06-20 02:54:17 -0400
committer: Aamir Khan <syst3m.w0rm@gmail.com> 2012-06-20 02:54:17 -0400
commit: 5071591286b89bd05fb9febed308fc219bf7deca (patch)
tree: 67a738ac7d5e2e56f35cfe22997cc38f2f5a617f
parent: c5c7fa5f7ff3f09ea735d3d054708fc2164792fb (diff)
download: hyperkitty-5071591286b89bd05fb9febed308fc219bf7deca.tar.gz
hyperkitty-5071591286b89bd05fb9febed308fc219bf7deca.tar.xz
hyperkitty-5071591286b89bd05fb9febed308fc219bf7deca.zip
10 files changed, 64 insertions, 262 deletions
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 %}
   <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" />
 {% 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 @@
   <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="" />
+  <title>{% block title %}{{ app_name }}{% 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 %}
+  {% block additional_stylesheets %}
   {% endblock %}
+
 </head>
 
 {% load i18n %}
@@ -79,17 +79,17 @@
     </div>
     <hr id="white"/>
     <hr />
-  </div>
   {% endblock %}
-
-  <div class="content">
-    {% block content %}
-    {% endblock %}
   </div>
+  <!-- End of Header -->
+
+  {% block content %}
+  {% endblock %}
 
-    <script src="{{ STATIC_URL }}/js/libs/jquery-1.7.1.min.js"></script>
-    {% block additionaljs %}
-    {% endblock %}
+  <script src="{{ STATIC_URL }}/js/libs/jquery-1.7.1.min.js"></script>
+  
+  {% block additionaljs %}
+  {% endblock %}
 
 </body>
 </html>
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 @@
-<!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">
-        {% if list_address  %}
-        <li id="list_name"><a href="/list/{{list_address}}">{{list_name}}</a></li>
-        {% else %}
-        <li id="list_name"><a href="/list/">{{list_name}}</a></li>
-        {% endif %}
-        <li id="page_date">{{month}}</li>
-      </ul>
-      <p id="list_email">
-        <a href="mailto:{{list_address}}">
-          {{list_address}}
-        </a>
-      </p>
-      <p id="list_email" class='inline'>
-        <a href="/">
-          All lists
-        </a>
-      </p>
-      <div id="top_right">
-        <form action="/search/{{list_address}}" method="get">
-          <ul class="inline-block">
-            {{ search_form.as_ul }}
-          </ul>
-        </form> 
-      </div>
-    </div>
-
-    <div id="thread_nav">
-
-      <div class="inline-block thread_title">
-        <span class="type type_question">
-          <a href="/tag/question"> question </a>
-        </span>
-        <br />
-        {{message.email.Subject}}
-        <ul class="inline thread_info">
-          <li class="participant"> {{participants|length}} participants</li>
-          <li class="discussion"> {{answers}} comments</li>
-        </ul>
-      </div>
-  
-    </div>
-
-    
-    <hr id="white"/>
-    <hr />
-  </div>
-
-  <div class="content">
-    {% block content %}
-    {% endblock %}
-  </div>
-    <script src="{{ STATIC_URL }}/js/libs/jquery-1.7.1.min.js"></script>
-    {% block additionaljs %}
-    {% endblock %}
-
-</body>
-</html>
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 @@
-<!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>
-
-  <div class="content">
-    {% block content %}
-    {% endblock %}
-  </div>
-
-</body>
-</html>
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 @@
-<!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">
-        {% if list_address  %}
-        <li id="list_name"><a href="/list/{{list_address}}">{{list_name}}</a></li>
-        {% else %}
-        <li id="list_name"><a href="/list/">{{list_name}}</a></li>
-        {% endif %}
-        <li id="page_date">{{month}}</li>
-      </ul>
-      <div id="top_right">
-        <form action="/search/{{list_address}}" method="get">
-          <ul class="inline-block">
-            {{ search_form.as_ul }}
-          </ul>
-        </form> 
-      </div>
-    </div>
-    <p id="list_email">
-      <a href="mailto:{{list_address}}">
-        {{list_address}}
-      </a>
-    </p>
-    <p id="list_email" class='inline'>
-      <a href="/">
-        All lists
-      </a>
-    </p>
-    <div id="thread_nav">
-      {% if next_thread %}
-      <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>
-      {% endif %}
-
-      <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>
-  
-      {% if prev_thread %}
-      <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>
-      {% endif %}
-      
-    </div>
-
-    
-    <hr id="white"/>
-    <hr />
-  </div>
-
-  <div class="content">
-    {% block content %}
-    {% endblock %}
-  </div>
-
-</body>
-</html>
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 %}
   <link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" />
 
 {% 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 %}
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script>
-  <script src="{{ STATIC_URL }}jquery.expander.js"></script>
-  <script>
-    $(document).ready(function() {
-      $('span.expander').expander({
-      userCollapseText: 'View Less',
-      expandText: 'View More'
-      });
-    });
-    </script>
-{% endblock %}
-
 {% block content %}
 
     <div id="recent_activities">
@@ -101,3 +88,17 @@
 
 
 {% endblock %}
+
+{% block additionaljs %}
+  <script src="{{ STATIC_URL }}jquery.expander.js"></script>
+  <script>
+    $(document).ready(function() {
+      $('span.expander').expander({
+      userCollapseText: 'View Less',
+      expandText: 'View More'
+      });
+    });
+    </script>
+{% 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 %}
-<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/stats.css" />
-<script type="text/javascript" src="{{ STATIC_URL }}protovis-d3.1.js"></script>
+{% block additional_stylesheets %}
+	<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/stats.css" />
 {% endblock %}
 
 {% block content %}
@@ -211,3 +210,8 @@ vis.render();
       {% endfor %}
     </section>
 {% endblock %}
+
+{% block addtionaljs %}
+<script type="text/javascript" src="{{ STATIC_URL }}protovis-d3.1.js"></script>
+{% 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 %}
-  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script>
-  <script src="{{ STATIC_URL }}jquery.expander.js"></script>
-  <script>
-    $(document).ready(function() {
-      $('span.expander').expander({
-      userCollapseText: 'View Less',
-      expandText: 'View More'
-      });
-    });
-    </script>
-{% endblock %}
-
 {% block content %}
 
     {% if threads.object_list %}
@@ -115,3 +100,16 @@
     {% endif %}
 
 {% endblock %}
+
+{% block additionaljs %}
+  <script src="{{ STATIC_URL }}jquery.expander.js"></script>
+  <script>
+    $(document).ready(function() {
+      $('span.expander').expander({
+      userCollapseText: 'View Less',
+      expandText: 'View More'
+      });
+    });
+    </script>
+{% 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 %}
-  <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>
-  <script src="{{ STATIC_URL }}jquery.expander.js"></script>
-  <script>
-    $(document).ready(function() {
-      $('div.email_body').expander({
-      userCollapseText: 'View Less',
-      expandText: 'View More'
-      });
-    });
-    </script>
+{% block additional_stylesheets %}
+	<link rel="stylesheet" type="text/css" media="all" href="{{ STATIC_URL }}css/thread.css" />
 {% endblock %}
 
 {% block content %}
@@ -138,3 +126,15 @@
 
   </div> <!-- end of content -->
 {% endblock %}
+
+{% block addtionaljs %}
+<script src="{{ STATIC_URL }}jquery.expander.js"></script>
+  <script>
+    $(document).ready(function() {
+      $('div.email_body').expander({
+      userCollapseText: 'View Less',
+      expandText: 'View More'
+      });
+    });
+    </script>
+{% endblock %}
author	Aamir Khan <syst3m.w0rm@gmail.com>	2012-06-20 02:54:17 -0400
committer	Aamir Khan <syst3m.w0rm@gmail.com>	2012-06-20 02:54:17 -0400
commit	5071591286b89bd05fb9febed308fc219bf7deca (patch)
tree	67a738ac7d5e2e56f35cfe22997cc38f2f5a617f
parent	c5c7fa5f7ff3f09ea735d3d054708fc2164792fb (diff)
download	hyperkitty-5071591286b89bd05fb9febed308fc219bf7deca.tar.gz hyperkitty-5071591286b89bd05fb9febed308fc219bf7deca.tar.xz hyperkitty-5071591286b89bd05fb9febed308fc219bf7deca.zip