diff --git a/Rules b/Rules index b63eb1a..3777a39 100644 --- a/Rules +++ b/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 diff --git a/content/about.html b/content/about.html index 6075c01..b7cc3de 100644 --- a/content/about.html +++ b/content/about.html @@ -1,16 +1,17 @@ -Me --- -
- Photo of Wesley Moore -

WezM.net is Wesley Moore’s personal - home page, a programmer from Melbourne Australia. Here you will find posts - about various projects I'm working on, useful tips I've discovered as - well as some random posts about other things going on in my life.

+

WezM.net is Wesley Moore’s personal home page. I + live in Melbourne Australia and work as a sofware developer. Here you will find posts about projects I'm working on, useful tips I've + discovered as well as other events from my life.

+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: //]]> -
  • App.net – https://alpha.app.net/wezm
    • -
  • Twitter – http://twitter.com/wezm
  • Facebook – http://www.facebook.com/wjmoore
    • +
  • Flickr – http://www.flickr.com/photos/wezm/
  • GitHub – https://github.com/wezm
    • +
  • SoundCloud – https://soundcloud.com/wezm
  • StackOverflow – http://stackoverflow.com/users/38820/wes
    • +
  • Twitter – http://twitter.com/wezm
    • -This Site ---------- +Credits +------- -This site is written in [Markdown][markdown] and [SASS][sass], generated using -[nanoc][nanoc], enhanced with [jQuery][jquery] and hosted on VPS running -[Debian GNU/Linux][debian] and [nginx][nginx]. It makes use of the following -resources made available freely by their authors: +This site 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 ƒ/1.8 USM -* Canon EFS 18-55mm ƒ/3.5–5.6 -* Canon EF 75-300mm ƒ/4–5.6 - [nanoc]: http://nanoc.stoneship.org/ [markdown]: http://daringfireball.net/projects/markdown/ [nginx]: http://nginx.org/ diff --git a/content/about.yaml b/content/about.yaml index 8f72c47..ab54efd 100644 --- a/content/about.yaml +++ b/content/about.yaml @@ -1,2 +1,4 @@ --- title: About +photo: /images/Photo%20of%20Wesley%20Moore.jpg +photo_alt: Photo of Wesley Moore diff --git a/content/projects.html b/content/projects.html index 82a8610..1e7c402 100644 --- a/content/projects.html +++ b/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 - -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 added support for [SQLite][sqlite] logging to [my fork][open2300fork] of the -[Open2300][open2300] project. The weather station is connected to my Mac. -Every 5 minutes it logs the current conditions, uploads them to my server and -invokes a [lua program][weather-tools] to generate a [JSON][json] file, -which is used to produce the [Weather page][weather]. +I previously had a weather station at my home for keeping track of the local +conditions. I added support for [SQLite][sqlite] logging to [my +fork][open2300fork] of the [Open2300][open2300] project. The weather station +was connected to a Mac for data logging. Every 5 minutes it logged the current +conditions, uploaded them to my server and invoked a [lua +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 diff --git a/content/screen.sass b/content/screen.sass index 47b4c9d..b8ea666 100644 --- a/content/screen.sass +++ b/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 diff --git a/layouts/_header.html b/layouts/_header.html index a73750f..6680668 100644 --- a/layouts/_header.html +++ b/layouts/_header.html @@ -5,7 +5,6 @@
  • Articles
  • About
  • Projects
    • -
  • Weather
  • White Feed Icon Feed
    • diff --git a/layouts/topphoto.html b/layouts/topphoto.html new file mode 100644 index 0000000..20e3ee9 --- /dev/null +++ b/layouts/topphoto.html @@ -0,0 +1,23 @@ + + + + <%= render '_head' %> + + +> + <%= render '_header' %> + + <%= @item[:photo_alt] %> + +
    +

    <%=h @item[:title] %>

    + <%= yield %> +
    + <%= render '_footer' %> + + diff --git a/layouts/topphoto.yaml b/layouts/topphoto.yaml new file mode 100644 index 0000000..20670d5 --- /dev/null +++ b/layouts/topphoto.yaml @@ -0,0 +1,2 @@ +--- {} + diff --git a/output/images/Photo of Wesley Moore.jpg b/output/images/Photo of Wesley Moore.jpg index 0b749bc..b55b974 100644 Binary files a/output/images/Photo of Wesley Moore.jpg and b/output/images/Photo of Wesley Moore.jpg differ