Make event header a list, align icons

This commit is contained in:
Stefan Schlott 2013-08-27 11:47:41 +02:00
parent c273939cbd
commit ca3b00f0bb
2 changed files with 67 additions and 49 deletions

View file

@ -113,7 +113,7 @@ ul.horizontal {
} }
} }
div.commaseparated { div.commaseparated, li.commaseparated {
clear: both; clear: both;
ul { ul {
display: inline; display: inline;
@ -131,6 +131,21 @@ div.commaseparated {
} }
} }
ul.iconlist {
margin: 0;
> li {
display: block;
padding-left: 20px;
font-family: $baseFontFamily;
}
> li:before {
width: 17px;
display: inline-block;
margin-left: -20px;
font-family: FontAwesome;
}
}
div.planetpost { div.planetpost {
h2 { h2 {
font-size: $baseFontSize * 1.25; font-size: $baseFontSize * 1.25;

View file

@ -1,4 +1,4 @@
<header> <header class="event">
<% if heading %> <% if heading %>
<% if link %> <% if link %>
<h1 itemprop="name"><a itemProp="url" href="<%= item.path() %>"><%= item[:title] %></a></h1> <h1 itemprop="name"><a itemProp="url" href="<%= item.path() %>"><%= item[:title] %></a></h1>
@ -6,53 +6,56 @@
<h1 itemprop="name"><%= item[:title] %></h1> <h1 itemprop="name"><%= item[:title] %></h1>
<% end %> <% end %>
<% end %> <% end %>
<i class="icon-calendar" title="Datum"></i> <ul class="iconlist">
<span itemprop="startDate" content="<%= @item[:startdate].strftime("%Y-%m-%d") %>T19:30"><%= @item[:startdate].strftime("%d.%m.%Y") %>, 19:30 Uhr</span> <li class="icon-calendar" title="Datum">
<% if !@item[:public] %>(nicht öffentlich)<% end %> <span itemprop="startDate" content="<%= @item[:startdate].strftime("%Y-%m-%d") %>T19:30"><%= @item[:startdate].strftime("%d.%m.%Y") %>, 19:30 Uhr</span>
<br /> <% if !@item[:public] %>(nicht öffentlich)<% end %>
<% if !heading %><i class="icon-comment" title="Thema"></i> <span itemprop="name"><%= item[:title] %></span><br /><% end %> </li>
<% if @item[:speakers] %> <% if !heading %>
<div class="commaseparated"> <li class="icon-comment" title="Thema">
<i class="icon-male" title="Referent"></i> <span itemprop="name"><%= item[:title] %></span>
<ul> </li>
<% @item[:speakers].each do |speaker| %> <% end %>
<li itemprop="performer" itemscope itemtype="http://schema.org/Person"> <% if @item[:speakers] %>
<span itemprop="name"><%= speaker[:name] %></span><% if speaker[:affiliation]%> (<%= speaker[:affiliation] %>)<% end %> <li class="icon-male commaseparated" title="Referent">
</li> <ul>
<% end %> <% @item[:speakers].each do |speaker| %>
</ul> <li itemprop="performer" itemscope itemtype="http://schema.org/Person">
</div> <span itemprop="name"><%= speaker[:name] %></span><% if speaker[:affiliation]%> (<%= speaker[:affiliation] %>)<% end %>
<% end %> </li>
<% if @item[:superevent] %> <% end %>
<div itemprop="superEvent" itemscope itemtype="http://schema.org/Event"> </ul>
<i class="icon-comments-alt" title="Veranstaltung"></i> </li>
<% if @item[:superevent][:url] %> <% end %>
<a itemprop="url" href="<%= @item[:superevent][:url] %>"><span itemprop="name"><%= @item[:superevent][:title] %></span></a> <% if @item[:superevent] %>
<% else %> <li class="icon-comments-alt" itemprop="superEvent" itemscope itemtype="http://schema.org/Event" title="Veranstaltung">
<span itemprop="name"><%= @item[:superevent][:title] %></span> <% if @item[:superevent][:url] %>
<% end %> <a itemprop="url" href="<%= @item[:superevent][:url] %>"><span itemprop="name"><%= @item[:superevent][:title] %></span></a>
</div> <% else %>
<% end %> <span itemprop="name"><%= @item[:superevent][:title] %></span>
<% if @item[:location] %> <% end %>
<div class="commaseparated"> </li>
<i class="icon-compass" title="Ort"></i> <% end %>
<ul itemprop="location" itemscope itemtype="http://schema.org/Location"> <% if @item[:location] %>
<li itemprop="name"><% if item[:location][:url] %><a itemprop="url" href="<%= item[:location][:url] %>"><%= item[:location][:name] %></a><% else %><%= item[:location][:name] %><% end %> <li class="icon-compass commaseparated" title="Ort">
<% if item[:location][:details] %><li><%= item[:location][:details] %><% end %> <ul itemprop="location" itemscope itemtype="http://schema.org/Location">
<span itemprop="address" itemscope itemtype="http://schema.org/PostalAddress"> <li itemprop="name"><% if item[:location][:url] %><a itemprop="url" href="<%= item[:location][:url] %>"><%= item[:location][:name] %></a><% else %><%= item[:location][:name] %><% end %>
<% if item[:location][:strasse] %><li itemprop="streetAddress"><%= item[:location][:strasse] %><% end %> <% if item[:location][:details] %><li><%= item[:location][:details] %><% end %>
<% if item[:location][:ort] %><li><span itemprop="postalCode"><%= item[:location][:plz] %></span> <span itemProp="addressLocality"><%= item[:location][:ort] %></span><% end %> <span itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">
</span> <% if item[:location][:strasse] %><li itemprop="streetAddress"><%= item[:location][:strasse] %><% end %>
<% if item[:location][:lon] %> <% if item[:location][:ort] %><li><span itemprop="postalCode"><%= item[:location][:plz] %></span> <span itemProp="addressLocality"><%= item[:location][:ort] %></span><% end %>
<li>
<span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
N<span itemprop="latitude"><%= item[:location][:lat] %></span>
E<span itemprop="longitude"><%= item[:location][:lon] %></span>
</span> </span>
(<a itemprop="map" href="http://www.openstreetmap.org/?mlat=<%= item[:location][:lat] %>&mlon=<%= item[:location][:lon] %>&zoom=18#map=16/<%= item[:location][:lat] %>/<%= item[:location][:lon] %>">Karte</a>) <% if item[:location][:lon] %>
<% end %> <li>
</ul> <span itemprop="geo" itemscope itemtype="http://schema.org/GeoCoordinates">
</div> N<span itemprop="latitude"><%= item[:location][:lat] %></span>
<% end %> E<span itemprop="longitude"><%= item[:location][:lon] %></span>
</span>
(<a itemprop="map" href="http://www.openstreetmap.org/?mlat=<%= item[:location][:lat] %>&mlon=<%= item[:location][:lon] %>&zoom=18#map=16/<%= item[:location][:lat] %>/<%= item[:location][:lon] %>">Karte</a>)
<% end %>
</ul>
</li>
<% end %>
</ul>
</header> </header>