diff --git a/content/assets/stylesheets/includes/tiles.scss b/content/assets/stylesheets/includes/tiles.scss index eb03ade..1893093 100644 --- a/content/assets/stylesheets/includes/tiles.scss +++ b/content/assets/stylesheets/includes/tiles.scss @@ -55,7 +55,7 @@ $top_coder_size: 80px; .content { color: white; - h1, h2 { + h1, h2, h3 { color: inherit; } a, a:visited { @@ -130,7 +130,7 @@ $top_coder_size: 80px; .content { position: relative; - h1, h2 { + h1, h2, h3 { color: white; } diff --git a/content/events/19-20/ctf2.md b/content/events/19-20/ctf2.md new file mode 100644 index 0000000..063c93b --- /dev/null +++ b/content/events/19-20/ctf2.md @@ -0,0 +1,7 @@ +--- +title: 'Capture The Flag II' +description: Zeus CTF in aanloop naar de Belgische Cybersecuritychallenge +time: '12-11-2019 18:00' +location: 'Kelder Zeus WPI' +soon: true +--- diff --git a/content/events/19-20/godot.md b/content/events/19-20/godot.md new file mode 100644 index 0000000..ade633c --- /dev/null +++ b/content/events/19-20/godot.md @@ -0,0 +1,8 @@ +--- +title: Game Development - Godot +description: Maak je eerste spel met Godot, we focussen op Flappy Bird! +color: '#478CBF' +time: '12-11-2019 18:00' +location: 'Kelder Zeus WPI' +soon: true +--- diff --git a/content/events/19-20/spelletjesavond2.md b/content/events/19-20/spelletjesavond2.md new file mode 100644 index 0000000..3ef92b4 --- /dev/null +++ b/content/events/19-20/spelletjesavond2.md @@ -0,0 +1,8 @@ +--- +title: Spelletjesavond +description: Kom samen met andere Zeussers en Zeusinnen spelletjes spelen! +color: lightblue +time: '12-11-2019 18:00' +location: 'Kelder Zeus WPI' +soon: true +--- 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..c967bf7 100644 --- a/layouts/events.erb +++ b/layouts/events.erb @@ -57,8 +57,23 @@

Sorry.

No events planned yet this year.

-

Soon TM.

+

Soon™.

<% 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..cea1f67 --- /dev/null +++ b/layouts/partials/_soon_tile.erb @@ -0,0 +1,17 @@ +
+ style="background-image: linear-gradient(to top right,rgba(255,255,255,0),rgba(0,0,0,.60)); background-color:<%= event[:color] %>;" + <% else %> + style="background-image: linear-gradient(to top right,rgba(255,255,255,0),rgba(0,0,0,.60)); background-color: lightgrey;" + <% end %> + > +
+ <% if @event[:image] %> + + <% end %> +
+

<%= @event[:title] %>

+

<%= @event[:description] %>

+
+
+
diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb index 9f4480c..7e682dd 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) diff --git a/lib/helpers/ical.rb b/lib/helpers/ical.rb index 1369e0f..e11e1ef 100644 --- a/lib/helpers/ical.rb +++ b/lib/helpers/ical.rb @@ -2,9 +2,9 @@ module IcalHelper def event_calendar cal = Icalendar::Calendar.new - items.find_all('/events/*/*.md').each do |i| - cal.add_event(event_for(i)) - end + items.find_all('/events/*/*.md') + .select { |x| x[:soon] == nil } + .each {|i| cal.add_event(event_for(i)) } cal.to_ical end diff --git a/lib/helpers/preprocess.rb b/lib/helpers/preprocess.rb index e5670c9..41abf9a 100644 --- a/lib/helpers/preprocess.rb +++ b/lib/helpers/preprocess.rb @@ -1,15 +1,14 @@ module PreprocessHelper def required_attrs { - event: { - time: 'An event item should include the :time attribute, which describes the begin time and date of the event.', - title: 'The event does not include a :title', - location: 'The event should include a :location, a textual description', - locationlink: 'The event does not include a :locationlink, which is a querystring which is used for Google Maps' - }, - privacy: { - status: 'A privacy item must include the status of the project' - } + event: { + time: 'An event item should include the :time attribute, which describes the begin time and date of the event.', + title: 'The event does not include a :title', + location: 'The event should include a :location, a textual description', + }, + privacy: { + status: 'A privacy item must include the status of the project' + } } end