integrated wakawaka templates into Pinax template structure

bmihelac · Jun 30, 2010 · cfe3067 · cfe3067
1 parent d895acf
commit cfe3067
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 49 deletions.
diff --git a/pinax/templates/default/wakawaka/base.html b/pinax/templates/default/wakawaka/base.html
@@ -1,34 +1,13 @@
+{% extends group_base|default:"site_base.html" %}
+
 {% load i18n %}
 
-<html>
-<head>
-    <title>{% block title %}{% endblock %}</title>
-    {% block extrahead %}{% endblock %}
-</head>
-<body>
-    {% if messages %}
-    <ul class="messages">
-    {% for message in messages %}
-        <li>{{ message }}</li>
-        {% endfor %}
+{% block body_class %}wiki{% endblock %}
+
+{% block subnav %}
+    <ul>
+        <li><a href="{% url wakawaka_index %}">{% trans "Start" %}</a></li>
+        <li><a href="{% url wakawaka_revision_list %}">{% trans "Recent revisions" %}</a></li>
+        <li><a href="{% url wakawaka_page_list %}">{% trans "All Pages" %}</a></li>
     </ul>
-    {% endif %}
-
-    {% spaceless %}
-    <div class="info">
-        <span>
-            <a href="{% url wakawaka_index %}">{% trans "Start" %}</a>
-        </span>
-        <span>
-            <a href="{% url wakawaka_revision_list %}">{% trans "Recent revisions" %}</a>
-        </span>
-        <span>
-            <a href="{% url wakawaka_page_list %}">{% trans "All Pages" %}</a>
-        </span>
-    </div>
-    {% endspaceless %}
-
-    {% block content %}
-    {% endblock %}
-</body>
-</html>
+{% endblock %}
diff --git a/pinax/templates/default/wakawaka/changes.html b/pinax/templates/default/wakawaka/changes.html
@@ -3,20 +3,18 @@
 {% load wakawaka_tags %}
 {% load i18n %}
 
-{% block extrahead %}
-    {{ block.super }}
-
+{% block extra_head %}
     {# Don't let search engines scan this old revision #}
     {% if rev.is_not_current %}
         <meta name="robots" content="noindex" />
     {% endif %}
 {% endblock %}
 
-{% block title %}
+{% block head_title %}
     {% blocktrans with page.slug as slug %}Changes for {{ slug  }}{% endblocktrans %}
 {% endblock %}
 
-{% block content %}
+{% block body %}
     <h1>{{ page.slug }}</h1>
 
     <pre class="changes">{{ diff }}</pre>

diff --git a/pinax/templates/default/wakawaka/edit.html b/pinax/templates/default/wakawaka/edit.html
@@ -2,15 +2,15 @@
 
 {% load i18n %}
 
-{% block title %}
+{% block head_title %}
     {% if page.is_initial %}
         {% blocktrans with page.slug as slug %}Add {{ slug  }}{% endblocktrans %}
     {% else %}
         {% blocktrans with page.slug as slug %}Edit {{ slug  }}{% endblocktrans %}
     {% endif %}
 {% endblock %}
 
-{% block content %}
+{% block body %}
     <h1>
         {% if page.is_initial %}
             {% blocktrans with page.slug as slug %}Add {{ slug  }}{% endblocktrans %}

diff --git a/pinax/templates/default/wakawaka/page.html b/pinax/templates/default/wakawaka/page.html
@@ -3,20 +3,18 @@
 {% load wakawaka_tags %}
 {% load i18n %}
 
-{% block extrahead %}
-    {{ block.super }}
-
+{% block extra_head %}
     {# Don't let search engines scan this old revision #}
     {% if rev.is_not_current %}
         <meta name="robots" content="noindex" />
     {% endif %}
 {% endblock %}
 
-{% block title %}
+{% block head_title %}
     {{ page.slug }}
 {% endblock %}
 
-{% block content %}
+{% block body %}
     <h1><a href="{% url wakawaka_page slug=page.slug %}">{{ page.slug }}</a></h1>
 
     {% if rev.is_not_current %}

diff --git a/pinax/templates/default/wakawaka/page_list.html b/pinax/templates/default/wakawaka/page_list.html
@@ -2,11 +2,11 @@
 
 {% load i18n %}
 
-{% block title %}
+{% block head_title %}
     {% trans "All wiki pages" %}
 {% endblock %}
 
-{% block content %}
+{% block body %}
     <h1>{% trans "All wiki pages" %}</h1>
     <ul>
     {% for page in page_list %}

diff --git a/pinax/templates/default/wakawaka/revision_list.html b/pinax/templates/default/wakawaka/revision_list.html
@@ -2,11 +2,11 @@
 
 {% load i18n %}
 
-{% block title %}
+{% block head_title %}
     {% trans "List of all revisions" %}
 {% endblock %}
 
-{% block content %}
+{% block body %}
     <h1>{% trans "List of all revisions" %}</h1>
 
     <table class="history" border="1">

diff --git a/pinax/templates/default/wakawaka/revisions.html b/pinax/templates/default/wakawaka/revisions.html
@@ -2,11 +2,11 @@
 
 {% load i18n %}
 
-{% block title %}
+{% block head_title %}
     {% blocktrans with page.slug as slug %}History for {{ slug }}{% endblocktrans %}
 {% endblock %}
 
-{% block content %}
+{% block body %}
     <h1>{% blocktrans with page.slug as slug %}History for {{ slug }}{% endblocktrans %}</h1>
 
     {% include "wakawaka/revision_table.html" %}