# HG changeset patch # User Steve Losh <steve@stevelosh.com> # Date 1261017085 18000 # Node ID 95c935d55811fc428d555c3fe2b648c4558b4a66 # Parent 26eca19cae3b623903a9125f843b53149089fdd3 More structure changes. diff -r 26eca19cae3b -r 95c935d55811 content/archives/firstpost.html --- a/content/archives/firstpost.html Wed Dec 16 20:05:12 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -{% extends "_post.html" %} - -{% hyde - title: "Welcome to Hyde!" - created: 2009-03-01 20:19:00 -%} - - -{% block article %} - -Congratulations! You have successfully set up hyde! - -{% endblock %} \ No newline at end of file diff -r 26eca19cae3b -r 95c935d55811 content/archives/index.html --- a/content/archives/index.html Wed Dec 16 20:05:12 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -{% extends "skeleton/_listing.html" %} - -{% hyde - title: "Archives" - exclude: True -%} \ No newline at end of file diff -r 26eca19cae3b -r 95c935d55811 content/blog/firstpost.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/blog/firstpost.html Wed Dec 16 21:31:25 2009 -0500 @@ -0,0 +1,13 @@ +{% extends "_post.html" %} + +{% hyde + title: "Welcome to Hyde!" + created: 2009-03-01 20:19:00 +%} + + +{% block article %} + +Congratulations! You have successfully set up hyde! + +{% endblock %} \ No newline at end of file diff -r 26eca19cae3b -r 95c935d55811 content/blog/index.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/blog/index.html Wed Dec 16 21:31:25 2009 -0500 @@ -0,0 +1,6 @@ +{% extends "skeleton/_listing.html" %} + +{% hyde + title: "Blog" + exclude: True +%} \ No newline at end of file diff -r 26eca19cae3b -r 95c935d55811 content/index.html --- a/content/index.html Wed Dec 16 20:05:12 2009 -0500 +++ b/content/index.html Wed Dec 16 21:31:25 2009 -0500 @@ -1,6 +1,5 @@ {% extends "skeleton/_index.html" %} {% hyde - title: "Blog Posts" - listing: True + title: "" %} diff -r 26eca19cae3b -r 95c935d55811 layout/_flatpage.html --- a/layout/_flatpage.html Wed Dec 16 20:05:12 2009 -0500 +++ b/layout/_flatpage.html Wed Dec 16 21:31:25 2009 -0500 @@ -1,6 +1,8 @@ -{% extends "skeleton/_body.html" %} +{% extends "skeleton/_base.html" %} -{% block content_body %} +{% block content %} + <div class="article title"><h3>{{ page.title }}</h3></div> + <div id="post-content"> {% filter typogrify %} {% markdown %} diff -r 26eca19cae3b -r 95c935d55811 layout/_post.html --- a/layout/_post.html Wed Dec 16 20:05:12 2009 -0500 +++ b/layout/_post.html Wed Dec 16 21:31:25 2009 -0500 @@ -1,6 +1,8 @@ -{% extends "skeleton/_body.html" %} +{% extends "skeleton/_base.html" %} -{% block content_body %} +{% block content %} + <div class="article title"><h3>{{ page.title }}</h3></div> + <div id="post-content"> {% filter typogrify %} {% markdown %} diff -r 26eca19cae3b -r 95c935d55811 layout/skeleton/_base.html --- a/layout/skeleton/_base.html Wed Dec 16 20:05:12 2009 -0500 +++ b/layout/skeleton/_base.html Wed Dec 16 21:31:25 2009 -0500 @@ -30,7 +30,21 @@ </head> <body> - {% include "skeleton/_header.html" %} + <div id="header"> + <a href="/"> + <h1>steve losh <span class="page-title">/ {{ page.title }}</span></h1> + </a> + </div> + + <div id="nav"> + <ul> + <li><a href="/blog/">Blog</a></li> + <li><a href="http://bitbucket.org/sjl/">Code</a></li> + <li><a href="/projects">Projects</a></li> + <li><a href="/about/">About</a></li> + <li><a href="/rss/">RSS</a></li> + </ul> + </div> <div id="content"> {% block content %}{% endblock %} diff -r 26eca19cae3b -r 95c935d55811 layout/skeleton/_body.html --- a/layout/skeleton/_body.html Wed Dec 16 20:05:12 2009 -0500 +++ b/layout/skeleton/_body.html Wed Dec 16 21:31:25 2009 -0500 @@ -2,31 +2,6 @@ {% block title %}{{site.name}} / {{ page.title }}{% endblock %} -{% block content %} - {% block nav %} - <div id="nav"> - <ul> - <a href="{{ site.listing_url }}"> - <li{% ifequal page.module site.module %} class="home-selected" {% endifequal %}> - Home - </li> - </a> - {% for module in site.children %} - <a href="{{ module.listing_url }}"> - <li{% ifequal page.module module %} class="selected" {% endifequal %}> - {{ module.name|unslugify }} - </li> - </a> - {% endfor %} - </ul> - </div> - {% endblock %} - - {% block content_header %} - {% ifnotequal page.module site.module %} - <div class="article title"><h3>{{ page.title }}</h3></div> - {% endifnotequal %} - {% endblock %} - +{% block content %} {% block content_body %}{% endblock %} {% endblock %} \ No newline at end of file diff -r 26eca19cae3b -r 95c935d55811 layout/skeleton/_header.html --- a/layout/skeleton/_header.html Wed Dec 16 20:05:12 2009 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -<div id="header"> - <a href="/"> - <h1>steve losh <span class="page-title">/ {{ page.title }}</span></h1> - </a> -</div> diff -r 26eca19cae3b -r 95c935d55811 layout/skeleton/_index.html --- a/layout/skeleton/_index.html Wed Dec 16 20:05:12 2009 -0500 +++ b/layout/skeleton/_index.html Wed Dec 16 21:31:25 2009 -0500 @@ -1,6 +1,6 @@ -{% extends "skeleton/_body.html" %} +{% extends "skeleton/_base.html" %} -{% block content_body %} +{% block content %} {% for node in page.node.walk %} {% include "skeleton/_innerindex.html" %} {% endfor %} diff -r 26eca19cae3b -r 95c935d55811 layout/skeleton/_listing.html --- a/layout/skeleton/_listing.html Wed Dec 16 20:05:12 2009 -0500 +++ b/layout/skeleton/_listing.html Wed Dec 16 21:31:25 2009 -0500 @@ -1,6 +1,6 @@ -{% extends "skeleton/_body.html"%} +{% extends "skeleton/_base.html"%} -{% block content_body %} +{% block content %} <div id="listing"> {% for node in page.node.walk %} {% include "skeleton/_innerlisting.html" %}