Merge remote-tracking branch 'origin/master' into gala-avond

Gemfile

@@ -22,6 +22,7 @@ gem 'autoprefixer-rails'
 group :development do
   gem 'adsf'
   gem 'highline'
+  gem 'terminal-notifier-guard'
 end
 
 group :nanoc do

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

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
 

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;
+  }
+}

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;
   }
 }

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!
+# It's that time of year again
-Hou alvast de datum vrij!
 
-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.

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
 ---

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
 ---

content/projects/12urenloop.md

@@ -2,6 +2,7 @@
 title: 12urenloop
 description: Application to count laps based on bluetooth dongle detection. <a href="http://12urenloop.be">http://12urenloop.be</a>
 github: https://github.com/ZeusWPI/12urenloop
+site: https://12urenloop.be/
 logo_letter: L
 logo_color: "#6094DB"
 ---

content/projects/badass_bottle_bats.md

@@ -2,6 +2,7 @@
 title: Badass Bottle Bats
 description: A bot writing contest. <a href="https://zeus.ugent.be/bottlebats">https://zeus.ugent.be/bottlebats</a>
 github: https://github.com/ZeusWPI/aichallenge
+site: https://zeus.ugent.be/bottlebats/
 logo_letter: B
 logo_color: "#FFD062"
 ---

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. <br>
+  Vind de map <a href='http://blok.ugent.be/'>hier</a>!"
+github: https://github.com/ZeusWPI/blokmap
+site: http://blok.ugent.be/
+logo_letter: B
+logo_color: "#E0FFFF"
+---

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"
 ---

content/projects/gamification.md

@@ -0,0 +1,10 @@
+---
+title: Gamification
+description: "
+  Gamification of Zeus member engagement. Get points for coding!
+  View the <a href='https://zeus.ugent.be/game'>scoreboard</a>."
+github: https://github.com/ZeusWPI/Gamification
+site: https://zeus.ugent.be/game
+logo_letter: G
+logo_color: "#F08080"
+---

content/projects/gandalf.md

@@ -2,6 +2,7 @@
 title: Gandalf
 description: You Shall Not Pass - An advanced e-ticket system for student clubs - <a href="http://event.fkgent.be">http://event.fkgent.be</a>
 github: https://github.com/ZeusWPI/Gandalf
+site: https://event.fkgent.be/
 logo_letter: G
 logo_color: "#F3F8F4"
 ---

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! <a href="http://zeus.ugent.be/haldis">http://zeus.ugent.be/haldis</a>
-github: http://zeus.ugent.be/haldis
+github: https://github.com/ZeusWPI/Haldis
+site: https://zeus.ugent.be/haldis
 logo_letter: H
 logo_color: black
 ---

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"
 ---

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
 ---

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"
 ---

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. <a href="https://zeus.ugent.be/tab">https://zeus.ugent.be/tab</a>
 github: https://github.com/ZeusWPI/Tab
+site: https://zeus.ugent.be/tab/
 logo_letter: T
 logo_color: "#BAFEA3"
 ---

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. <a href="https://zeus.ugent.be/tap">https://zeus.ugent.be/tap</a>
 github: https://github.com/ZeusWPI/Tap
+site: https://zeus.ugent.be/tap/
 logo_letter: T
 logo_color: "#BAFEA3"
 ---

layouts/default.erb

@@ -8,9 +8,6 @@
       Zeus WPI | <%= item[:title] || 'Werkgroep Informatica van de Universiteit Gent' %>
     </title>
 
-    <!-- Font Awesome -->
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous">
-
     <link rel="icon" href="/assets/images/favicon32.png" type="image/x-icon" />
 
     <script src="https://code.jquery.com/jquery-3.0.0.min.js" charset="utf-8"></script>
@@ -40,6 +37,9 @@
 
     <%= asset :css, :main %>
 
+    <!-- Font Awesome -->
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-T8Gy5hrqNKT+hzMclPo118YTQO6cYprQmhrYwIiQ/3axmI1hQomh7Ud2hPOy8SP1" crossorigin="anonymous">
+
     <%= content_for(@item, :head) %>
   </head>
   <body class="site">

layouts/eventpost.erb

@@ -1,11 +1,15 @@
 <% content_for :head do %>
-<meta property="og:image" content="<%= item[:banner] %>" />
+<meta property="og:image" content="<%= item[:image] %>" />
 <meta property="og:title" content="<%= item[:title] %>" />
 <meta property="og:type" content="article" />
 <meta property="og:url" content="<%= url_for(item) %>" />
 <% end %>
 
+<% if item[:banner] %>
+<section class="hero is-medium is-primary is-bold" style="background-image:url('<%= item[:banner] %>');">
+<% else %>
 <section class="hero is-medium is-primary is-bold">
+<% end %>
   <div class="hero-head">
     <%= render '/partials/_navbar.*', zeus_logo_color: :white %>
   </div>
@@ -17,20 +21,30 @@
             <b>
               <%= item[:title] %>
             </b>
+            <span class="event-social-icons">
+              <% if item[:facebook] %>
+              <a href="<%= item[:facebook] %>">
+                <%= fa :facebook %>
+              </a>
+              <% end %>
+              <a href="<%= item.path rep: :ical %>">
+                <%= fa :calendar %>
+              </a>
+            </span>
           </p>
           <p class="subtitle is-3">
             <%= item[:description] %>
           </p>
           <p class="subtitle is-3">
             <ul class="fa-ul event-attributes">
-              <li><%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y' %></li>
+              <li><%= fa 'clock-o', li: true %><%= item[:time].strftime '%A %d %B %Y %H:%M' %></li>
               <li><%= fa 'map-marker', li: true %><%= item[:location] %></li>
             </ul>
           </p>
         </div>
 
         <div class="is-narrow column banner-image">
-          <img src="<%= item[:banner] %>"  >
+          <img src="<%= item[:image] %>"  >
         </div>
       </div>
     </div>

layouts/partials/_event_preview.erb

@@ -1,6 +1,6 @@
 <div class="box event-preview">
   <div class="image-holder">
-    <img src="<%= event[:banner]%>" alt="" class="image" />
+    <img src="<%= event[:image]%>" alt="" class="image" />
   </div>
 
   <div class="box info">

layouts/partials/_footer.erb

@@ -2,7 +2,7 @@
   <div class="container">
     <div class="content has-text-centered">
       <p>
-        Made with <%= fa :heart, inline: true %> by Zeus WPI
+        Made with <%= fa :heart %> by Zeus WPI
       </p>
       <p>
         <a href="https://github.com/ZeusWPI/zeus.ugent.be">

layouts/partials/_project.erb

@@ -6,7 +6,7 @@
       </div>
     </div>
     <div class="column">
-      <p class="title"><%=project[:title]%></p>
+      <p class="title"><a href="<%=project[:site]%>" target="_self"><%=project[:title]%></a></p>
       <p class="description subtitle"><%=project[:description]%></p>
       <div><a href="<%=project[:github]%>">GitHub<span class="icon"><i class="fa fa-github"></i></span></a></div>
     </div>

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
 
     "<i class='#{classes.join(' ')}'></i>"
   end

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