diff --git a/Rules b/Rules index 61df37f..7abd995 100644 --- a/Rules +++ b/Rules @@ -156,7 +156,7 @@ ignore '/assets/stylesheets/includes/**/*' compile '/assets/stylesheets/**/*.scss' do filter :sass, syntax: :scss - filter :autoprefixer if Socket.gethostname == 'abysm' + filter :autoprefixer end passthrough '/assets/images/*.{png,svg}' diff --git a/content/index.erb b/content/index.erb index e19eb57..259b9f1 100644 --- a/content/index.erb +++ b/content/index.erb @@ -7,11 +7,11 @@
- <%= render '/partials/_tile.*', article: all_events[0], htmlclass: "highlighted", small_text: "Upcoming event" %> + <%= render '/partials/_tile.*', article: upcoming_events[0], htmlclass: "highlighted", small_text: "Upcoming event" %>
- <%= render '/partials/_tile.*', article: all_events[1], small_text: "Upcoming event" %> + <%= render '/partials/_tile.*', article: upcoming_events[1], small_text: "Upcoming event" %>
diff --git a/lib/helpers/events.rb b/lib/helpers/events.rb index a627daa..65daef9 100644 --- a/lib/helpers/events.rb +++ b/lib/helpers/events.rb @@ -5,11 +5,11 @@ module EventsHelper end def upcoming_events - all_events.reject { |x| x[:time] < Date.today } + all_events.reject { |x| x[:time] <= Date.today } end def past_events - all_events.reject { |x| x[:time] >= Date.today } + all_events.reject { |x| x[:time] > Date.today } end def grouped_events diff --git a/nanoc.yaml b/nanoc.yaml index fc0fbec..00051a2 100644 --- a/nanoc.yaml +++ b/nanoc.yaml @@ -3,7 +3,7 @@ title: Zeus WPI author_name: '' author_uri: '' -base_url: https://zeus.ugent.be/beta +base_url: https://zeus.ugent.be # The syntax to use for patterns in the Rules file. Can be either `"glob"` # (default) or `"legacy"`. The former will enable glob patterns, which behave @@ -99,5 +99,5 @@ checks: deploy: public: kind: rsync - dst: zeusweb-beta@zeus.ugent.be:/home/zeusweb-beta/public + dst: zeusweb-new@zeus.ugent.be:/home/zeusweb-new/public options: [ '-glpPrtvz', '-e', 'ssh -p 2222', '--delete']