diff --git a/content/events.erb b/content/events.erb index 699ea84..456b1a1 100644 --- a/content/events.erb +++ b/content/events.erb @@ -8,30 +8,55 @@ order: 20

Upcoming events

+
- <% upcoming_events.each do |event| %> + <% upcoming_events.each_slice(2) do |slice| %> - <% if (sub_events(event)).empty? %> - <%= render '/partials/_event_preview.*', event: event %> - <% else %> - <% sub_events(event).each do |sub_event| %> - <%= render '/partials/_event_preview.*', event: sub_event, main_event: event %> +
+ <% slice.each do |event| %> + <% if (sub_events(event)).empty? %> + +
+ <%= render '/partials/_tile.*', + article: event, + small_text: event[:time].strftime('%A %d %B %Y %H:%M'), + htmlclass:"highlighted" %> +
+ <% else %> + <% sub_events(event).each do |sub_event| %> + <%= render '/partials/_event_preview.*', event: sub_event, main_event: event %> + <% end %> + <% end %> <% end %> - <% end %> +
<% end %> -
+
+ + +

Past events

- <% past_events.each do |event| %> + <% past_events.each_slice(2) do |slice| %> - <% if (sub_events(event)).empty? %> - <%= render '/partials/_event_preview.*', event: event %> - <% else %> - <% sub_events(event).each do |sub_event| %> - <%= render '/partials/_event_preview.*', event: sub_event, main_event: event %> +
+ <% slice.each do |event| %> + <% if (sub_events(event)).empty? %> + +
+ <%= render '/partials/_tile.*', + article: event, + small_text: event[:time].strftime('%A %d %B %Y %H:%M'), + htmlclass:"highlighted" %> +
+ <% else %> + <% sub_events(event).each do |sub_event| %> + <%= render '/partials/_event_preview.*', event: sub_event, main_event: event %> + <% end %> + <% end %> <% end %> - <% end %> - <% end %> +
+ <%end%> +
diff --git a/layouts/partials/_tile.erb b/layouts/partials/_tile.erb index 75ba5ae..f247753 100644 --- a/layouts/partials/_tile.erb +++ b/layouts/partials/_tile.erb @@ -1,5 +1,5 @@ + style="background-image:url('<%= @article[:banner] %>') ;">