Move search to headline; refactor title

content/about.haml

@@ -1,8 +1,6 @@
 ---
-title: About
+title: About Ariejan
 ---
-.headline
-  %h2 About Ariejan
 .content_wrap.nobg
   %section#middle_content
     .two_third

content/craftsmanship.haml

@@ -1,8 +1,6 @@
 ---
-title: Craftsmanship
+title: Software Craftsmanship
 ---
-.headline
-  %h2 Software Craftsmanship
 .content_wrap.nobg
   %section#middle_content
     :markdown

content/index.haml

@@ -1,8 +1,6 @@
 ---
-title: Home
+title: Ariejan's Blog
 ---
-.headline
-  %h2 Ariejan's Blog
 .content_wrap.nobg
   %section#middle_content
 

content/projects.haml

@@ -5,13 +5,13 @@ title: Projects
   %section#middle_content
     .two_third
       :markdown
-        ## Open Source Projects
+        ### Open Source Projects
 
         This is an incomplete list of projects I've been working on in the recent pasts.
         There are several projects that I've worked on, but long since abandoned because
         they became obsolete and were superseded by other alternatives.
 
-        ### Focal
+        #### Focal
 
         Focal is a utility web application that creates sexy and informative burndowns
         for you and your team.
@@ -31,7 +31,7 @@ title: Projects
 
         * [Github](https://github.com/ariejan/imdb)
 
-        ### Firefly
+        #### Firefly
 
         At the height of 140 character limited tweets, URL shortners where the hippest
         thing around.
@@ -42,13 +42,13 @@ title: Projects
         * [Website](http://fireflyrb.com)
         * [Github](https://github.com/ariejan/firefly)
 
-        ### PostcodeAPI
+        #### PostcodeAPI
 
         A simple ruby wrapper around the [Postcode API service](http://www.postcodeapi.nu/).
 
         * [Github](https://github.com/ariejan/postcodeapi)
 
-        ### elfproef
+        #### elfproef
 
         The 11-check is a checksum algorithm used to validate Dutch bank account numbers and
         social security numbers.
@@ -59,7 +59,7 @@ title: Projects
 
     .one-third.last
       :markdown
-        ## Open Source contributions
+        ### Open Source contributions
 
         Besides doing my own projects, I've also contributed to a wide variety of open
         source projects. Mostly to scratch my own itch with that project.

content/talks.haml

@@ -1,8 +1,6 @@
 ---
-title: Talks
+title: Talks by Ariejan
 ---
-.headline
-  %h2 Talks by Ariejan
 .content_wrap.nobg
   %section#middle_content
     :markdown

layouts/default.haml

@@ -28,7 +28,7 @@
 
     %script{:src => "/js/application.js", :type => "text/javascript"}
 
-    %title ariejan.net
+    %title= "#{@item[:title]} — ariejan.net"
   %body
     / __________________________________________________ Start Page
     %section#page
@@ -55,6 +55,18 @@
         / __________________________________________________ Finish Header
         / __________________________________________________ Start Middle
         %section#middle
+          .headline
+            .three_fourth
+              %h2= @item[:title]
+
+            .one_fourth.last
+              .search-box
+                %form{action: "http://www.google.com/cse", id: "cse-search-box"}
+                  %input{type: "hidden", name: "cx", value: "011455777682120765364:szqyrcy79dw"}
+                  %input{type: "hidden", name: "ie", value: "UTF-8"}
+                  %input#google-search-box{name: "q", placeholder: "Search site", type: "search"}/
+            .cl
+
           = yield
         / __________________________________________________ Finish Middle
     / __________________________________________________ Finish Page

layouts/post.haml

@@ -1,15 +1,3 @@
-.headline
-  .three_fourth
-    %h2= item[:title]
-
-  .one_fourth.last
-    .search-box
-      %form{action: "http://www.google.com/cse", id: "cse-search-box"}
-        %input{type: "hidden", name: "cx", value: "011455777682120765364:szqyrcy79dw"}
-        %input{type: "hidden", name: "ie", value: "UTF-8"}
-        %input#google-search-box{name: "q", placeholder: "Search site", type: "search"}/
-  .cl
-
 .content_wrap
   .post
     %section#content