use nested layouts for rendering changes blog

technoweenie · technoweenie · commit 96a419bea6bd · 2012-09-04T17:13:13.000-06:00
diff --git a/Rules b/Rules
@@ -16,6 +16,15 @@ end
 compile '/CNAME/' do
 end
 
+compile '/changes/*/' do
+  filter :erb
+  filter :kramdown
+  filter :colorize_syntax,
+    :colorizers => {:javascript => :pygmentsrb}
+  layout 'changes'
+  layout 'default'
+end
+
 compile '*' do
   filter :erb
   filter :kramdown
diff --git a/content/changes/2012-9-5-watcher-api.html b/content/changes/2012-9-5-watcher-api.html
@@ -2,11 +2,9 @@
 kind: article
 title: Upcoming Changes to Watcher and Star APIs
 created_at: 2012-9-5
-author: technoweenie
+author_name: technoweenie
 ---
 
-<%= render '_meta', :item => @item %>
-
 We recently [changed the Watcher behavior][change-watching] on GitHub.  What
 used to be known as "Watching", is now "Starring".  Starring is basically
 a way to bookmark interesting repositories.  Watching is a way to indicate that
diff --git a/content/changes/index.html b/content/changes/index.html
@@ -4,7 +4,7 @@
 
 <% sorted_articles.each do |article| %>
 <div class="article" id="article<%= article.path %>">
-  <%= render '_title', :item => article, :level => :h2 %>
+  <%= render '_meta', :item => article, :level => :h2 %>
   <%= article.compiled_content %>
 </div>
 <% end %>
diff --git a/layouts/_meta.html b/layouts/_meta.html
@@ -1,8 +1,12 @@
+<<%= @level %>>
+  <a href="<%= @item.path %>"><%= @item[:title] %></a>
+</<%= @level %>>
+
 <div class="meta">
   <div class="who_when">
-    <%= gravatar_for(@item[:author]) %>
+    <%= gravatar_for(@item[:author_name]) %>
     <span class="author vcard fn">
-      <a href="https://github.com/<%= @item[:author] %>"><%= @item[:author] %></a>
+      <a href="https://github.com/<%= @item[:author_name] %>"><%= @item[:author_name] %></a>
     </span>
     <span class="published">
       <%= post_date @item %>
diff --git a/layouts/_title.html b/layouts/_title.html
diff --git a/layouts/changes.html b/layouts/changes.html
@@ -0,0 +1,3 @@
+<%= render '_meta', :item => @item, :level => :h1 %>
+
+<%= yield %>
diff --git a/layouts/default.html b/layouts/default.html
@@ -31,7 +31,6 @@
 
     <div id="wrapper">
       <div class="content">
-<%= render '_title', :item => @item, :level => :h1 if @item[:kind] == 'article' %>
     <%= yield %>
       </div>
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<%= render '_meta', :item => @item, :level => :h1 %>`
	`2`	`+`
	`3`	`+<%= yield %>`