From 27f48271e2d159ab83a1c7d094bdffc5d6b4e54f Mon Sep 17 00:00:00 2001
From: Stefan Schlott <stefan@ploing.de>
Date: Fri, 23 Aug 2013 20:03:07 +0200
Subject: [PATCH] Generic article teaser. Treat h1/h2 problem

---
 content/projects/index.html |  9 ++++++---
 layouts/article_intro.erb   | 15 +++++++++++++++
 layouts/project_intro.erb   | 21 ---------------------
 layouts/project_list.erb    |  4 +++-
 4 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 layouts/article_intro.erb
 delete mode 100644 layouts/project_intro.erb

diff --git a/content/projects/index.html b/content/projects/index.html
index f00deee9..c37958da 100644
--- a/content/projects/index.html
+++ b/content/projects/index.html
@@ -5,21 +5,24 @@ kind: page
 <%
   prj = projects_by_state
 %>
+<p>
+Hier eine Liste von länger laufenden Projekten (oder zumindest ein Versuch davon :-)
+</p>
 <% if prj.has_key?('active') %>
 <h1>Aktive Projekte</h1>
-<div class="itemlist">
+<div class="row">
   <%= render 'project_list', :projects => prj['active'], :extended => true %>
 </div>
 <% end %>
 <% if prj.has_key?('completed') %>
 <h1>Abgeschlossene Projekte</h1>
-<div class="itemlist">
+<div class="row">
   <%= render 'project_list', :projects => prj['completed'], :extended => true %>
 </div>
 <% end %>
 <% if prj.has_key?('stalled') %>
 <h1>Ruhende Projekte</h1>
-<div class="itemlist">
+<div class="row">
   <%= render 'project_list', :projects => prj['stalled'], :extended => true %>
 </div>
 <% end %>
diff --git a/layouts/article_intro.erb b/layouts/article_intro.erb
new file mode 100644
index 00000000..1386d9b5
--- /dev/null
+++ b/layouts/article_intro.erb
@@ -0,0 +1,15 @@
+<article>
+  <header><% if !@h then @h='h1' end %>
+    <<%= @h %>><a href="<%= @article.path() %>"><%= @article[:title]%></a>
+		<% if @article.attributes.has_key?(:subtitle) then %>
+      <br/><small><%= @article[:subtitle] %></small>
+    <% end %></<%= @h %>>
+    <div class="clearfix"></div>
+	</header>
+	<section>
+		<% if @extended then %>
+      <%= article_summary(@article) %>
+		<% end %>
+	</section>
+</article>
+
diff --git a/layouts/project_intro.erb b/layouts/project_intro.erb
deleted file mode 100644
index 12cb0de0..00000000
--- a/layouts/project_intro.erb
+++ /dev/null
@@ -1,21 +0,0 @@
------
-filter: erb
------
-<%
-  prjname = @project.identifier.split('/')[2]
-%>
-<article id="p_<%= prjname %>">
-	<header>
-		<h1><a href="/projects/<%= prjname %>"><%= @project[:title]%></a></h1>
-		<% if @project.attributes.has_key?(:subtitle) then %>
-    <h2><%= @project[:subtitle] %></h2>
-    <% end %>
-    <div class="clearfix"></div>
-	</header>
-	<section class="<%= @classes %>">
-		<% if @extended then %>
-      <%= article_summary(@project) %>
-		<% end %>
-	</section>
-</article>
-
diff --git a/layouts/project_list.erb b/layouts/project_list.erb
index 1922ff04..430a42a5 100644
--- a/layouts/project_list.erb
+++ b/layouts/project_list.erb
@@ -1,3 +1,5 @@
 <% @projects.each do |prj| %>
-  <%= render 'project_intro', :project => prj, :classes => "hyphenate", :extended => @extended %>
+  <div class="span8">
+    <%= render 'article_intro', :article => prj, :h => 'h2', :extended => @extended %>
+  </div>
 <% end %>