# HG changeset patch # User Steve Losh # Date 1263671618 18000 # Node ID 08d7552b62378360414a28a268df6c5ec5ea3659 # Parent e8cb0776f67e3242aaec246b1ca18f7715ff768c Add categories. diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2008/02/microsoft-entourage-applescript-frustration.html --- a/content/blog/2008/02/microsoft-entourage-applescript-frustration.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2008/02/microsoft-entourage-applescript-frustration.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Entourage + Applescript = Frustration" snip: "This is ridiculous." created: 2008-02-21 15:25:45 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2008/04/shooting-girl-jam.html --- a/content/blog/2008/04/shooting-girl-jam.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2008/04/shooting-girl-jam.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Shooting Girl Jam" snip: "I’m finally getting the kind of dancing photos I want." created: 2008-04-29 18:31:16 + categories: ["photography", "dancing"] %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2008/08/beauty-in-computer-science-recursion.html --- a/content/blog/2008/08/beauty-in-computer-science-recursion.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2008/08/beauty-in-computer-science-recursion.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Beauty in Computer Science" snip: "Why I love what I do." created: 2008-08-29 15:30:38 + categories: ["programming"] %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2008/08/negative-space-dancing.html --- a/content/blog/2008/08/negative-space-dancing.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2008/08/negative-space-dancing.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Negative Space in Dancing" snip: "It’s not just for artsy kids." created: 2008-08-31 15:33:57 + categories: ["dancing"] %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2008/08/on-leading.html --- a/content/blog/2008/08/on-leading.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2008/08/on-leading.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "On Leading" snip: "Some of my thoughts on leading after five years of doing it." created: 2008-08-01 15:28:33 + categories: ["dancing"] %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/01/deploying-site-fabric-and-mercurial.html --- a/content/blog/2009/01/deploying-site-fabric-and-mercurial.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/01/deploying-site-fabric-and-mercurial.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Deploying with Fabric & Mercurial" snip: "Trimming typing." created: 2009-01-15 20:51:09 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/01/going-open-source.html --- a/content/blog/2009/01/going-open-source.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/01/going-open-source.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Going Open Source" snip: "Why I’m making the code to this website public." created: 2009-01-13 20:08:56 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/01/site-redesign.html --- a/content/blog/2009/01/site-redesign.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/01/site-redesign.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Site Redesign" snip: "Yeah, I know. Again." created: 2009-01-11 17:58:23 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/02/how-and-why-i-dj.html --- a/content/blog/2009/02/how-and-why-i-dj.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/02/how-and-why-i-dj.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "How & Why I DJ" snip: "I like playing music for dancers." created: 2009-02-06 17:53:44 + categories: ["music", "dancing"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/02/how-i-shoot-dances.html --- a/content/blog/2009/02/how-i-shoot-dances.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/02/how-i-shoot-dances.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "How I Shoot Dances" snip: "Slow shutter and flash." created: 2009-02-09 18:04:36 + categories: ["photography", "dancing"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/03/candy-colored-terminal.html --- a/content/blog/2009/03/candy-colored-terminal.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/03/candy-colored-terminal.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Candy Colored Terminal" snip: "Better colors for the OS X Terminal." created: 2009-03-18 18:26:28 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/03/mercurial-bash-prompts.html --- a/content/blog/2009/03/mercurial-bash-prompts.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/03/mercurial-bash-prompts.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Mercurial Bash Prompts" snip: "Always know where you are." created: 2009-03-17 21:34:55 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/04/why-people-dont-like-metal.html --- a/content/blog/2009/04/why-people-dont-like-metal.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/04/why-people-dont-like-metal.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Why People Don’t Like Metal" snip: "It’s probably not what you think." created: 2009-04-02 22:32:27 + categories: ["music"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/05/what-i-hate-about-mercurial.html --- a/content/blog/2009/05/what-i-hate-about-mercurial.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/05/what-i-hate-about-mercurial.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "What I Hate About Mercurial" snip: "Hg, I love you, but sometimes you bring me down." created: 2009-05-29 19:51:05 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/06/how-to-contribute-to-mercurial.html --- a/content/blog/2009/06/how-to-contribute-to-mercurial.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/06/how-to-contribute-to-mercurial.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "How to Contribute to Mercurial" snip: "Ten minutes of setup will make it easier." created: 2009-06-01 20:09:44 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/08/a-guide-to-branching-in-mercurial.html --- a/content/blog/2009/08/a-guide-to-branching-in-mercurial.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/08/a-guide-to-branching-in-mercurial.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "A Guide to Branching in Mercurial" snip: "With illustrations and comparisons to git." created: 2009-08-30 20:27:12 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2009/11/my-sitesprint-project-lindyhub.html --- a/content/blog/2009/11/my-sitesprint-project-lindyhub.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2009/11/my-sitesprint-project-lindyhub.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "My SiteSprint Project: LindyHub" snip: "I want to make something awesome for dancers." created: 2009-11-16 19:15:07 + categories: ["programming", "dancing"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/2010/01/moving-from-django-to-hyde.html --- a/content/blog/2010/01/moving-from-django-to-hyde.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/blog/2010/01/moving-from-django-to-hyde.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Moving from Django to Hyde" snip: "Another year, another rewrite." created: 2010-01-15 20:14:00 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/blog/dancing.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/blog/dancing.html Sat Jan 16 14:53:38 2010 -0500 @@ -0,0 +1,7 @@ +{% extends "skeleton/_categorylisting.html" %} + +{% hyde + title: "Blog" + category: "dancing" + exclude: True +%} \ No newline at end of file diff -r e8cb0776f67e -r 08d7552b6237 content/blog/music.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/blog/music.html Sat Jan 16 14:53:38 2010 -0500 @@ -0,0 +1,7 @@ +{% extends "skeleton/_categorylisting.html" %} + +{% hyde + title: "Blog" + category: "music" + exclude: True +%} \ No newline at end of file diff -r e8cb0776f67e -r 08d7552b6237 content/blog/photography.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/blog/photography.html Sat Jan 16 14:53:38 2010 -0500 @@ -0,0 +1,7 @@ +{% extends "skeleton/_categorylisting.html" %} + +{% hyde + title: "Blog" + category: "photography" + exclude: True +%} \ No newline at end of file diff -r e8cb0776f67e -r 08d7552b6237 content/blog/programming.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/blog/programming.html Sat Jan 16 14:53:38 2010 -0500 @@ -0,0 +1,7 @@ +{% extends "skeleton/_categorylisting.html" %} + +{% hyde + title: "Blog" + category: "programming" + exclude: True +%} \ No newline at end of file diff -r e8cb0776f67e -r 08d7552b6237 content/projects/django-hoptoad.html --- a/content/projects/django-hoptoad.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/django-hoptoad.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "django-hoptoad" snip: "Now ponies can ride the toad too." created: 2009-07-25 01:16:40 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/projects/fuego.html --- a/content/projects/fuego.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/fuego.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Fuego" snip: "Photographs of Alex. Studio." created: 2009-01-19 01:25:20 + categories: ["photography"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/projects/grabtweets.html --- a/content/projects/grabtweets.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/grabtweets.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "grabtweets" snip: "A simple tool for backing up your tweets." created: 2009-09-12 11:02:46 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/projects/hg-paste.html --- a/content/projects/hg-paste.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/hg-paste.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "hg-paste" snip: "Send diffs from Mercurial to various pastebin websites." created: 2009-09-16 17:52:55 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/projects/hg-prompt.html --- a/content/projects/hg-prompt.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/hg-prompt.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "hg-prompt" snip: "A Mercurial extension for adding repository info to your shell prompt." created: 2009-06-19 22:25:17 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/projects/hgtab.html --- a/content/projects/hgtab.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/hgtab.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,8 @@ title: "hgtab" snip: "Smarter tab completion for Mercurial in bash." created: 2009-03-10 20:22:44 + categories: ["programming"] + exclude: True %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/projects/lindyjam-com.html --- a/content/projects/lindyjam-com.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/lindyjam-com.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "lindyjam.com" snip: "A page for a local weekly swing dance event (and more)." created: 2009-01-21 18:28:35 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/projects/photography.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/projects/photography.html Sat Jan 16 14:53:38 2010 -0500 @@ -0,0 +1,7 @@ +{% extends "skeleton/_categorylisting.html" %} + +{% hyde + title: "Programming" + category: "photography" + exclude: True +%} \ No newline at end of file diff -r e8cb0776f67e -r 08d7552b6237 content/projects/programming.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/content/projects/programming.html Sat Jan 16 14:53:38 2010 -0500 @@ -0,0 +1,7 @@ +{% extends "skeleton/_categorylisting.html" %} + +{% hyde + title: "Projects" + category: "programming" + exclude: True +%} \ No newline at end of file diff -r e8cb0776f67e -r 08d7552b6237 content/projects/stevelosh-com.html --- a/content/projects/stevelosh-com.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/stevelosh-com.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "stevelosh.com" snip: "This website." created: 2009-01-11 15:40:26 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/projects/t.html --- a/content/projects/t.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/t.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "t" snip: "A command-line todo list manager for people that want to finish tasks, not organize them." created: 2009-09-11 19:03:29 + categories: ["programming"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 content/projects/women-in-water.html --- a/content/projects/women-in-water.html Fri Jan 15 20:30:20 2010 -0500 +++ b/content/projects/women-in-water.html Sat Jan 16 14:53:38 2010 -0500 @@ -4,6 +4,7 @@ title: "Women in Water" snip: "Photographs of women in Lake Ontario." created: 2009-08-04 18:57:36 + categories: ["photography"] %} {% block article %} diff -r e8cb0776f67e -r 08d7552b6237 fabfile.py --- a/fabfile.py Fri Jan 15 20:30:20 2010 -0500 +++ b/fabfile.py Sat Jan 16 14:53:38 2010 -0500 @@ -15,7 +15,7 @@ local('hyde -g -s .') def serve(): - local('hyde -w -s .') + local('hyde -w -s . -k') def reserve(): regen() diff -r e8cb0776f67e -r 08d7552b6237 layout/_post.html --- a/layout/_post.html Fri Jan 15 20:30:20 2010 -0500 +++ b/layout/_post.html Sat Jan 16 14:53:38 2010 -0500 @@ -11,7 +11,15 @@

{{ page.title|safe|typogrify }}

-

Posted on {{ page.created|date:"l, F j, Y" }} ({{ page.created|timesince }} ago).

+
+

+ Posted {{ page.created|timesince }} ago on {{ page.created|date:"F j, Y" }} + {% if page.categories %} + and tagged as +{% for category in page.categories %}{% if not forloop.first %}{% if forloop.last %} and {% else %}, {% endif %}{% endif %}{{ category }}{% endfor %}. + {% endif %} +

+
{% filter typogrify %} diff -r e8cb0776f67e -r 08d7552b6237 layout/skeleton/_base.html --- a/layout/skeleton/_base.html Fri Jan 15 20:30:20 2010 -0500 +++ b/layout/skeleton/_base.html Sat Jan 16 14:53:38 2010 -0500 @@ -8,7 +8,7 @@ - {% block title %}{{ page.title|safe }} / {{ site.name }}{% endblock %} + {% block title %}{% block extra_title %}{% endblock %}{{ page.title|safe }} / {{ site.name }}{% endblock %} {% block feeds %}