Update header, about and projects

Rules

@@ -23,6 +23,12 @@ compile %r(/\d{4}/.*) do
   filter :rubypants
 end
 
+compile %r(/about/.*) do
+  filter :rdiscount
+  layout 'topphoto'
+  filter :rubypants
+end
+
 compile %r{.*/feed/} do
   filter :erb
 end

content/about.html

@@ -1,16 +1,17 @@
-Me
---
-
 <div class="vcard">
-  <img src="/images/Photo%20of%20Wesley%20Moore.jpg" width="256" height="256" alt="Photo of Wesley Moore" class="photo" />
+  <p>WezM.net is <span class="fn">Wesley Moore</span>’s personal home page. I
-  <p>WezM.net is <span class="fn">Wesley Moore</span>’s personal
+    live in <span class="adr"><span class="locality">Melbourne</span> <span
-  home page, a <span class="title">programmer</span> from <span
+        class="country-name">Australia</span></span> and work as a <span
-  class="adr"><span class="locality">Melbourne</span> <span
+      class="title">sofware developer</span>. Here you will find posts about <a
-  class="country-name">Australia</span></span>. Here you will find posts
+      href="/projects/">projects</a> I'm working on, useful tips I've
-  about various projects I'm working on, useful tips I've discovered as
+    discovered as well as other events from my life.</p>
-  well as some random posts about other things going on in my life.</p>
 </div>
 
+The content is split into two sections: [Technical](/technical/articles/) and
+[Personal](/personal/articles/). There is a [combined feed](/feed/) containing
+all posts as well as separate ones for [technical](/technical/feed/) and
+[personal](/personal/feed/) posts.
+
 ### Contact
 
 Find me on the Internet in one of these places:
@@ -49,48 +50,24 @@ Find me on the Internet in one of these places:
     //]]>
     </script>
   </li>
-  <li>App.net – <a href="https://alpha.app.net/wezm">https://alpha.app.net/wezm</a></li>
-  <li>Twitter – <a href="http://twitter.com/wezm">http://twitter.com/wezm</a></li>
   <li>Facebook – <a href="http://www.facebook.com/wjmoore">http://www.facebook.com/wjmoore</a></li>
+  <li>Flickr – <a href="http://www.flickr.com/photos/wezm/">http://www.flickr.com/photos/wezm/</a></li>
   <li>GitHub – <a href="https://github.com/wezm">https://github.com/wezm</a></li>
+  <li>SoundCloud – <a href="https://soundcloud.com/wezm">https://soundcloud.com/wezm</a></li>
   <li>StackOverflow – <a href="http://stackoverflow.com/users/38820/wes">http://stackoverflow.com/users/38820/wes</a></li>
+  <li>Twitter – <a href="http://twitter.com/wezm">http://twitter.com/wezm</a></li>
 </ul>
 
-This Site
+Credits
----------
+-------
 
-This site is written in [Markdown][markdown] and [SASS][sass], generated using
+This site makes use of the following resources made available freely by their
-[nanoc][nanoc], enhanced with [jQuery][jquery] and hosted on VPS running
+authors:
-[Debian GNU/Linux][debian] and [nginx][nginx]. It makes use of the following
-resources made available freely by their authors:
 
 * [Reset CSS][cssreset] by Eric Meyer
 * [Mono icons][monoicons] by tutorial9
 * [Feed icon][feedicon] by FeedIcons.com and the Mozilla Foundation
 
-The content is split into two sections:
-[Technical](/technical/articles/) and [Personal](/personal/articles/). There is
-a [combined feed](/feed/) containing all posts as
-well as separate ones for
-[technical](/technical/feed/) and
-[personal](/personal/feed/) posts.
-
-Projects
---------
-
-Visit the [projects page](/projects/) for details of some of my software and
-hardware projects.
-
-Photography
------------
-
-I'm an amateur photographer. See my [Flickr photostream][flickr] for some of my
-photos. My primary camera is a Canon 400D SLR, with the following lenses:
-
-* Canon EF 28mm &fnof;/1.8 USM
-* Canon EFS 18-55mm &fnof;/3.5&ndash;5.6
-* Canon EF 75-300mm &fnof;/4&ndash;5.6
-
 [nanoc]: http://nanoc.stoneship.org/
 [markdown]: http://daringfireball.net/projects/markdown/
 [nginx]: http://nginx.org/

content/about.yaml

@@ -1,2 +1,4 @@
 --- 
 title: About
+photo: /images/Photo%20of%20Wesley%20Moore.jpg
+photo_alt: Photo of Wesley Moore

content/projects.html

@@ -3,6 +3,17 @@ more noteworthy projects are listed below.
 
 [github]: http://github.com/wezm
 
+OCMustache
+----------
+
+[OCMustache][ocmustache] brings the [Mustache templating language][mustache] to
+Objective-C. The parser is built using the [Ragel State Machine
+Compiler][ragel] in the hope that it will help ensure fast and correct parsing.
+
+[ocmustache]: https://github.com/wezm/OCMustache
+[mustache]: http://mustache.github.com/
+[ragel]: http://www.complang.org/ragel/
+
 Monothumb
 ---------
 
@@ -11,24 +22,11 @@ retrieves thumbnails of my [recent uploads to Flickr][flickr], converts them to
 greyscale and then generates a single output image with both the colour and
 monochrome versions of the thumbnail. There are two version of the tool. The
 original one, written in Objective-C that uses CoreImage and a second version
-written in Lua. The Lua one uses my [lua-imlib](#lua-imlib) fork.
+written in Lua. The Lua one uses my [lua-imlib2] fork.
 
 [flickr]: http://www.flickr.com/photos/wezm/
 [monothumb]: https://github.com/wezm/monothumb
 
-<a name="lua-imlib"></a>
-lua-imlib2
-----------
-
-[lua-imlib2] is a fork of the published lua-imlib library with additional
-functionality. This library allows image processing in Lua. Specifically I
-added:
-
-* Support for filters
-* Image blending
-
-[lua-imlib2]: https://github.com/wezm/lua-imlib2
-
 node-genx
 ---------
 
@@ -41,38 +39,16 @@ node.js environment.  Available for easy install via [npm].
 [genx]: http://www.tbray.org/ongoing/When/200x/2004/02/20/GenxStatus
 [npm]: http://npmjs.org/
 
-OCMustache
-----------
-
-[OCMustache][ocmustache] brings the [Mustache templating language][mustache] to
-Objective-C. The parser is built using the [Ragel State Machine
-Compiler][ragel] in the hope that it will help ensure fast and correct parsing.
-
-[ocmustache]: https://github.com/wezm/OCMustache
-[mustache]: http://mustache.github.com/
-[ragel]: http://www.complang.org/ragel/
-
-Kyoto Client
-------------
-
-[kyoto-client][kyoto-client] is a [node.js][node] client library for the
-[Kyoto Tycoon][kyoto-tycoon] server. Kyoto Tycoon is the server component of
-the [Kyoto Cabinet][kyoto-cabinet] key-value store. kyoto-client is available
-for installation via [npm].
-
-[kyoto-client]: http://kyoto-client.org
-[kyoto-tycoon]: http://fallabs.com/kyototycoon/
-[kyoto-cabinet]: http://1978th.net/kyotocabinet/
-
 Weather Station
 ---------------
 
-I have a weather station at my home for keeping track of the local conditions.
+I previously had a weather station at my home for keeping track of the local
-I added support for [SQLite][sqlite] logging to [my fork][open2300fork] of the
+conditions.  I added support for [SQLite][sqlite] logging to [my
-[Open2300][open2300] project. The weather station is connected to my Mac.
+fork][open2300fork] of the [Open2300][open2300] project. The weather station
-Every 5 minutes it logs the current conditions, uploads them to my server and
+was connected to a Mac for data logging.  Every 5 minutes it logged the current
-invokes a [lua program][weather-tools] to generate a [JSON][json] file,
+conditions, uploaded them to my server and invoked a [lua
-which is used to produce the [Weather page][weather].
+program][weather-tools] to generate a [JSON][json] file, which was used to
+produce the [Weather page][weather].
 
 [sqlite]: http://www.sqlite.org/
 [open2300]: http://www.lavrsen.dk/foswiki/bin/view/Open2300/WebHome

content/screen.sass

@@ -134,6 +134,9 @@ figcaption
 img
   max-width: 100%
 
+img.cover-photo
+  display: block
+  margin: 0 auto
 
 body > header
   font-family: $ans-serif

layouts/_header.html

@@ -5,7 +5,6 @@
     <li><a href="/articles/">Articles</a></li>
     <li><a href="/about/">About</a></li>
     <li><a href="/projects/">Projects</a></li>
-    <li><a href="/weather/">Weather</a></li>
     <li>
       <a href="/feed/"><img src="/images/white-feed-icon.png" width="12" height="12" alt="White Feed Icon" /></a>&nbsp;<a href="/feed/">Feed</a>
     </li>

layouts/topphoto.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <%= render '_head' %>
+  <script type="text/javascript">
+    jQuery(function() {
+      // Enable light box
+      $("a[rel^='prettyPhoto']").prettyPhoto({theme: "facebook"});
+    });
+  </script>
+</head>
+<body<%= %Q( class="#{@item[:body_class]}") if @item[:body_class] %>>
+  <%= render '_header' %>
+
+  <img src="<%= @item[:photo] %>" alt="<%= @item[:photo_alt] %>" class="cover-photo" />
+
+  <div id="content">
+    <h1><a href="<%= @item.reps.first.path %>"><%=h @item[:title] %></a></h1>
+    <%= yield %>
+  </div>
+  <%= render '_footer' %>
+</body>
+</html>

layouts/topphoto.yaml

@@ -0,0 +1,2 @@
+--- {}
+