From 18afac1ebbb8fbd6f370a0b088486c825c62b0e6 Mon Sep 17 00:00:00 2001 From: ajuvercr Date: Fri, 6 Dec 2019 20:37:33 +0100 Subject: [PATCH] minimal --- layouts/eventpost.erb | 3 +++ layouts/events.erb | 24 ++++++++++++++++++++++++ layouts/partials/_soon_tile.erb | 33 +++++++++++++++++++++++++++++++++ lib/helpers/events.rb | 8 ++++++-- 4 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 layouts/partials/_soon_tile.erb diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index 2a6d72d..182024c 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -73,6 +73,8 @@ + +<% if item[:locationlink] %>
@@ -83,6 +85,7 @@
+<% end %> diff --git a/layouts/events.erb b/layouts/events.erb index 14478c5..c381c86 100644 --- a/layouts/events.erb +++ b/layouts/events.erb @@ -61,4 +61,28 @@ <% end %> + + <% unless soon_events().empty? %> +
+ +
+ <% end %> diff --git a/layouts/partials/_soon_tile.erb b/layouts/partials/_soon_tile.erb new file mode 100644 index 0000000..f46b4c9 --- /dev/null +++ b/layouts/partials/_soon_tile.erb @@ -0,0 +1,33 @@ +<% if @event[:banner] %> + +<% elsif @event[:color] %> + +<% else %> + +<% end %> +
+ <% if nil && @event[:image] %> + + <% end %> +
+

+ <%= @event[:title] %> +

+ +
+ <%= @event[:description] %> +
+ +
+ +
+ <%= fa :'clock-o' , fw: true %><%= @event[:time].strftime('%A %d %B, %H:%M') %> +
+ <%= fa :'map-marker', fw: true %><%= @event[:location] %> +
+
+ +
+
diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb index 9f4480c..cb8501d 100644 --- a/lib/helpers/events.rb +++ b/lib/helpers/events.rb @@ -3,14 +3,18 @@ require 'uri' module EventsHelper - def all_events(year = nil) + def all_events(year = nil, soon = nil) items_ = if year @items.find_all("/events/#{year}/*.md") else @items.find_all('/events/*/*.md') end - items_.sort_by { |x| x[:time] } + items_.select { |x| x[:soon] == soon }.sort_by { |x| x[:time] } + end + + def soon_events() + all_events(nil, true) end def upcoming_events(year = nil)