Distinguish coming/past events (separate headlines)

This commit is contained in:
Stefan Schlott 2013-08-29 10:32:33 +02:00
parent ff16ff78a0
commit d72f5934df
3 changed files with 47 additions and 14 deletions

View file

@ -1,14 +1,47 @@
<%= render 'pager', :linkprev => @linkprev, :linknext => @linknext %> <%= render 'pager', :linkprev => @linkprev, :linknext => @linknext %>
<div class="row"> <% if (@item[:futureitems].size>0 && @item[:pastitems].size>0) %>
<% (@item[:futureitems] + @item[:pastitems]).each do |item| %> <div class="row">
<div class="span8">
<h1><%= @item[:comingtitle] %></h1>
</div>
<% @item[:futureitems].reverse.each do |item| %>
<div class="span8"> <div class="span8">
<article itemscope itemtype="http://schema.org/EducationEvent"> <article itemscope itemtype="http://schema.org/EducationEvent">
<%= render 'event_header', :item => item, :heading => true, :link => true %> <%= render 'event_header', :item => item, :heading => 'h2', :link => true %>
</article> </article>
<p> <p>
<a href="<%= item.path() %>">Zum Artikel</a> <a href="<%= item.path() %>">Zum Artikel</a>
<hr> <hr>
</div> </div>
<% end %> <% end %>
</div> </div>
<div class="row">
<div class="span8">
<h1><%= @item[:pasttitle] %></h1>
</div>
<% @item[:pastitems].each do |item| %>
<div class="span8">
<article itemscope itemtype="http://schema.org/EducationEvent">
<%= render 'event_header', :item => item, :heading => 'h2', :link => true %>
</article>
<p>
<a href="<%= item.path() %>">Zum Artikel</a>
<hr>
</div>
<% end %>
</div>
<% else %>
<div class="row">
<% (@item[:futureitems] + @item[:pastitems]).each do |item| %>
<div class="span8">
<article itemscope itemtype="http://schema.org/EducationEvent">
<%= render 'event_header', :item => item, :heading => 'h1', :link => true %>
</article>
<p>
<a href="<%= item.path() %>">Zum Artikel</a>
<hr>
</div>
<% end %>
</div>
<% end %>
<%= render 'pager', :linkprev => @linkprev, :linknext => @linknext %> <%= render 'pager', :linkprev => @linkprev, :linknext => @linknext %>

View file

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div class="span8"> <div class="span8">
<article itemscope itemtype="http://schema.org/EducationEvent"> <article itemscope itemtype="http://schema.org/EducationEvent">
<%= render 'event_header', :item => item, :heading => true, :link => false %> <%= render 'event_header', :item => item, :heading => 'h1', :link => false %>
<hr> <hr>
<section itemprop="description"> <section itemprop="description">
<%= yield %> <%= yield %>

View file

@ -1,9 +1,9 @@
<header class="event"> <header class="event">
<% if heading %> <% if heading %>
<% if link %> <% if link %>
<h1 itemprop="name"><a itemProp="url" href="<%= item.path() %>"><%= item[:title] %></a></h1> <<%= heading %> itemprop="name"><a itemProp="url" href="<%= item.path() %>"><%= item[:title] %></a></<%= heading %>>
<% else %> <% else %>
<h1 itemprop="name"><%= item[:title] %></h1> <<%= heading %> itemprop="name"><%= item[:title] %></<%= heading %>>
<% end %> <% end %>
<% end %> <% end %>
<ul class="iconlist"> <ul class="iconlist">