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 8b63afe..1021106 100644 --- a/content/events/16-17/LAN.md +++ b/content/events/16-17/LAN.md @@ -1,15 +1,28 @@ --- title: Geeks, Attack! V -banner: https://scontent.xx.fbcdn.net/v/t1.0-9/13903431_1277596932251344_3927837466166230371_n.jpg?oh=bdda0d18a635c49893a097fba6aa99b9&oe=587C7886 +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/ --- -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. + +# 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 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 7b1153d..e3fddef 100644 --- a/content/events/16-17/datacenter.md +++ b/content/events/16-17/datacenter.md @@ -1,9 +1,9 @@ --- 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 +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 939a0df..1f0524b 100644 --- a/content/events/16-17/lip.md +++ b/content/events/16-17/lip.md @@ -1,9 +1,9 @@ --- 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 +time: 5-10-2016 17:00 location: Zeus kelder, S9 locationlink: Sterre,Ghent Belgium --- diff --git a/content/projects/12urenloop.md b/content/projects/12urenloop.md index 29004bc..0886786 100644 --- a/content/projects/12urenloop.md +++ b/content/projects/12urenloop.md @@ -2,6 +2,7 @@ title: 12urenloop description: Application to count laps based on bluetooth dongle detection. http://12urenloop.be github: https://github.com/ZeusWPI/12urenloop +site: https://12urenloop.be/ logo_letter: L logo_color: "#6094DB" --- diff --git a/content/projects/badass_bottle_bats.md b/content/projects/badass_bottle_bats.md index b2d2cbb..75bea5d 100644 --- a/content/projects/badass_bottle_bats.md +++ b/content/projects/badass_bottle_bats.md @@ -2,6 +2,7 @@ title: Badass Bottle Bats description: A bot writing contest. https://zeus.ugent.be/bottlebats github: https://github.com/ZeusWPI/aichallenge +site: https://zeus.ugent.be/bottlebats/ logo_letter: B logo_color: "#FFD062" --- diff --git a/content/projects/blokmap.md b/content/projects/blokmap.md new file mode 100644 index 0000000..0812cef --- /dev/null +++ b/content/projects/blokmap.md @@ -0,0 +1,10 @@ +--- +title: BlokMap +description: " + Een collectie bloclokaties die jou helpt een plaats te vinden om te blokken tijdens de examens.
+ Vind de map hier!" +github: https://github.com/ZeusWPI/blokmap +site: http://blok.ugent.be/ +logo_letter: B +logo_color: "#E0FFFF" +--- diff --git a/content/projects/fk_enrolment.md b/content/projects/fk_enrolment.md index 589f5df..b49ddde 100644 --- a/content/projects/fk_enrolment.md +++ b/content/projects/fk_enrolment.md @@ -2,6 +2,7 @@ title: FK Enrolment. description: Enrolment system for new members of FK-clubs at Ghent University. github: https://github.com/ZeusWPI/FK-enrolment +site: https://registratie.fkgent.be/ logo_letter: E logo_color: "#FFBBDD" --- diff --git a/content/projects/gamification.md b/content/projects/gamification.md new file mode 100644 index 0000000..495136d --- /dev/null +++ b/content/projects/gamification.md @@ -0,0 +1,10 @@ +--- +title: Gamification +description: " + Gamification of Zeus member engagement. Get points for coding! + View the scoreboard." +github: https://github.com/ZeusWPI/Gamification +site: https://zeus.ugent.be/game +logo_letter: G +logo_color: "#F08080" +--- diff --git a/content/projects/gandalf.md b/content/projects/gandalf.md index 63e9c4c..c81829a 100644 --- a/content/projects/gandalf.md +++ b/content/projects/gandalf.md @@ -2,6 +2,7 @@ title: Gandalf description: You Shall Not Pass - An advanced e-ticket system for student clubs - http://event.fkgent.be github: https://github.com/ZeusWPI/Gandalf +site: https://event.fkgent.be/ logo_letter: G logo_color: "#F3F8F4" --- diff --git a/content/projects/haldis.md b/content/projects/haldis.md index fd874d6..8884c04 100644 --- a/content/projects/haldis.md +++ b/content/projects/haldis.md @@ -1,7 +1,8 @@ --- title: Haldis description: Haldis is your friendly neighbourhood servant. He exists so lazy fucks like you and me don't need to keep tabs of who is ordering what from where. Start an order and let people add items with a simple mouse-click! No more calculating prices and making lists! Be lazier today! http://zeus.ugent.be/haldis -github: http://zeus.ugent.be/haldis +github: https://github.com/ZeusWPI/Haldis +site: https://zeus.ugent.be/haldis logo_letter: H logo_color: black --- diff --git a/content/projects/lana.md b/content/projects/lana.md index a2fce76..fa35ef9 100644 --- a/content/projects/lana.md +++ b/content/projects/lana.md @@ -2,6 +2,7 @@ title: Lana description: 🐕 LAN-Party Assistant. An application to make the life of a LAN-partygoer easier! github: https://github.com/ZeusWPI/Lana +site: https://github.com/ZeusWPI/Lana logo_letter: L logo_color: "#E4C6A7" --- diff --git a/content/projects/saruman.md b/content/projects/saruman.md index 8a8be05..28341f3 100644 --- a/content/projects/saruman.md +++ b/content/projects/saruman.md @@ -2,6 +2,7 @@ title: Saruman description: Saruman is a material management tool where partners can reserve stuff. github: https://github.com/ZeusWPI/Saruman +site: https://materiaal.12urenloop.be/ logo_letter: S logo_color: grey --- diff --git a/content/projects/slotmachien.md b/content/projects/slotmachien.md index 4168f73..672d5aa 100644 --- a/content/projects/slotmachien.md +++ b/content/projects/slotmachien.md @@ -2,6 +2,7 @@ title: SlotMachien description: This repository contains all applications related to SlotMachien; a Lego MindStorms robot designed to turn a specific lock. github: https://github.com/ZeusWPI/slotmachien +site: https://github.com/ZeusWPI/slotmachien logo_letter: S logo_color: "#FFF06A" --- diff --git a/content/projects/tab.md b/content/projects/tab.md index 5af4e0c..cba0f13 100644 --- a/content/projects/tab.md +++ b/content/projects/tab.md @@ -2,6 +2,7 @@ title: Tab description: 💰 Yes. We have to drink. But we also have to pay. This does the paying part. https://zeus.ugent.be/tab github: https://github.com/ZeusWPI/Tab +site: https://zeus.ugent.be/tab/ logo_letter: T logo_color: "#BAFEA3" --- diff --git a/content/projects/tap.md b/content/projects/tap.md index a7ee600..f9c9528 100644 --- a/content/projects/tap.md +++ b/content/projects/tap.md @@ -2,6 +2,7 @@ title: Tap description: 💰 Yes. We have to drink. But we also have to pay. This does the drinking part. https://zeus.ugent.be/tap github: https://github.com/ZeusWPI/Tap +site: https://zeus.ugent.be/tap/ logo_letter: T logo_color: "#BAFEA3" --- 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 9e9df0e..51ec605 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 %>
@@ -17,20 +21,30 @@ <%= item[:title] %> + + <% if item[:facebook] %> + + <%= fa :facebook %> + + <% end %> + + <%= fa :calendar %> + +

<%= item[:description] %>

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 @@
- +
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/layouts/partials/_project.erb b/layouts/partials/_project.erb index 80362c6..6c9aea9 100644 --- a/layouts/partials/_project.erb +++ b/layouts/partials/_project.erb @@ -6,7 +6,7 @@

-

<%=project[:title]%>

+

<%=project[:title]%>

<%=project[:description]%>

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