# HG changeset patch # User Steve Losh # Date 1261010982 18000 # Node ID 673df76b12d6d1660e05d46100f240e8b1933d2f # Parent 637a1763479bc9cd83edc49b7cfb57306826e051 Format the templates to keep me sane. diff -r 637a1763479b -r 673df76b12d6 layout/_flatpage.html --- a/layout/_flatpage.html Wed Dec 16 19:21:22 2009 -0500 +++ b/layout/_flatpage.html Wed Dec 16 19:49:42 2009 -0500 @@ -1,14 +1,11 @@ {% extends "skeleton/_body.html" %} -{% block content_body %} -
-{% filter typogrify %} -{% markdown %} -{% block article %} - -{% endblock %} - -{% endmarkdown %} -{% endfilter %} -
+{% block content_body %} +
+ {% filter typogrify %} + {% markdown %} + {% block article %}{% endblock %} + {% endmarkdown %} + {% endfilter %} +
{% endblock %} \ No newline at end of file diff -r 637a1763479b -r 673df76b12d6 layout/_post.html --- a/layout/_post.html Wed Dec 16 19:21:22 2009 -0500 +++ b/layout/_post.html Wed Dec 16 19:49:42 2009 -0500 @@ -1,14 +1,13 @@ {% extends "skeleton/_body.html" %} + {% block content_body %} -
-{% filter typogrify %} -{% markdown %} -{% article %} -{% block article %} - -{% endblock %} -{% endarticle %} -{% endmarkdown %} -{% endfilter %} -
+
+ {% filter typogrify %} + {% markdown %} + {% article %} + {% block article %}{% endblock %} + {% endarticle %} + {% endmarkdown %} + {% endfilter %} +
{% endblock %} \ No newline at end of file diff -r 637a1763479b -r 673df76b12d6 layout/skeleton/_base.html --- a/layout/skeleton/_base.html Wed Dec 16 19:21:22 2009 -0500 +++ b/layout/skeleton/_base.html Wed Dec 16 19:49:42 2009 -0500 @@ -1,27 +1,36 @@ {% extends "skeleton/_root.html" %} + {% block all %} - + + - - - {% block title %}{{site.name}} / {{ page.title }}{% endblock %} - {% block feeds %} - - {% endblock %} - {% block css %} - - {% block extra_css %}{% endblock %}{% endblock %}{% block js %} - - {% block extra_js %}{% endblock %}{% endblock %} - - -{% include "skeleton/_header.html" %} -
- {% block content %}{% endblock %} -
-{% include "skeleton/_footer.html" %} - + + + + {% block title %}{{site.name}} / {{ page.title }}{% endblock %} + + {% block feeds %} + + {% endblock %} + + {% block css %} + + {% block extra_css %}{% endblock %} + {% endblock %} + + {% block js %} + + {% block extra_js %}{% endblock %} + {% endblock %} + + + + {% include "skeleton/_header.html" %} +
+ {% block content %}{% endblock %} +
+ {% include "skeleton/_footer.html" %} + {% endblock %} \ No newline at end of file diff -r 637a1763479b -r 673df76b12d6 layout/skeleton/_body.html --- a/layout/skeleton/_body.html Wed Dec 16 19:21:22 2009 -0500 +++ b/layout/skeleton/_body.html Wed Dec 16 19:49:42 2009 -0500 @@ -1,25 +1,32 @@ {% extends "skeleton/_base.html" %} + {% block title %}{{site.name}} / {{ page.title }}{% endblock %} -{% block content %} -{% comment %}{% block breadcrumbs %}{% include "skeleton/_breadcrumbs.html"%}{% endblock %}{% endcomment %} -{% block nav %} - -{% endblock %} -{% block content_header %}{% ifnotequal page.module site.module %}

{{ page.title }}

{% endifnotequal %}{% endblock %} -{% block content_body %}{% endblock %} + +{% block content %} + {% block nav %} + + {% endblock %} + + {% block content_header %} + {% ifnotequal page.module site.module %} +

{{ page.title }}

+ {% endifnotequal %} + {% endblock %} + + {% block content_body %}{% endblock %} {% endblock %} \ No newline at end of file diff -r 637a1763479b -r 673df76b12d6 layout/skeleton/_breadcrumbs.html --- a/layout/skeleton/_breadcrumbs.html Wed Dec 16 19:21:22 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -{% extends "skeleton/_root.html" %} -{% block all %} - - -{% endblock %} \ No newline at end of file diff -r 637a1763479b -r 673df76b12d6 layout/skeleton/_footer.html --- a/layout/skeleton/_footer.html Wed Dec 16 19:21:22 2009 -0500 +++ b/layout/skeleton/_footer.html Wed Dec 16 19:49:42 2009 -0500 @@ -1,1 +1,3 @@ - + diff -r 637a1763479b -r 673df76b12d6 layout/skeleton/_index.html --- a/layout/skeleton/_index.html Wed Dec 16 19:21:22 2009 -0500 +++ b/layout/skeleton/_index.html Wed Dec 16 19:49:42 2009 -0500 @@ -1,6 +1,7 @@ {% extends "skeleton/_body.html" %} + {% block content_body %} -{% for node in page.node.walk %} -{% include "skeleton/_innerindex.html" %} -{% endfor %} + {% for node in page.node.walk %} + {% include "skeleton/_innerindex.html" %} + {% endfor %} {% endblock %} \ No newline at end of file diff -r 637a1763479b -r 673df76b12d6 layout/skeleton/_innerindex.html --- a/layout/skeleton/_innerindex.html Wed Dec 16 19:21:22 2009 -0500 +++ b/layout/skeleton/_innerindex.html Wed Dec 16 19:49:42 2009 -0500 @@ -1,20 +1,21 @@ {% extends "skeleton/_root.html" %} + {% block all %} -{%spaceless%} -{% for list_page in node.pages %} -{% ifnotequal list_page node.listing_page %} -{% if not list_page.exclude %} -
-
- {% with list_page.name_without_extension|remove_date_prefix|unslugify as default_title %} -

{{list_page.title|default_if_none:default_title }}

- {% if list_page.created %}{{list_page.created}}{% endif %} - {%endwith%} -
- {% render_article list_page %} -
-{%endif%} -{% endifnotequal %} -{% endfor %} -{%endspaceless%} + {%spaceless%} + {% for list_page in node.pages %} + {% ifnotequal list_page node.listing_page %} + {% if not list_page.exclude %} +
+
+ {% with list_page.name_without_extension|remove_date_prefix|unslugify as default_title %} +

{{list_page.title|default_if_none:default_title }}

+ {% if list_page.created %}{{list_page.created}}{% endif %} + {%endwith%} +
+ {% render_article list_page %} +
+ {%endif%} + {% endifnotequal %} + {% endfor %} + {%endspaceless%} {% endblock %} \ No newline at end of file diff -r 637a1763479b -r 673df76b12d6 layout/skeleton/_innerlisting.html --- a/layout/skeleton/_innerlisting.html Wed Dec 16 19:21:22 2009 -0500 +++ b/layout/skeleton/_innerlisting.html Wed Dec 16 19:49:42 2009 -0500 @@ -1,16 +1,19 @@ {% extends "skeleton/_root.html" %} + {% block all %} -{%spaceless%} - -{%endspaceless%} + {%spaceless%} + + {%endspaceless%} {% endblock %} \ No newline at end of file diff -r 637a1763479b -r 673df76b12d6 layout/skeleton/_listing.html --- a/layout/skeleton/_listing.html Wed Dec 16 19:21:22 2009 -0500 +++ b/layout/skeleton/_listing.html Wed Dec 16 19:49:42 2009 -0500 @@ -1,8 +1,9 @@ {% extends "skeleton/_body.html"%} + {% block content_body %} -
-{% for node in page.node.walk %} -{% include "skeleton/_innerlisting.html" %} -{% endfor %} -
+
+ {% for node in page.node.walk %} + {% include "skeleton/_innerlisting.html" %} + {% endfor %} +
{% endblock %} \ No newline at end of file