21 files changed, 118 insertions, 81 deletions

diff --git a/source/_includes/article.html b/source/_includes/article.html
new file mode 100644
index 00000000..aa7f8194
--- /dev/null
+++ b/source/_includes/article.html
@@ -0,0 +1,18 @@
+<header>
+  <p>
+    <time>{{ page.date | ordinalize }}</time>
+    {% if site.author or site.author == page.author %}
+      <span class="byline"><em>by</em> <span class="author">{{ site.author }}</span></span>
+    {% elsif page.author %}
+      <span class="byline"><em>by</em> <span class="author">{{ page.author }}</span></span>
+    {% endif %}
+  </p>
+  <h1><a href="{{ page.url }}">{{ page.title }}</a></h1>
+</header>
+{% if index %}
+<div class="entry">{{ content | exerpt(content, page.url, 'Continue reading &raquo;') | smart_quotes }}</div>
+{% else %}
+<div class="entry">{{ content | smart_quotes }}</div>
+{% endif %}
+
+{% if page.updated %}<p class="updated"><em>updated</em> <time>{{ page.updated | ordinalize }}</time></p>{% endif %}
diff --git a/source/_includes/delicious.haml b/source/_includes/delicious.haml
deleted file mode 100644
index 6f1d63d0..00000000
--- a/source/_includes/delicious.haml
+++ /dev/null
@@ -1,3 +0,0 @@
-%h4 My Delicious <a class="small" href="http://delicious.com/#{page.delicious_user}">more &rarr;</a>
-#delicious
-  %script(type="text/javascript" src="http://feeds.delicious.com/v2/js/#{page.delicious_user}?title=&count=#{page.delicious_count}&sort=date&extended")
\ No newline at end of file
diff --git a/source/_includes/delicious.html b/source/_includes/delicious.html
new file mode 100644
index 00000000..8e97b0fd
--- /dev/null
+++ b/source/_includes/delicious.html
@@ -0,0 +1,3 @@
+<h4>On Delicious</h4>
+<script type="text/javascript" src="http://feeds.delicious.com/v2/js/{{ site.delicious_user }}?title=&count={{ site.delicious_count }}&sort=date&extended"></script>
+<p><a href="http://delicious.com/{{ site.delicious_user }}">My Delicious Bookmarks &raquo;</a></p>
diff --git a/source/_includes/disqus_hook.haml b/source/_includes/disqus_hook.haml
deleted file mode 100644
index 60e2d3d9..00000000
--- a/source/_includes/disqus_hook.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-:javascript
-  (function() {
-      var links = document.getElementsByTagName('a');
-      var query = '?';
-      for(var i = 0; i < links.length; i++) {
-        if(links[i].href.indexOf('#disqus_thread') >= 0) {
-          query += 'url' + i + '=' + encodeURIComponent(links[i].href) + '&';
-        }
-      }
-      document.write('<script charset="utf-8" type="text/javascript" src="http://disqus.com/forums/#{page.disqus_short_name}/get_num_replies.js' + query + '"></' + 'script>');
-    })();
\ No newline at end of file
diff --git a/source/_includes/disqus_thread.haml b/source/_includes/disqus_thread.haml
deleted file mode 100644
index ea7b9a34..00000000
--- a/source/_includes/disqus_thread.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-:javascript
-  var disqus_url = "#{page.full_url}#{page.url}";
-%noscript
-  %a(href="http://#{page.disqus_short_name}.disqus.com/?url=ref") View the discussion thread
-%script(type="text/javascript" src="http://disqus.com/forums/#{page.disqus_short_name}/embed.js")
\ No newline at end of file
diff --git a/source/_includes/disqus_thread.html b/source/_includes/disqus_thread.html
new file mode 100644
index 00000000..036b9d7b
--- /dev/null
+++ b/source/_includes/disqus_thread.html
@@ -0,0 +1,7 @@
+<script type="text/javascript">
+  var disqus_url = "{{ site.url }}{{ page.url }}";
+</script>
+<noscript>
+  <a href="http://{{ site.disqus_short_name }}.disqus.com/?url=ref">View the discussion thread</a>
+</noscript>
+<script type="text/javascript" src="http://disqus.com/forums/{{ site.disqus_short_name }}/embed.js"></script>
diff --git a/source/_includes/footer.haml b/source/_includes/footer.haml
deleted file mode 100644
index 99870db8..00000000
--- a/source/_includes/footer.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-#footer
-  .content
-    Copyright &copy; #{Time.now.strftime('%Y')} - #{page.blog_title} -
-    %span.credit Powered by <a href="http://octopress.org">Octopress</a>
-
-= include "disqus_hook.haml" if page.respond_to?(:disqus_short_name) && page.disqus_short_name
-= include "google_analytics.haml" if page.respond_to?(:google_analytics_tracking_id) && page.google_analytics_tracking_id
\ No newline at end of file
diff --git a/source/_includes/footer.html b/source/_includes/footer.html
new file mode 100644
index 00000000..de560edc
--- /dev/null
+++ b/source/_includes/footer.html
@@ -0,0 +1,11 @@
+<p>
+  Copyright &copy; {{ site.time | date: "%Y" }} - {{ site.author }} -
+  <span class="credit">Powered by <a href="http://octopress.org">Octopress</a></span>
+</p>
+{% if site.pinboard_user %}
+  <script language="javascript">
+    var pinboard_user = "{{ site.pinboard_user }}";
+    var pinboard_count = "{{ site.pinboard_count }}";
+  </script>
+  <script language="javascript" src="/javascripts/pinboard.js"></script>
+{% endif %}
diff --git a/source/_includes/google_analytics.haml b/source/_includes/google_analytics.html
index a61ec89b..b659a634 100644
--- a/source/_includes/google_analytics.haml
+++ b/source/_includes/google_analytics.html
@@ -1,4 +1,5 @@
-:javascript
+<script src="http://www.google-analytics.com/ga.js" type="text/javascript"></script>
+<script type="text/javascript">
   var _gaq = _gaq || [];
   _gaq.push(['_setAccount', '#{page.google_analytics_tracking_id}']);
   _gaq.push(['_trackPageview']);
@@ -7,4 +8,5 @@
     var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
     ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
     (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(ga);
-  })();
\ No newline at end of file
+  })();
+</script>
diff --git a/source/_includes/head.haml b/source/_includes/head.haml
deleted file mode 100644
index 75b652c8..00000000
--- a/source/_includes/head.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-%head
-  %title #{page.blog_title} :: #{page.title}
-  %meta(http-equiv="Content-Type" content="text/html; charset=utf-8")
-  - if page.respond_to? :description
-    %meta(name="description" content="#{page.description}")/
-  - if page.respond_to? :keywords
-    %meta(name="keywords" content="#{page.keywords}")/
-  %link(href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css")
-  %script(src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.4/mootools-yui-compressed.js" type="text/javascript")
-  %script(src="/javascripts/mootools-1.2.4.2-more.js" type="text/javascript")
-  - if page.respond_to? :twitter_user
-    :javascript
-      var twitter_user = "#{page.twitter_user}"
-      var show_replies = #{page.show_replies};
-      var tweet_count = #{page.tweet_count};
-    %script(src="/javascripts/octopress.js" type="text/javascript")
-    %script(src="/javascripts/twitter.js" type="text/javascript")
-  - if page.respond_to? :google_analytics
-    %script(src="http://www.google-analytics.com/ga.js" type="text/javascript")
-
-  - # RSS Feed  
-  %link(href="/atom.xml" rel="alternate" title="#{page.blog_title}" type="application/atom+xml")
\ No newline at end of file
diff --git a/source/_includes/head.html b/source/_includes/head.html
new file mode 100644
index 00000000..4a3fb31c
--- /dev/null
+++ b/source/_includes/head.html
@@ -0,0 +1,28 @@
+<head>
+  <title>{{page.title}} - {{site.title}}</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  {% if page.description %}
+    <meta name="description" content="{{page.description}}"/>
+  {% endif %}
+  {% if page.keywords %}
+    <meta name="keywords" content="{{page.keywords}}"/>
+  {% endif %}
+  <link href="/stylesheets/screen.css" media="screen, projection" rel="stylesheet" type="text/css">
+  <script src="/javascripts/mootools-yui-compressed.js" type="text/javascript"></script>
+  <script src="/javascripts/mootools-more-1.3.1.1.js" type="text/javascript"></script>
+  <script src="/javascripts/octopress.js" type="text/javascript"></script>
+  <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+  <meta name="viewport" content="initial-scale=1.0 width=device-width">
+  {% if site.twitter_user %}
+    <script>
+      var twitter_user = "{{site.twitter_user}}";
+      var show_replies = {{site.show_replies}};
+      var tweet_count = {{site.tweet_count}};
+    </script>
+    <script src="/javascripts/twitter.js" type="text/javascript"></script>
+  {% endif %}
+  {% if site.google_analytics_tracking_id %}
+    {% include google_analytics.html %}
+  {% endif %}
+  <link href="/atom.xml" rel="alternate" title="{{site.title}}" type="application/atom+xml"/>
+</head>
diff --git a/source/_includes/header.haml b/source/_includes/header.haml
deleted file mode 100644
index f4b821f9..00000000
--- a/source/_includes/header.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-.content
-  %h1
-    %a.title(href="/")=page.blog_title
-  - if page.respond_to?(:google_custom_search_id) && page.google_custom_search_id
-    #search
-      %form(action="http://www.google.com/cse" id="cse-search-box")
-        %input(type="hidden" name="cx" value="#{page.google_custom_search_id}")
-        %input(type="hidden" name="ie" value="UTF-8")
-        %input#q(type="text" name="q")
\ No newline at end of file
diff --git a/source/_includes/header.html b/source/_includes/header.html
new file mode 100644
index 00000000..4c35d0b8
--- /dev/null
+++ b/source/_includes/header.html
@@ -0,0 +1,10 @@
+<h1><a href="/">{{ site.title }}</a></h1>
+{% if site.google_custom_search_id && site.google_custom_search_id %}
+  <div id="search">
+    <form action="http://www.google.com/cse" id="cse-search-box">
+      <input type="hidden" name="cx" value="{{ site.google_custom_search_id }}">
+      <input type="hidden" name="ie" value="UTF-8">
+      <input#q type="text" name="q">
+    </form>
+  </div>
+{% endif %}
diff --git a/source/_includes/navigation.haml b/source/_includes/navigation.haml
deleted file mode 100644
index 8ee0bfe9..00000000
--- a/source/_includes/navigation.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-.content
-  %ul
-    %li.alpha
-      %a(href="/") Blog
-    %li.omega
-      %a(href="/about.html") About
-    %li.subscribe
-      %a(href="/atom.xml") Subscribe
\ No newline at end of file
diff --git a/source/_includes/navigation.html b/source/_includes/navigation.html
new file mode 100644
index 00000000..97d95938
--- /dev/null
+++ b/source/_includes/navigation.html
@@ -0,0 +1,5 @@
+<ul>
+  <li><a href="/">Blog</a></li>
+  <li><a href="/about/">About</a></li>
+  <li class="subscribe"><a href="/atom.xml">Subscribe</a></li>
+</ul>
diff --git a/source/_includes/pinboard.html b/source/_includes/pinboard.html
new file mode 100644
index 00000000..602645c5
--- /dev/null
+++ b/source/_includes/pinboard.html
@@ -0,0 +1,3 @@
+<h4>My Pinboard</h4>
+<ul id="pinboard_linkroll">Fetching linkroll...</ul>
+<p><a href="http://pinboard.in/u:{{ site.pinboard_user }}">My Pinboard Bookmarks &raquo;</a></p>
diff --git a/source/_includes/post.haml b/source/_includes/post.haml
deleted file mode 100644
index b51b99f5..00000000
--- a/source/_includes/post.haml
+++ /dev/null
@@ -1,8 +0,0 @@
-.article
-  %h2= page.title
-  .meta
-    - author = (page.respond_to?(:author) && page.author) ? 'by: ' + page.author + ' |' : ''
-    #{author} posted: #{page.date.strftime("%B #{page.date.day.ordinalize}, %Y")}
-    = (page.respond_to?(:updated) && page.updated) ? " | updated: #{page.updated}" : ''
-  = preserve rp(content)
-  #disqus_thread= include "disqus_thread.haml" if page.respond_to?(:disqus_short_name) && page.disqus_short_name
diff --git a/source/_includes/sidebar.haml b/source/_includes/sidebar.haml
deleted file mode 100644
index 463e353f..00000000
--- a/source/_includes/sidebar.haml
+++ /dev/null
@@ -1,2 +0,0 @@
-= include "twitter.haml" if page.respond_to?(:twitter_user) && page.twitter_user
-= include "delicious.haml" if page.respond_to?(:delicious_user) && page.delicious_user
\ No newline at end of file
diff --git a/source/_includes/sidebar.html b/source/_includes/sidebar.html
new file mode 100644
index 00000000..86f659b5
--- /dev/null
+++ b/source/_includes/sidebar.html
@@ -0,0 +1,24 @@
+<h4>About Me</h4>
+<p> Yo everybody! </p>
+{% if site.recent_posts %}
+<section>
+  <h4>Recent Posts</h4>
+  <ul id="recent_posts">
+    {% for post in site.posts limit: site.recent_posts %}
+      <li class="post">
+        <a href="{{ post.url }}">{{ post.title }}</a>
+        <time>{{ post.date | date: "%B %d, %Y" }}</time>
+      </li>
+    {% endfor %}
+  </ul>
+  </section>
+{% endif %}
+{% if site.twitter_user %}
+  <section>{% include twitter.html %}</section>
+{% endif %}
+{% if site.delicious_user %}
+  <section>{% include delicious.html %}</section>
+{% endif %}
+{% if site.pinboard_user %}
+  <section>{% include pinboard.html %}</section>
+{% endif %}
diff --git a/source/_includes/twitter.haml b/source/_includes/twitter.haml
deleted file mode 100644
index 852bb068..00000000
--- a/source/_includes/twitter.haml
+++ /dev/null
@@ -1,4 +0,0 @@
-%h4 Twitter <a class="small" href="http://twitter.com/#{page.twitter_user}">@#{page.twitter_user}</a>
-#twitter
-  %ul#twitter_status
-    Status updating...
\ No newline at end of file
diff --git a/source/_includes/twitter.html b/source/_includes/twitter.html
new file mode 100644
index 00000000..4d688480
--- /dev/null
+++ b/source/_includes/twitter.html
@@ -0,0 +1,5 @@
+<h4>On Twitter</h4>
+<ul id="tweets">
+  Status updating...
+</ul>
+<p>Follow <a href="http://twitter.com/#{page.twitter_user}">@{{ site.twitter_user }}</a></p>