nesta 0.9.0 → 0.9.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.0)
+    nesta (0.9.1)
       RedCloth (= 4.2.2)
       builder (= 2.1.2)
       haml (= 3.0.12)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2010 Graham Ashton
+Copyright (c) 2008-2011 Graham Ashton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/bin/nesta

@@ -15,11 +15,13 @@ GLOBAL OPTIONS
 
 COMMANDS
     new <path>            Create a new Nesta project.
+    demo:content          Install example pages in ./content-demo.
     theme:install <url>   Install a theme from a git repository.
     theme:enable <name>   Make the theme active, updating config.yml.
     theme:create <name>   Makes a template for a new theme in ./themes.
 
 OPTIONS FOR new
+    --git                 Create a new git repository for the project.
     --heroku              Include the heroku:config rake task.
     --vlad                Include config/deploy.rb.
 
@@ -29,6 +31,7 @@ exit 0
 
     def self.parse_command_line
       opts = GetoptLong.new(
+        ['--git', GetoptLong::NO_ARGUMENT],
         ['--help', '-h', GetoptLong::NO_ARGUMENT],
         ['--heroku', GetoptLong::NO_ARGUMENT],
         ['--vlad', GetoptLong::NO_ARGUMENT]
@@ -51,6 +54,8 @@ exit 0
       case command
         when 'new'
           Nesta::Commands::New.new(ARGV[0], options).execute
+        when 'demo:content'
+          Nesta::Commands::Demo::Content.new.execute
         when /^theme:(create|enable|install)$/
           command_cls = Nesta::Commands::Theme.const_get($1.capitalize.to_sym)
           command_cls.new(ARGV[0], options).execute

data/lib/nesta/app.rb

@@ -1,14 +1,16 @@
-require "sinatra/base"
-require "builder"
-require "haml"
-require "sass"
+require 'sinatra/base'
+require 'builder'
+require 'haml'
+require 'sass'
 
+require File.expand_path('nesta', File.dirname(__FILE__))
 require File.expand_path('cache', File.dirname(__FILE__))
 require File.expand_path('config', File.dirname(__FILE__))
 require File.expand_path('models', File.dirname(__FILE__))
+require File.expand_path('navigation', File.dirname(__FILE__))
+require File.expand_path('overrides', File.dirname(__FILE__))
 require File.expand_path('path', File.dirname(__FILE__))
 require File.expand_path('plugins', File.dirname(__FILE__))
-require File.expand_path('overrides', File.dirname(__FILE__))
 
 Nesta::Plugins.load_local_plugins
 
@@ -18,8 +20,10 @@ module Nesta
 
     set :views, File.expand_path('../../views', File.dirname(__FILE__))
     set :cache_enabled, Config.cache
+    set :haml, { :format => :html5 }
 
     helpers Overrides::Renderers
+    helpers Navigation::Renderers
 
     helpers do
       def set_from_config(*variables)
@@ -42,26 +46,6 @@ module Nesta
         end
       end
   
-      def display_menu(menu, options = {})
-        defaults = { :class => nil, :levels => 2 }
-        options = defaults.merge(options)
-        if options[:levels] > 0
-          haml_tag :ul, :class => options[:class] do
-            menu.each do |item|
-              haml_tag :li do
-                if item.respond_to?(:each)
-                  display_menu(item, :levels => (options[:levels] - 1))
-                else
-                  haml_tag :a, :href => item.abspath do
-                    haml_concat item.heading
-                  end
-                end
-              end
-            end
-          end
-        end
-      end
-
       def no_widow(text)
         text.split[0...-1].join(" ") + " #{text.split[-1]}"
       end
@@ -105,11 +89,16 @@ module Nesta
       end
   
       def local_stylesheet?
-        # Checks for the existence of views/local.sass. Useful for
-        # themes that want to give the user the option to add their own
-        # CSS rules.
+        Nesta.deprecated('local_stylesheet?', 'use local_stylesheet_link_tag')
         File.exist?(File.expand_path('views/local.sass', Nesta::App.root))
       end
+
+      def local_stylesheet_link_tag(name)
+        pattern = File.expand_path("views/#{name}.s{a,c}ss", Nesta::App.root)
+        if Dir.glob(pattern).size > 0
+          haml_tag :link, :href => "/css/#{name}.css", :rel => "stylesheet"
+        end
+      end
     end
 
     not_found do
@@ -125,7 +114,7 @@ module Nesta
     # If you want to change Nesta's behaviour, you have two options:
     #
     # 1. Create an app.rb file in your project's root directory.
-    # 2. Make a theme or a plugin, and put all your code in there.
+    # 2. Make a theme or a plugin, and put the relevant code in there.
     #
     # You can add new routes, or modify the behaviour of any of the
     # default objects in app.rb, or replace any of the default view
@@ -161,7 +150,6 @@ module Nesta
       @heading = @title
       @title = "#{@title} - #{@subtitle}"
       @articles = Page.find_articles[0..7]
-      @body_class = 'home'
       cache haml(:index)
     end
 

data/lib/nesta/commands.rb

@@ -28,6 +28,25 @@ module Nesta
       def copy_templates(templates)
         templates.each { |src, dest| copy_template(src, dest) }
       end
+
+      def update_config_yaml(pattern, replacement)
+        configured = false
+        File.open(Nesta::Config.yaml_path, 'r+') do |file|
+          output = ''
+          file.each_line do |line|
+            if configured
+              output << line
+            else
+              output << line.sub(pattern, replacement)
+              configured = true if line =~ pattern
+            end
+          end
+          output << "#{replacement}\n" unless configured
+          file.pos = 0
+          file.print(output)
+          file.truncate(file.pos)
+        end
+      end
     end
 
     class New
@@ -50,6 +69,17 @@ module Nesta
         @options['heroku'] || @options['vlad']
       end
 
+      def create_repository
+        FileUtils.cd(@path) do
+          File.open('.gitignore', 'w') do |file|
+            file.puts %w[._* .*.swp .bundle .DS_Store .sass-cache].join("\n")
+          end
+          system('git', 'init')
+          system('git', 'add', '.')
+          system('git', 'commit', '-m', 'Initial commit')
+        end
+      end
+
       def execute
         make_directories
         templates = {
@@ -62,6 +92,40 @@ module Nesta
           templates['config/deploy.rb'] = "#{@path}/config/deploy.rb"
         end
         copy_templates(templates)
+        create_repository if @options['git']
+      end
+    end
+
+    module Demo
+      class Content
+        include Command
+
+        def initialize
+          @dir = 'content-demo'
+        end
+
+        def clone_or_update_repository
+          repository = 'git://github.com/gma/nesta-demo-content.git'
+          path = Nesta::Path.local(@dir)
+          if File.exist?(path)
+            FileUtils.cd(path) { system('git', 'pull', 'origin', 'master') }
+          else
+            system('git', 'clone', repository, path)
+          end
+        end
+
+        def configure_git_to_ignore_repo
+          excludes = Nesta::Path.local('.git/info/exclude')
+          if File.exist?(excludes) && File.read(excludes).scan(@dir).empty?
+            File.open(excludes, 'a') { |file| file.puts @dir }
+          end
+        end
+
+        def execute
+          clone_or_update_repository
+          configure_git_to_ignore_repo
+          update_config_yaml(/^\s*#?\s*content:.*/, "content: #{@dir}")
+        end
       end
     end
 
@@ -115,19 +179,7 @@ module Nesta
         end
 
         def execute
-          theme_config = /^\s*#?\s*theme:.*/
-          configured = false
-          File.open(Nesta::Config.yaml_path, 'r+') do |file|
-            output = ''
-            file.each_line do |line|
-              output << line.sub(theme_config, "theme: #{@name}")
-              configured = true if line =~ theme_config
-            end
-            output << "theme: #{@name}\n" unless configured
-            file.pos = 0
-            file.print(output)
-            file.truncate(file.pos)
-          end
+          update_config_yaml(/^\s*#?\s*theme:.*/, "theme: #{@name}")
         end
       end
     end

data/lib/nesta/models.rb

@@ -42,14 +42,8 @@ module Nesta
       @@cache = {}
     end
 
-    def self.deprecated(name, message)
-      if Nesta::App.environment != :test
-        $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
-      end
-    end
-
     def self.menu_items
-      deprecated("Page.menu_items", "see Menu.top_level and Menu.for_path")
+      Nesta.deprecated('Page.menu_items', 'see Menu.top_level and Menu.for_path')
       Menu.top_level
     end
 

data/lib/nesta/navigation.rb

@@ -0,0 +1,29 @@
+module Nesta
+  module Navigation
+    module Renderers
+      def display_menu(menu, options = {})
+        defaults = { :class => nil, :levels => 2 }
+        options = defaults.merge(options)
+        if options[:levels] > 0
+          haml_tag :ul, :class => options[:class] do
+            menu.each do |item|
+              display_menu_item(item, options)
+            end
+          end
+        end
+      end
+
+      def display_menu_item(item, options = {})
+        haml_tag :li do
+          if item.respond_to?(:each)
+            display_menu(item, :levels => (options[:levels] - 1))
+          else
+            haml_tag :a, :href => item.abspath do
+              haml_concat item.heading
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/nesta/nesta.rb

@@ -0,0 +1,7 @@
+module Nesta
+  def self.deprecated(name, message)
+    if Nesta::App.environment != :test
+      $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
+    end
+  end
+end

data/lib/nesta/version.rb

@@ -1,3 +1,3 @@
 module Nesta
-  VERSION = "0.9.0"
+  VERSION = '0.9.1'
 end

data/spec/commands_spec.rb

@@ -21,6 +21,10 @@ describe "nesta" do
     File.exist?(project_path(file)).should be_true
   end
 
+  def create_config_yaml(text)
+    File.open(Nesta::Config.yaml_path, 'w') { |f| f.puts(text) }
+  end
+
   describe "new" do
     def gemfile_source
       File.read(project_path('Gemfile'))
@@ -54,6 +58,30 @@ describe "nesta" do
       end
     end
 
+    describe "--git" do
+      before(:each) do
+        @command = Nesta::Commands::New.new(@project_path, 'git' => '')
+        @command.stub!(:system)
+      end
+
+      it "should create a .gitignore file" do
+        @command.execute
+        File.read(project_path('.gitignore')).should match(/\.bundle/)
+      end
+
+      it "should create a git repo" do
+        @command.should_receive(:system).with('git', 'init')
+        @command.execute
+      end
+
+      it "should commit the blank project" do
+        @command.should_receive(:system).with('git', 'add', '.')
+        @command.should_receive(:system)
+            .with('git', 'commit', '-m', 'Initial commit')
+        @command.execute
+      end
+    end
+
     describe "--heroku" do
       before(:each) do
         Nesta::Commands::New.new(@project_path, 'heroku' => '').execute
@@ -93,6 +121,66 @@ describe "nesta" do
     end
   end
 
+  describe "demo:content" do
+    before(:each) do
+      @config_path = project_path('config/config.yml')
+      FileUtils.mkdir_p(File.dirname(@config_path))
+      Nesta::Config.stub!(:yaml_path).and_return(@config_path)
+      create_config_yaml('content: path/to/content')
+      Nesta::App.stub!(:root).and_return(@project_path)
+      @repo_url = 'git://github.com/gma/nesta-demo-content.git'
+      @demo_path = project_path('content-demo')
+      @command = Nesta::Commands::Demo::Content.new
+      @command.stub!(:system)
+    end
+
+    it "should clone the repository" do
+      @command.should_receive(:system)
+          .with('git', 'clone', @repo_url, @demo_path)
+      @command.execute
+    end
+
+    it "should configure the content directory" do
+      @command.execute
+      File.read(@config_path).should match(/^content: content-demo/)
+    end
+
+    describe "when repository already exists" do
+      before(:each) do
+        FileUtils.mkdir_p(@demo_path)
+      end
+
+      it "should update the repository" do
+        @command.should_receive(:system).with('git', 'pull', 'origin', 'master')
+        @command.execute
+      end
+    end
+
+    describe "when site versioned with git" do
+      before(:each) do
+        @exclude_path = project_path('.git/info/exclude')
+        FileUtils.mkdir_p(File.dirname(@exclude_path))
+        File.open(@exclude_path, 'w') { |file| file.puts '# Excludes' }
+      end
+
+      it "should tell git to ignore content-demo" do
+        @command.execute
+        File.read(@exclude_path).should match(/content-demo/)
+      end
+
+      describe "and content-demo already ignored" do
+        before(:each) do
+          File.open(@exclude_path, 'w') { |file| file.puts 'content-demo' }
+        end
+
+        it "shouldn't tell git to ignore it twice" do
+          @command.execute
+          File.read(@exclude_path).scan('content-demo').size.should == 1
+        end
+      end
+    end
+  end
+
   describe "theme:install" do
     before(:each) do
       @repo_url = 'git://github.com/gma/nesta-theme-mine.git'
@@ -151,10 +239,6 @@ describe "nesta" do
       @command = Nesta::Commands::Theme::Enable.new(@name)
     end
 
-    def create_config_yaml(text)
-      File.open(Nesta::Config.yaml_path, 'w') { |f| f.puts(text) }
-    end
-
     shared_examples_for "command that configures the theme" do
       it "should enable the theme" do
         @command.execute

data/spec/page_spec.rb

@@ -112,13 +112,14 @@ describe "The home page" do
   end
   
   it "should display site title in h1 tag" do
-    do_get
-    body.should have_tag('#header p.title', /My blog/)
+    pending "Hpricot doesn't support HTML5"
+    body.should have_tag('hgroup h1', /My blog/)
   end
   
-  it "should display site subtitle in h1 tag" do
+  it "should display site subtitle in heading tag" do
+    pending "Hpricot doesn't support HTML5"
     do_get
-    body.should have_tag('#header p.subtitle', /about stuff/)
+    body.should have_tag('hgroup h2', /about stuff/)
   end
   
   it "should set description meta tag" do
@@ -159,7 +160,7 @@ describe "The home page" do
     
     it "should display link to article in h2 tag" do
       body.should have_tag(
-          "h2 a[@href=#{@article.abspath}]", /^\s*#{@article.heading}$/)
+          "h1 a[@href=#{@article.abspath}]", /^\s*#{@article.heading}$/)
     end
     
     it "should display article summary if available" do
@@ -227,7 +228,7 @@ describe "An article" do
 
   it "should display the date" do
     do_get
-    body.should have_tag("div.date", @date)
+    body.should have_tag("time", @date)
   end
 
   it "should display the content" do
@@ -251,18 +252,19 @@ describe "An article" do
     end
     
     it "should link to each category" do
+      pending "Hpricot doesn't support HTML5"
       do_get
-      body.should have_tag("div.categories", /Categories/)
-      body.should have_tag("div.categories") do |categories|
+      body.should have_tag("nav.categories") do |categories|
         categories.should have_tag("a[@href=/banana]", "Banana")
         categories.should have_tag("a[@href=/the-apple]", "Apple")
       end
     end
 
     it "should link to a category in breadcrumb" do
+      pending "Hpricot doesn't support HTML5"
       do_get
       body.should have_tag(
-          "div.breadcrumb/a[@href=#{@category.abspath}]", @category.heading)
+          "nav.breadcrumb/a[@href=#{@category.abspath}]", @category.heading)
     end
     
     it "should contain category name in page title" do
@@ -342,7 +344,7 @@ describe "A page" do
       it "should display links to articles" do
         do_get
         body.should have_tag(
-            "h3 a[@href='#{@article.abspath}']", /^\s*#{@article.heading}$/)
+            "h1 a[@href='#{@article.abspath}']", /^\s*#{@article.heading}$/)
         body.should_not have_tag("h3", @article2.heading)
       end
     end

data/views/categories.haml

@@ -1,3 +1,4 @@
 - if ! @menu_items.empty?
-  %h2 Articles by category
-  - display_menu(@menu_items, :class => "menu")
+  %nav.categories
+    %h1 Articles by category
+    - display_menu(@menu_items, :class => "menu")

data/views/comments.haml

@@ -1,8 +1,8 @@
 - if short_name = Nesta::Config.disqus_short_name
   #disqus_thread
     - if Sinatra::Application.environment == :development
-      %script{ :type => "text/javascript" }
+      %script(type="text/javascript")
         var disqus_developer = true;
-    %script{ :type => "text/javascript", :src => "http://disqus.com/forums/#{short_name}/embed.js" }
+    %script(type="text/javascript" src="http://disqus.com/forums/#{short_name}/embed.js")
     %noscript
-      %a{ :href => "http://disqus.com/forums/#{short_name}/?url=ref" } View comments.
+      %a(href="http://disqus.com/forums/#{short_name}/?url=ref") View comments.

data/views/error.haml

@@ -1,13 +1,12 @@
-.breadcrumb
-  %a{ :href => "/" } Home
+%nav.breadcrumb
+  %a(href="/") Home
 
 #content
-  %h1 Sorry, something went wrong
+  %section(role="main")
+    %h1 Sorry, something went wrong
 
-  %p
-    An error occurred whilst we were trying to serve your page. Please bear
-    with us, or in the mean time, try another page.
+    %p
+      An error occurred whilst we were trying to serve your page. Please
+      bear with us, or try another page.
 
-#sidebar
-  = haml :categories, :layout => false
-  = haml :feed, :layout => false
+= haml :sidebar, :layout => false

data/views/feed.haml

@@ -1,3 +1,3 @@
 - title ||= "Atom feed"
 .feed
-  %a{ :href => "/articles.xml", :title => title }= title
+  %a(href="/articles.xml" title=title)= title

data/views/footer.haml

@@ -0,0 +1,8 @@
+%footer.branding
+  %p
+    Powered by Nesta, a
+    = succeed "." do
+      %a(href="http://effectif.com/nesta") Ruby CMS
+    Design by
+    = succeed "." do
+      %a(href="http://effectif.com") Graham Ashton

data/views/header.haml

@@ -0,0 +1,4 @@
+%header(role="banner")
+  %hgroup
+    %h1= @heading
+    %h2= @subtitle

data/views/index.haml

@@ -1,5 +1,7 @@
+%nav.breadcrumb Home
+
 #content
-  %h1 Recent articles
-  = haml :summaries, :layout => false, :locals => { :pages => @articles, :heading => :h2 }
+  %section.articles
+    = haml :summaries, :layout => false, :locals => { :pages => @articles }
 
 = haml :sidebar, :layout => false

data/views/layout.haml

@@ -1,27 +1,24 @@
-!!!
-%html{ :lang => "en", "xml:lang" => "en", :xmlns => 'http://www.w3.org/1999/xhtml' }
+<!DOCTYPE html>
+%html(lang="en")
   %head
-    %meta{ "http-equiv" => "content-type", "content" => "text/html; charset=utf-8" }
+    %meta(charset="utf-8")
     - if @description
-      %meta{ "name" => "description", "content" => @description }
+      %meta(name="description" content=@description)
     - if @keywords
-      %meta{ "name" => "keywords", "content" => @keywords }
+      %meta(name="keywords" content=@keywords)
     %title= @title
-    %link{ :href => "/css/master.css", :media => "screen", :rel => "stylesheet", :type => "text/css" }
-    - if local_stylesheet?
-      %link{ :href => "/css/local.css", :media => "screen", :rel => "stylesheet", :type => "text/css" }
-    %link{ :href => "/articles.xml", :rel => "alternate", :type => "application/atom+xml" }
+    <!--[if ! lte IE 6]><!-->
+    %link(href="/css/master.css" media="screen" rel="stylesheet")
+    <!--<![endif]-->
+    /[if lte IE 6]
+      %link(rel="stylesheet" href="http://universal-ie6-css.googlecode.com/files/ie6.1.1.css" media="screen, projection")
+    /[if lt IE 9]
+      %script(src="//html5shim.googlecode.com/svn/trunk/html5.js")
+    = local_stylesheet_link_tag('local')
+    %link(href="/articles.xml" rel="alternate" type="application/atom+xml")
     = haml :analytics, :layout => false
-  %body{ :class => @body_class }
+  %body
     #container
-      #header
-        %p.title= @heading
-        %p.subtitle= @subtitle
+      = haml :header, :layout => false
       = yield
-      #footer
-        %p
-          Powered by
-          = succeed "," do
-            %a{ :href => "http://effectif.com/nesta" } nesta
-          designed by
-          %a{ :href => "http://effectif.com" } Graham Ashton
+      = haml :footer, :layout => false

data/views/master.sass

@@ -1,17 +1,21 @@
+@import "mixins.sass"
+
 // Variables
 
 $content-width: 37em
 
-$tint: #D3D4D8
-$base-color: $tint - #888
-$dark-tint: $tint - #333
-$background-tint: $tint + #222
-$border-color: $tint + #111
+$base-color: #262626
+$background-color: #fff
+$tint: #f1f1f3
+$border-color: #99d
+$link-color: #3F63DA
+$visited-link-color: darken($link-color, 15%)
+$hover-link-color: lighten($link-color, 15%)
+$active-link-color: darken($link-color, 50%)
+$nav-link-color: desaturate($link-color, 55%)
+$meta-color: #999
 
-$h1-scale: 2.18
-$h2-scale: 1.64
-$h3-scale: 1.45
-$h4-scale: 1.18
+$border-style: 1px dashed $border-color
 
 // Reset
 
@@ -21,36 +25,29 @@ $h4-scale: 1.18
 
 // Typography
 
-$base-scale: 0.88
-$base-font: $base-scale * 1em
-$vertical-rhythm: 1.5em
-$base-vertical-margin: 1.5em
-
-@mixin adjust-font-size($scale, $top-weight: 1, $bottom-weight: 1)
-  $average-margin: $base-vertical-margin / $scale
-  margin-top: $average-margin * $top-weight
-  margin-bottom: $average-margin * $bottom-weight
-  
-  $line-height: $vertical-rhythm / $scale
-  @if $line-height < 1
-    line-height: $line-height * 2
-  @else
-    line-height: $line-height
-
-  font-size: 100% * $scale
-
-@mixin border-radius($radius)
-  -webkit-border-radius: $radius
-  -moz-border-radius: $radius
-  border-radius: $radius
+@mixin text-shadow
+  text-shadow: 0 2px 3px #ddd
 
 body
-  font: $base-font "Helvetica Neue", Helvetica, sans-serif
+  font: ($base-font * 1.05) Georgia, serif
   line-height: $vertical-rhythm
   color: $base-color
 
+header[role=banner]
+  h1,
+  h2
+    margin: 0
+    line-height: 1.2em
+    font-weight: normal
+  h1
+    font-size: 327%
+    @include text-shadow
+  h2
+    color: $meta-color
+    font-size: 1em
+
 h1, h2, h3, h4, h5, h6
-  font-family: "Helvetica Neue", Helvetica, sans-serif
+  font-family: Georgia, serif
 h1
   @include adjust-font-size($h1-scale, 0.6, 0.4)
   font-weight: normal
@@ -75,10 +72,10 @@ li
 
 blockquote
   margin: $base-vertical-margin 0
-  border-left: 0.5em solid $tint
-  padding-left: 1em
+  padding: 0 $base-vertical-margin
   
   font-style: italic
+  color: $base-color + #555
   
 pre
   padding: ($vertical-rhythm / 2) 1em
@@ -89,31 +86,36 @@ img
 
 // Layout
 
+article, aside, footer, header, nav, section
+  display: block
+
 div#container
   width: 54em
   margin: 0 auto
+  padding: 1em 1em 0 1em
 
-  div#header
-    padding: 1em
-  
-  div.breadcrumb
-    padding: 0.5em 1.1em
+  nav.breadcrumb
+    margin-top: $vertical-rhythm
+    color: $meta-color
+    padding: 0.5em 0
     
     font-size: 0.909em
   
   div#content
+    position: relative
     width: $content-width
     float: left
-    padding: 1px 1em
+    padding: 1px 0
 
   div#sidebar
     width: 12em
     margin-left: 40em
     padding: 1px 1em
   
-  div#footer
+  footer.branding
     clear: both
-    padding: 0 1em
+    color: $meta-color
+    @include adjust-font-size($base-scale)
     p
       width: $content-width
       margin: 0
@@ -121,118 +123,110 @@ div#container
 
 // The visuals
 
-@mixin dark-tint-text
-  color: $dark-tint
-  text-shadow: 0 -1px 1px white
+a
+  border-bottom: 1px dotted $link-color
+  text-decoration: none
+  color: $link-color
+  @include transition(color 0.25s 0 ease)
+  &:visited
+    color: $visited-link-color
+    border-bottom-color: $visited-link-color
+  &:hover
+    color: $hover-link-color
+    border-bottom-color: $hover-link-color
+  &:active
+    color: $active-link-color
+    border-bottom-color: $active-link-color
+
+nav.categories,
+div.feed,
+article p.meta
+  a
+    color: $nav-link-color
+    border-bottom-color: $background-color
+  &:hover a
+    color: $link-color
+  a:hover
+    color: $hover-link-color
+
+article p.meta
+  a
+    @include transition(border-bottom-color 0.5s 0 ease)
+  a:hover
+    border-bottom-color: $hover-link-color
+
+article h1 a
+  border-bottom: none
 
 body
-  background: $background-tint
-  
-  &.home h1
-    @include adjust-font-size($h1-scale, 1, -1)
-
-div#header
-  p.title,
-  p.subtitle
-    margin: 0
-    line-height: 1.2em
-    font-weight: normal
-  p.title
-    font-size: 327%
-    text-shadow: -1px 2px 1px $tint
-  p.subtitle
-    font-size: 1em
-    @include dark-tint-text
-
-div#content
-  position: relative
-  @include border-radius(0.5em)
-  background-color: white
-
-  div.date
-    position: absolute
-    right: 40em
-    top: $vertical-rhythm * 3
-    text-align: right
-    @include dark-tint-text
-  
-  h2
-    background: $background-tint - #111
-    margin-left: (-2em / $h2-scale) * $base-scale
-    margin-right: 0
-    padding-left: 1em
-    padding-right: 1em
-    
-    text-shadow: 0 1px 0 $tint + #333
+  background: $background-color
   
-  ol,
-  ul
-    margin-left: 1.5em
-
+article
   img
     max-width: 100%
     margin-bottom: $base-vertical-margin
 
   code,
   pre
-    background-color: $background-tint
+    background-color: $tint
   code
     padding: 1px 3px
   pre
-    border-left: 0.4em solid $border-color
+    border-left: $border-style
+    background-color: $tint
     code
       padding: 0
 
-  // Pages/articles assigned to this page
-  ol.pages
-    margin-left: 0
-    li
-      position: relative
-
-      margin-left: -1.5em
-      padding-left: 1.5em
-      background-color: rgba(255, 255, 255, 0.8)
-
-      list-style: none
-
-      h2
-        margin-left: 0
-        margin-right: 0
-        padding: 0
-        background: none
+  footer
+    border-top: $border-style
+    p.meta
+      @include adjust-font-size(0.909, 0.1, 1.9)
+      font-style: italic
+      color: $meta-color
 
-      div.date
-        top: $vertical-rhythm * 2.5
-        right: 39em
-      h3 + div.date
-        top: $vertical-rhythm * 1.5
+// Pages of content
+article[role="main"]
+  h1, h2
+    @include text-shadow
 
-  p.read_more
-    @include adjust-font-size(0.909, 0, 0)
-  
-  div.categories
-    margin-left: -1em
-    margin-right: -1em
-    border-top: 1px solid $background-tint - #0a0a0a
-    padding: 0.5em 1em
-    background: $background-tint
-    a
-      margin-right: 0.25em
-  
   div#disqus_thread
     img
       max-width: none
     ul#dsq-comments
       margin-left: 0
   
-div#sidebar
-  @include border-radius(0.5em)
-  background-color: white
-  background-color: rgba(255, 255, 255, 0.9)
-  
-  h2
-    @include adjust-font-size(1, 1.4, 0.6)
-    font-weight: bold
+// Pages/articles assigned to this page
+section.pages,
+section.articles
+  & > ol
+    margin-left: 0
+    li
+      position: relative
+      list-style: none
+    article
+      ol li
+        list-style: decimal
+      ul li
+        list-style: disc
+
+  header[role=main] h1
+    @include adjust-font-size($h1-scale, 1.5, 0.5)
+  header h1
+    @include adjust-font-size($h2-scale, 1.5, 0.5)
+
+  article
+    h1
+      text-shadow: none
+    p.read_more
+      @include adjust-font-size(1, 0, 0)
+      margin-top: -$base-vertical-margin
+    footer
+      border-top: none
+
+nav.categories
+  h1
+    @include adjust-font-size(1, 2, 0)
+
   ul.menu
     list-style: none
     ul
@@ -241,6 +235,5 @@ div#sidebar
     & > ul
       @include adjust-font-size(0.909, 0, 0)
 
-  div.feed,
-  div.social
-    margin: $base-vertical-margin 0
+div.feed
+  margin: $base-vertical-margin 0

data/views/mixins.sass

@@ -0,0 +1,39 @@
+// Default ratios between font sizes; used to maintain the type hierarchy.
+// http://www.markboulton.co.uk/journal/comments/five-simple-steps-to-better-typography-part-4
+
+$h1-scale: 2.18
+$h2-scale: 1.64
+$h3-scale: 1.45
+$h4-scale: 1.18
+
+// Variables used in calculations used to maintain vertical rhythm.
+// http://webtypography.net/Rhythm_and_Proportion/Vertical_Motion/2.2.2/
+
+$base-scale: 0.88
+$base-font: $base-scale * 1em
+$vertical-rhythm: 1.75em
+$base-vertical-margin: 1.75em
+
+@mixin adjust-font-size($scale, $top-weight: 1, $bottom-weight: 1)
+  $average-margin: $base-vertical-margin / $scale
+  margin-top: $average-margin * $top-weight
+  margin-bottom: $average-margin * $bottom-weight
+  
+  $line-height: $vertical-rhythm / $scale
+  @if $line-height < 1
+    line-height: $line-height * 2
+  @else
+    line-height: $line-height
+
+  font-size: 100% * $scale
+
+@mixin border-radius($radius)
+  -webkit-border-radius: $radius
+  -moz-border-radius: $radius
+  border-radius: $radius
+
+@mixin transition($definition)
+  -moz-transition: $definition
+  -o-transition: $definition
+  -webkit-transition: $definition
+  transition: $definition

data/views/not_found.haml

@@ -1,13 +1,12 @@
-.breadcrumb
-  %a{ :href => "/" } Home
+%nav.breadcrumb
+  %a(href="/") Home
 
 #content
-  %h1 Page not found
+  %section(role="main")
+    %h1 Page not found
 
-  %p
-    Please try another page or, if you think something is wrong with our site,
-    do get in touch and let us know.
+    %p
+      Please try another page or, if you think something is wrong with
+      our site, do get in touch and let us know.
 
-#sidebar
-  = haml :categories, :layout => false
-  = haml :feed, :layout => false
+= haml :sidebar, :layout => false

data/views/page.haml

@@ -1,28 +1,25 @@
-.breadcrumb
-  %a{ :href => "/" } Home
+%nav.breadcrumb
+  %a(href="/") Home
   >
   - if @page.parent
-    %a{ :href => @page.parent.abspath }= @page.parent.heading
+    %a(href="#{@page.parent.abspath}")= @page.parent.heading
     >
   = @page.heading
 
 #content
-  - if @page.date
-    .date= format_date(@page.date)
+  %article(role="main")
+    ~ @page.to_html(self)
 
-  ~ @page.to_html(self)
+    %section.pages
+      = haml :summaries, :layout => false, :locals => { :pages => @page.pages }
 
-  = haml :summaries, :layout => false, :locals => { :pages => @page.pages, :heading => :h3 }
+    - unless @page.articles.empty?
+      %section.articles
+        %header
+          %h1= "Articles on #{@page.heading}"
+        = haml :summaries, :layout => false, :locals => { :pages => @page.articles, :heading => :h3 }
 
-  - unless @page.articles.empty?
-    %h2= "Articles on #{@page.heading}"
-    = haml :summaries, :layout => false, :locals => { :pages => @page.articles, :heading => :h3 }
-
-  - unless @page.categories.empty?
-    .categories
-      %strong Categories:
-      - @page.categories.each do |category|
-        %a{ :href => category.abspath }= category.heading
+    = haml :page_meta, :layout => false, :locals => { :page => @page }
 
   = haml :comments, :layout => false
 

data/views/page_meta.haml

@@ -0,0 +1,16 @@
+- if page.date
+  %footer
+    %p.meta
+      Published
+      - if page.date
+        on
+        %time(datetime="#{page.date.to_s}" pubdate=true)= format_date(page.date)
+      - if (! page.categories.empty?)
+        in
+        - page.categories.each do |category|
+          - if category != page.categories[-1]
+            = succeed ',' do
+              %a(href="#{category.abspath}")= category.heading
+          - else
+            %a(href="#{category.abspath}")= category.heading
+

data/views/summaries.haml

@@ -1,14 +1,15 @@
 - unless pages.empty?
-  %ol.pages
+  %ol
     - pages.each do |page|
       %li
-        - haml_tag heading do
-          %a{ :href => page.abspath }= page.heading
-        - if page.date
-          .date= format_date(page.date)
-        - if page.summary.nil? || page.summary.empty?
-          ~ page.body
-        - else
-          ~ page.summary
-          %p.read_more
-            %a{ :href => page.abspath }= page.read_more
+        %article
+          %header
+            %h1
+              %a(href="#{page.abspath}")= page.heading
+          - if page.summary.nil? || page.summary.empty?
+            ~ page.body
+          - else
+            ~ page.summary
+            %p.read_more
+              %a(href="#{page.abspath}")= page.read_more
+          = haml :page_meta, :layout => false, :locals => { :page => page }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Graham Ashton
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +00:00
+date: 2010-12-31 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -217,6 +217,7 @@ files:
 - lib/nesta/commands.rb
 - lib/nesta/config.rb
 - lib/nesta/models.rb
+- lib/nesta/navigation.rb
 - lib/nesta/nesta.rb
 - lib/nesta/overrides.rb
 - lib/nesta/path.rb
@@ -246,11 +247,15 @@ files:
 - views/comments.haml
 - views/error.haml
 - views/feed.haml
+- views/footer.haml
+- views/header.haml
 - views/index.haml
 - views/layout.haml
 - views/master.sass
+- views/mixins.sass
 - views/not_found.haml
 - views/page.haml
+- views/page_meta.haml
 - views/sidebar.haml
 - views/sitemap.builder
 - views/summaries.haml
@@ -268,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4334237335545750937
+      hash: 3521966817245856409
       segments: 
       - 0
       version: "0"
@@ -277,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4334237335545750937
+      hash: 3521966817245856409
       segments: 
       - 0
       version: "0"