diff --git a/content/index.html b/content/index.html index 7f302fb8..337076ff 100644 --- a/content/index.html +++ b/content/index.html @@ -84,7 +84,7 @@ kind: empty <% latest_articles(5).each do |item| %>
- <%= render 'article_intro', :article => item, :extended => true %> + <%= render 'item_intro', :item => item, :extended => true %>

Zum Artikel

diff --git a/layouts/article_archive.erb b/layouts/article_archive.erb index d9970f46..50a3ac5a 100644 --- a/layouts/article_archive.erb +++ b/layouts/article_archive.erb @@ -2,7 +2,7 @@
<% latest_articles.select { |a| a[:created_at].year == @year }.each do |item| %>
- <%= render 'article_intro', :article => item, :extended => true %> + <%= render 'item_intro', :item => item, :extended => true %>

Zum Artikel

diff --git a/layouts/article_body.html b/layouts/article_body.html index 37287e99..bb560de6 100644 --- a/layouts/article_body.html +++ b/layouts/article_body.html @@ -6,14 +6,12 @@ <% if item.attributes.has_key?(:subtitle) then %>
<%= item[:subtitle] %> <% end %> - +

+ + <% if @item[:author] %>- @item[:author]<% end %> + <% if @item[:refers_to] %>- <%= @items[sanitize_path(@item[:refers_to])][:title] %><% end %> + - -

<%= yield %> diff --git a/layouts/article_intro.erb b/layouts/article_intro.erb deleted file mode 100644 index 4855a64b..00000000 --- a/layouts/article_intro.erb +++ /dev/null @@ -1,15 +0,0 @@ -
-
<% if !@h then @h='h1' end %> - <<%= @h %>><%= @article[:title]%> - <% if @article.attributes.has_key?(:subtitle) then %> -
<%= @article[:subtitle] %> - <% end %>> -
-
-
- <% if @extended then %> - <%= article_summary(@article) %> - <% end %> -
-
- diff --git a/layouts/item_intro.erb b/layouts/item_intro.erb new file mode 100644 index 00000000..7d5047d5 --- /dev/null +++ b/layouts/item_intro.erb @@ -0,0 +1,23 @@ +
+
<% if !@h then @h='h1' end %> + <<%= @h %>><%= @item[:title]%> + <% if @item.attributes.has_key?(:subtitle) then %> +
<%= @item[:subtitle] %> + <% end %>> + <%if @item[:kind]=='article' %> +

+

+
+
+ <% if @extended then %> + <%= article_summary(@item) %> + <% end %> +
+
+ diff --git a/layouts/project_body.html b/layouts/project_body.html index 8039e3b0..c0f6f01a 100644 --- a/layouts/project_body.html +++ b/layouts/project_body.html @@ -7,7 +7,7 @@
<% latest_articles_referred_to(item.identifier,5).each do |item| %>
- <%= render 'article_intro', :article => item, :extended => true %> + <%= render 'item_intro', :item => item, :extended => true %>

Zum Artikel

diff --git a/layouts/project_list.erb b/layouts/project_list.erb index 430a42a5..f3c45726 100644 --- a/layouts/project_list.erb +++ b/layouts/project_list.erb @@ -1,5 +1,5 @@ <% @projects.each do |prj| %>
- <%= render 'article_intro', :article => prj, :h => 'h2', :extended => @extended %> + <%= render 'item_intro', :item => prj, :h => 'h2', :extended => @extended %>
<% end %>