diff --git a/content/planned_events/ctf2.md b/content/planned_events/ctf2.md new file mode 100644 index 0000000..fb4b2b7 --- /dev/null +++ b/content/planned_events/ctf2.md @@ -0,0 +1,9 @@ +--- +title: 'Capture The Flag II' +description: Zeus CTF in aanloop naar de Belgische Cybersecuritychallenge +created_at: 06-12-2019 +image: 'https://zeus.ugent.be/zeuswpi/_9i__XUJ.jpg' +banner: 'https://zeus.ugent.be/zeuswpi/JnpFxP-T.jpg' +location: 'Auditorium A3, Zeus WPI' +locationlink: 'S9 Gent' +--- diff --git a/content/planned_events/spelletjesavond2.md b/content/planned_events/spelletjesavond2.md new file mode 100644 index 0000000..9ce3624 --- /dev/null +++ b/content/planned_events/spelletjesavond2.md @@ -0,0 +1,8 @@ +--- +title: Spelletjesavond +description: Kom samen met andere Zeussers en Zeusinnen spelletjes spelen! +created_at: 13-03-2019 +location: 'Leslokaal 1.1, Gebouw S9, Campus Sterre' +locationlink: 'S9 Gent' +color: blue +--- diff --git a/layouts/events.erb b/layouts/events.erb index 14478c5..5549b9a 100644 --- a/layouts/events.erb +++ b/layouts/events.erb @@ -38,6 +38,21 @@ <% end %> <% end %> + <% unless planned_events(@item[:academic_year]).empty? %> +
+

Planned events

+
+ <% planned_events(@item[:academic_year]).each_slice(1) do |slice| %> +
+ <% slice.each do |event| %> +
+ <%= render '/partials/_planned_events_tile.*', event: event %> +
+ <% end %> +
+ <% end %> + <% end %> + <% unless past_events(@item[:academic_year]).empty? %>

Past events

diff --git a/layouts/partials/_planned_events_tile.erb b/layouts/partials/_planned_events_tile.erb new file mode 100644 index 0000000..2ecab54 --- /dev/null +++ b/layouts/partials/_planned_events_tile.erb @@ -0,0 +1,33 @@ +<% if @event[:banner] %> +
+<% elsif @event[:color] %> +
+<% else %> +
+<% end %> +
+ <% if @event[:image] %> + + <% end %> +
+

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

+ +
+ <%= @event[:description] %> +
+ +
+ +
+ <% if @event[:time] %><%= fa :'clock-o' , fw: true %><%= @event[:time].strftime('%A %d %B, %H:%M') %><% end %> +
+ <% if @event[:location] %><%= fa :'map-marker', fw: true %><%= @event[:location] %><% end %> +
+
+ +
+
diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb index 9f4480c..e5197fc 100644 --- a/lib/helpers/events.rb +++ b/lib/helpers/events.rb @@ -14,11 +14,15 @@ module EventsHelper end def upcoming_events(year = nil) - all_events(year).reject { |x| x[:time] <= Date.today } + all_events(year).reject { |x| x[:concrete] == false or x[:time] <= Date.today} + end + + def planned_events(year = nil) + @items.find_all('/planned_events/*.md') end def past_events(year = nil) - all_events(year).reject { |x| x[:time] > Date.today }.reverse + all_events(year).reject { |x| x[:concrete] == false or x[:time] > Date.today }.reverse end def academic_years_event_items