From a2bc8d275c98ed63ad9e8a15da653c6907da9f90 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sat, 8 Oct 2016 22:25:19 +0200 Subject: [PATCH 1/4] add lan party, and make changes to event format a bit to allow full banners --- content/events/16-17/LAN.md | 20 ++++++++++++++++---- content/events/16-17/datacenter.md | 2 +- content/events/16-17/lip.md | 2 +- layouts/eventpost.erb | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/content/events/16-17/LAN.md b/content/events/16-17/LAN.md index 8b63afe..d1f8fd4 100644 --- a/content/events/16-17/LAN.md +++ b/content/events/16-17/LAN.md @@ -1,6 +1,7 @@ --- title: Geeks, Attack! V -banner: https://scontent.xx.fbcdn.net/v/t1.0-9/13903431_1277596932251344_3927837466166230371_n.jpg?oh=bdda0d18a635c49893a097fba6aa99b9&oe=587C7886 +image: http://i.imgur.com/sQPA5m3.png +banner: http://imgur.com/gVXvesA.png description: Zeus' vijfde LAN-Party created_at: 13-09-2016 time: 04-11-2016 @@ -9,7 +10,18 @@ locationlink: Therminal,Ghent Belgium description: Zeus' vijfde LAN-Party --- -De vijfde editie van Zeus WPI's LAN-Party komt eraan! -Hou alvast de datum vrij! +# It's that time of year again -Wij houden jullie op de hoogte! +Je leest het goed, op **4 november** vindt onze vijfde editie van onze jaarlijkse LAN-Party plaats in **[Studentenhuis De Therminal](http://student.ugent.be/)** (Hoveniersberg 24, 9000 Gent). + +Vanaf **16:00** kunnen jullie elkaars Nexus vernietigen in League of Legends, een Ancient ten val brengen in Dota 2, bommen ontmantelen in Counter Strike: Global Offensive, op ontzagwekkende snelheden door de maps van Trackmania rijden, en nog veel, veel meer. + +# Inschrijven is verplicht! + +Door je in te schrijven krijgen wij een beter beeld van hoeveel volk we kunnen verwachten, wat we allemaal moeten voorzien, en welke competities we kunnen organiseren. **[Klik hier om je in te schrijven.](https://goo.gl/forms/XwHhYB4NkOO2GDoE3)** + +# Praktisch + +De deuren openen om 16:00. We vragen €2 inkom die gebruikt wordt voor de organisatie van het evenement, alsook prijzengeld. Zeus doelt niet op winst met "Geeks, Attack!". + +Uit ervaring weten we dat het soms wat kouder kan worden in de Therminal rondom die tijd, dus draag zeker een **trui** of iets dergelijks! We doen echter ons best om de verwarming in orde te krijgen. diff --git a/content/events/16-17/datacenter.md b/content/events/16-17/datacenter.md index 7b1153d..1fa618c 100644 --- a/content/events/16-17/datacenter.md +++ b/content/events/16-17/datacenter.md @@ -1,6 +1,6 @@ --- title: Bezoek datacenter -banner: https://emergingtechblog.emc.com/wp-content/uploads/2015/10/AdobeStock_86289688.jpeg +image: https://emergingtechblog.emc.com/wp-content/uploads/2015/10/AdobeStock_86289688.jpeg description: Zeus bezoekt het datacenter en de supercomputer in S10! created_at: 3-10-2016 time: 10-10-2016 diff --git a/content/events/16-17/lip.md b/content/events/16-17/lip.md index 939a0df..ea57298 100644 --- a/content/events/16-17/lip.md +++ b/content/events/16-17/lip.md @@ -1,6 +1,6 @@ --- title: Linux Install Party -banner: //scontent-bru2-1.xx.fbcdn.net/t31.0-8/s960x960/14435421_1323382324339471_2958587023924328526_o.jpg +image: //scontent-bru2-1.xx.fbcdn.net/t31.0-8/s960x960/14435421_1323382324339471_2958587023924328526_o.jpg description: Hulp nodig met het installeren van Linux op je laptop? Zeus helpt je graag! created_at: 3-10-2016 time: 5-10-2016 diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index 9e9df0e..77b306b 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -1,11 +1,15 @@ <% content_for :head do %> - + <% end %> +<% if item[:banner] %> +
+<% else %>
+<% end %>
<%= render '/partials/_navbar.*', zeus_logo_color: :white %>
@@ -30,7 +34,7 @@ From d0033e1f93e3b578148803870472f28fe90e927d Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sat, 8 Oct 2016 22:28:11 +0200 Subject: [PATCH 2/4] mixed content --- content/events/16-17/LAN.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/events/16-17/LAN.md b/content/events/16-17/LAN.md index d1f8fd4..a5cf6d6 100644 --- a/content/events/16-17/LAN.md +++ b/content/events/16-17/LAN.md @@ -1,7 +1,7 @@ --- title: Geeks, Attack! V -image: http://i.imgur.com/sQPA5m3.png -banner: http://imgur.com/gVXvesA.png +image: //i.imgur.com/sQPA5m3.png +banner: //imgur.com/gVXvesA.png description: Zeus' vijfde LAN-Party created_at: 13-09-2016 time: 04-11-2016 From b0e94d4768f04dca88514fb9beef1c799ffb7d9f Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sun, 9 Oct 2016 01:57:21 +0200 Subject: [PATCH 3/4] improvements to lan party page and others in general --- Gemfile | 1 + Gemfile.lock | 2 ++ Rules | 4 ++-- content/assets/stylesheets/includes/eventpage.scss | 10 ++++++++++ content/assets/stylesheets/includes/general.scss | 11 +---------- content/events/16-17/LAN.md | 7 ++++--- content/events/16-17/datacenter.md | 2 +- content/events/16-17/lip.md | 2 +- layouts/default.erb | 6 +++--- layouts/eventpost.erb | 12 +++++++++++- layouts/partials/_footer.erb | 2 +- lib/helpers/font_awesome.rb | 4 +++- lib/helpers/ical.rb | 2 +- 13 files changed, 41 insertions(+), 24 deletions(-) diff --git a/Gemfile b/Gemfile index 4fb03c8..e3b59c3 100644 --- a/Gemfile +++ b/Gemfile @@ -22,6 +22,7 @@ gem 'autoprefixer-rails' group :development do gem 'adsf' gem 'highline' + gem 'terminal-notifier-guard' end group :nanoc do diff --git a/Gemfile.lock b/Gemfile.lock index 45c0ef0..d093303 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -70,6 +70,7 @@ GEM sass (3.4.22) shellany (0.0.1) slop (3.6.0) + terminal-notifier-guard (1.7.0) thor (0.19.1) w3c_validators (1.2) json @@ -90,6 +91,7 @@ DEPENDENCIES nanoc (~> 4.3.3) nokogiri sass + terminal-notifier-guard w3c_validators BUNDLED WITH diff --git a/Rules b/Rules index 7abd995..f3269a8 100644 --- a/Rules +++ b/Rules @@ -33,7 +33,7 @@ preprocess do academic_years.each do |year| @items.create( '', - { academic_year: year, title: "Blog" }, + { academic_year: year, title: 'Blog' }, "/blog/#{year}-#{year + 1}.html", binary: false ) @@ -45,7 +45,7 @@ preprocess do ) all_events.each do |event| - event[:time] = Date.parse(event[:time]) + event[:time] = DateTime.parse(event[:time]) end end diff --git a/content/assets/stylesheets/includes/eventpage.scss b/content/assets/stylesheets/includes/eventpage.scss index 31f31cb..4e6cb80 100644 --- a/content/assets/stylesheets/includes/eventpage.scss +++ b/content/assets/stylesheets/includes/eventpage.scss @@ -23,3 +23,13 @@ .event-attributes { font-size: 1.3em; } + +.event-social-icons { + margin-left: 10px; + + .fa { + margin-right: 5px; + font-size: 0.60em; + vertical-align: baseline; + } +} diff --git a/content/assets/stylesheets/includes/general.scss b/content/assets/stylesheets/includes/general.scss index 3efb4e0..2dddb09 100644 --- a/content/assets/stylesheets/includes/general.scss +++ b/content/assets/stylesheets/includes/general.scss @@ -1,11 +1,3 @@ -.fa-ul { - list-style: none !important; - - .fa { - font-size: inherit; - } -} - .has-text-justified { text-align: justify; } @@ -65,9 +57,8 @@ main.section { footer.footer { padding-bottom: 40px; + .fa { - font-size: inherit; - text-align: inherit; vertical-align: inherit; } } diff --git a/content/events/16-17/LAN.md b/content/events/16-17/LAN.md index a5cf6d6..1021106 100644 --- a/content/events/16-17/LAN.md +++ b/content/events/16-17/LAN.md @@ -4,10 +4,11 @@ image: //i.imgur.com/sQPA5m3.png banner: //imgur.com/gVXvesA.png description: Zeus' vijfde LAN-Party created_at: 13-09-2016 -time: 04-11-2016 +time: 04-11-2016 16:00 location: Therminal, Hoveniersberg 24 9000 Gent locationlink: Therminal,Ghent Belgium description: Zeus' vijfde LAN-Party +facebook: https://www.facebook.com/events/299820833699196/ --- # It's that time of year again @@ -16,12 +17,12 @@ Je leest het goed, op **4 november** vindt onze vijfde editie van onze jaarlijks Vanaf **16:00** kunnen jullie elkaars Nexus vernietigen in League of Legends, een Ancient ten val brengen in Dota 2, bommen ontmantelen in Counter Strike: Global Offensive, op ontzagwekkende snelheden door de maps van Trackmania rijden, en nog veel, veel meer. -# Inschrijven is verplicht! +# Schrijf je in! Door je in te schrijven krijgen wij een beter beeld van hoeveel volk we kunnen verwachten, wat we allemaal moeten voorzien, en welke competities we kunnen organiseren. **[Klik hier om je in te schrijven.](https://goo.gl/forms/XwHhYB4NkOO2GDoE3)** # Praktisch -De deuren openen om 16:00. We vragen €2 inkom die gebruikt wordt voor de organisatie van het evenement, alsook prijzengeld. Zeus doelt niet op winst met "Geeks, Attack!". +De deuren openen om 16:00. We vragen €2 inkom, die gebruikt zal worden om de prijzenpot van onze competities aan te dikken. Uit ervaring weten we dat het soms wat kouder kan worden in de Therminal rondom die tijd, dus draag zeker een **trui** of iets dergelijks! We doen echter ons best om de verwarming in orde te krijgen. diff --git a/content/events/16-17/datacenter.md b/content/events/16-17/datacenter.md index 1fa618c..e3fddef 100644 --- a/content/events/16-17/datacenter.md +++ b/content/events/16-17/datacenter.md @@ -3,7 +3,7 @@ title: Bezoek datacenter image: https://emergingtechblog.emc.com/wp-content/uploads/2015/10/AdobeStock_86289688.jpeg description: Zeus bezoekt het datacenter en de supercomputer in S10! created_at: 3-10-2016 -time: 10-10-2016 +time: 10-10-2016 17:45 location: Datacenter UGent, S10, Sterre locationlink: 51.023650, 3.712018 --- diff --git a/content/events/16-17/lip.md b/content/events/16-17/lip.md index ea57298..1f0524b 100644 --- a/content/events/16-17/lip.md +++ b/content/events/16-17/lip.md @@ -3,7 +3,7 @@ title: Linux Install Party image: //scontent-bru2-1.xx.fbcdn.net/t31.0-8/s960x960/14435421_1323382324339471_2958587023924328526_o.jpg description: Hulp nodig met het installeren van Linux op je laptop? Zeus helpt je graag! created_at: 3-10-2016 -time: 5-10-2016 +time: 5-10-2016 17:00 location: Zeus kelder, S9 locationlink: Sterre,Ghent Belgium --- diff --git a/layouts/default.erb b/layouts/default.erb index ec8e71f..86cc506 100644 --- a/layouts/default.erb +++ b/layouts/default.erb @@ -8,9 +8,6 @@ Zeus WPI | <%= item[:title] || 'Werkgroep Informatica van de Universiteit Gent' %> - - - @@ -40,6 +37,9 @@ <%= asset :css, :main %> + + + <%= content_for(@item, :head) %> diff --git a/layouts/eventpost.erb b/layouts/eventpost.erb index 77b306b..51ec605 100644 --- a/layouts/eventpost.erb +++ b/layouts/eventpost.erb @@ -21,13 +21,23 @@ <%= item[:title] %> + + <% if item[:facebook] %> + + <%= fa :facebook %> + + <% end %> + + <%= fa :calendar %> + +

<%= item[:description] %>

    -
  • <%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y' %>
    • +
  • <%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y %H:%M' %>
  • <%= fa 'map-marker', li: true %><%= item[:location] %>

diff --git a/layouts/partials/_footer.erb b/layouts/partials/_footer.erb index 0e0f7a5..d64bf8f 100644 --- a/layouts/partials/_footer.erb +++ b/layouts/partials/_footer.erb @@ -2,7 +2,7 @@

- Made with <%= fa :heart, inline: true %> by Zeus WPI + Made with <%= fa :heart %> by Zeus WPI

diff --git a/lib/helpers/font_awesome.rb b/lib/helpers/font_awesome.rb index e293685..a9b5ebb 100644 --- a/lib/helpers/font_awesome.rb +++ b/lib/helpers/font_awesome.rb @@ -1,9 +1,11 @@ module FontAwesomeHelper - def fa(icon, size: nil, li: false, inline: false) + def fa(icon, size: nil, li: false, stack: nil, inverse: false) classes = ['fa', "fa-#{icon}"] classes << "fa-#{size}" if size classes << 'fa-li' if li + classes << "fa-stack-#{stack}" if stack + classes << 'fa-inverse' if inverse "" end diff --git a/lib/helpers/ical.rb b/lib/helpers/ical.rb index 6520084..fee375a 100644 --- a/lib/helpers/ical.rb +++ b/lib/helpers/ical.rb @@ -12,7 +12,7 @@ module IcalHelper def event_for(item) event = Icalendar::Event.new event.dtstart = item[:time] - event.summary = 'A great event!' + event.summary = item[:title] event end From 5758ec94e0145cbd0ef601854993c674322dff27 Mon Sep 17 00:00:00 2001 From: Lorin Werthen Date: Sun, 9 Oct 2016 12:08:25 +0200 Subject: [PATCH 4/4] banner -> image --- layouts/partials/_event_preview.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/_event_preview.erb b/layouts/partials/_event_preview.erb index 3b8d715..b635b81 100644 --- a/layouts/partials/_event_preview.erb +++ b/layouts/partials/_event_preview.erb @@ -1,6 +1,6 @@

- +