From bc580e5860e5db19177a3c5419d4fd1bfc8892ef Mon Sep 17 00:00:00 2001
From: feliciaan <feliciaan@zeus.ugent.be>
Date: Thu, 7 May 2015 19:53:24 +0200
Subject: [PATCH 1/5] Updated the json data

---
 data.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data.json b/data.json
index 1c8ea77..30fe3ac 100644
--- a/data.json
+++ b/data.json
@@ -128,7 +128,7 @@
         "name": "Faculteit Rechten, faculteitsbibliotheek",
         "address": "Universiteitstraat 4, verdieping 1",
         "capacity": 227,
-        "period": { "start": "??/??/2015", "end": "??/??/2015" },
+        "period": { "start": "5/5/2015", "end": "30/6/2015" },
         "hours": {
             "monday": "8u30 - 19u",
             "tuesday": "8u30 - 19u",
@@ -296,7 +296,7 @@
         "name": "BYTES & BOOKS LERA",
         "address": "K.L. Ledeganckstraat 8",
         "capacity": 110,
-        "period": { "start": "??/??/2015", "end": "??/??/2015" },
+        "period": { "start": "5/5/2015", "end": "30/06/2015" },
         "hours": {
             "monday": "8u15 - 18u",
             "tuesday": "8u15 - 18u",
@@ -344,7 +344,7 @@
         "name": "BYTES & BOOKS BIJLOKE",
         "address": "J. Kluyskensstraat 2",
         "capacity": 44,
-        "period": { "start": "??/??/2015", "end": "??/??/2015" },
+        "period": { "start": "5/5/2015", "end": "30/6/2015" },
         "hours": {
             "monday": "8u30 - 17u",
             "tuesday": "8u30 - 17u",
@@ -368,7 +368,7 @@
         "name": "BYTES & BOOKS CONSERVATORIUM",
         "address": "Hoogpoort 64",
         "capacity": 15,
-        "period": { "start": "??/??/2015", "end": "??/??/2015" },
+        "period": { "start": "5/5/2015", "end": "30/6/2015" },
         "hours": {
             "monday": "10u - 12u<br />12u45 - 16u15",
             "tuesday": "10u - 12u<br />12u45 - 16u15",
@@ -392,7 +392,7 @@
         "name": "BYTES & BOOKS MELLE",
         "address": "Brusselsesteenweg 161",
         "capacity": 50,
-        "period": { "start": "??/??/2015", "end": "??/??/2015" },
+        "period": { "start": "5/5/2015", "end": "30/6/2015" },
         "hours": {
             "monday": "9u - 12u30<br />13u - 17u",
             "tuesday": "8u30u - 12u30<br />13u - 17u",

From 0cb823c5a0c2bcb3c34912b1a9d834d5154b3a93 Mon Sep 17 00:00:00 2001
From: feliciaan <feliciaan@zeus.ugent.be>
Date: Fri, 8 May 2015 00:12:32 +0200
Subject: [PATCH 2/5] Updated the data.json

---
 data.json | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/data.json b/data.json
index 30fe3ac..030e5cb 100644
--- a/data.json
+++ b/data.json
@@ -42,7 +42,7 @@
             "saturday": "8u30 - 22u",
             "sunday": "8u30 - 22u"
         },
-        "extra": "Enkel weekend, kerstverlof en feestdagen,Registratie noodzakelijk! Registreer <a href=\"http://student.UGent.be/blok_kantien/\">hier</a>. Vanaf 9u kunnen studenten zonder registratie toegang krijgen.",
+        "extra": "Enkel weekend en feestdagen,Registratie noodzakelijk! Registreer <a href=\"http://student.UGent.be/blok_kantien/\">hier</a>. Vanaf 9u kunnen studenten zonder registratie toegang krijgen.",
         "type": "UGent"
     }
 },
@@ -128,7 +128,7 @@
         "name": "Faculteit Rechten, faculteitsbibliotheek",
         "address": "Universiteitstraat 4, verdieping 1",
         "capacity": 227,
-        "period": { "start": "5/5/2015", "end": "30/6/2015" },
+        "period": { "start": "11/5/2015", "end": "26/6/2015" },
         "hours": {
             "monday": "8u30 - 19u",
             "tuesday": "8u30 - 19u",
@@ -152,7 +152,7 @@
         "name": "Faculteit Bio-Ingenieurswetenschappen, faculteitsbibliotheek.",
         "address": "Coupure 653",
         "capacity": 68,
-        "period": { "start": "18/05/2015", "end": "02/07/2015" },
+        "period": { "start": "18/05/2015", "end": "2/7/2015" },
         "hours": {
             "monday": "9u - 19u",
             "tuesday": "9u - 19u",
@@ -498,7 +498,31 @@
             "saturday": "10u - 18u",
             "sunday": "10u - 18u"
         },
-        "extra": "Gesloten op Pinkstermaandag.",
+        "extra": "Open op Pinkstermaandag.",
+        "type": "Stad Gent"
+    }
+},
+{
+    "type": "Feature",
+    "geometry": {
+        "type": "Point",
+        "coordinates": [3.726478, 51.056233]
+    },
+    "properties": {
+        "name": "Jeugddienst Gent",
+        "address": "Kammerstraat 10",
+        "capacity": 36,
+        "period": { "start": "19/05/2015", "end": "18/06/2015" },
+        "hours": {
+            "monday": false,
+            "tuesday": false,
+            "wednesday": false,
+            "thursday": false,
+            "friday": false,
+            "saturday": "9u - 18u",
+            "sunday": "9u - 18u"
+        },
+        "extra": false,
         "type": "Stad Gent"
     }
 },

From 8b32c781c3ed719d580dffc5bfb5b5d92f609842 Mon Sep 17 00:00:00 2001
From: feliciaan <feliciaan@zeus.ugent.be>
Date: Tue, 12 May 2015 13:00:59 +0200
Subject: [PATCH 3/5] Added 't Unief

---
 data.json | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/data.json b/data.json
index 030e5cb..67a0d7b 100644
--- a/data.json
+++ b/data.json
@@ -238,6 +238,30 @@
         "type": "UGent"
     }
 },
+{
+    "type": "Feature",
+    "geometry": {
+        "type": "Point",
+        "coordinates": [3.726433, 51.044644]
+    },
+    "properties": {
+        "name": "Blok@'t Unief'",
+        "address": "Sint-Pietersnieuwstraat 204",
+        "capacity": 300,
+        "period": { "start": "19/5/2015", "end": "30/06/2015" },
+        "hours": {
+            "monday": "10u-18u",
+            "tuesday": "10u-18u",
+            "wednesday": "10u-18u",
+            "thursday": "10u-18u",
+            "friday": "10u-18u",
+            "saturday": "10u-18u",
+            "sunday": "10u-18u"
+        },
+        "extra": "Registratie noodzakelijk! Registreer <a href=\"http://student.UGent.be/blok_tunief/\">hier</a>. Vanaf 11u kunnen studenten zonder registratie toegang krijgen.",
+        "type": "UGent"
+    }
+},
 {
     "type": "Feature",
     "geometry": {

From 89ca8c2ae64a155e22d1888645955cc262fd3716 Mon Sep 17 00:00:00 2001
From: jerodcle <Jeroen.DeClerck@UGent.be>
Date: Wed, 13 May 2015 23:14:56 +0200
Subject: [PATCH 4/5] quick fix for marker overlap

---
 data.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data.json b/data.json
index 67a0d7b..85cab68 100644
--- a/data.json
+++ b/data.json
@@ -74,7 +74,7 @@
     "type": "Feature",
     "geometry": {
         "type": "Point",
-        "coordinates": [ 3.724770, 51.045507 ]
+        "coordinates": [ 3.725000, 51.045507 ]
     },
     "properties": {
         "name": "Faculteit Letteren en Wijsbegeerte, PC-klas en bloklokaal Rozier",

From ca64494cbbdf57686d590898aa575e0846e1e03c Mon Sep 17 00:00:00 2001
From: feliciaan <feliciaan@zeus.ugent.be>
Date: Fri, 22 May 2015 01:03:17 +0200
Subject: [PATCH 5/5] move map.html to index.html, simplify shizzle

---
 index.html | 128 +++++++++++++++++++++++++++++++++++++++++++++++++-
 map.html   | 134 -----------------------------------------------------
 2 files changed, 126 insertions(+), 136 deletions(-)
 delete mode 100644 map.html

diff --git a/index.html b/index.html
index 5965d0e..43b8f3f 100644
--- a/index.html
+++ b/index.html
@@ -2,9 +2,133 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>Blokken in Gent</title>
+  <title>Bloklocaties in Gent</title>
+  <meta name="apple-itunes-app" content="app-id=602640924">
+  <meta name="google-play-app" content="app-id=be.ugent.zeus.hydra">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+
+  <meta property="og:site_name" content="Zeus WPI">
+  <meta property="og:type" content="article">
+  <meta property="og:title" content="Bloklocaties in Gent">
+  <meta property="og:description" content="Samenhokken om te blokken? Er zijn maar liefst 4000 zitjes in Gent om dat te doen. Schamper en Zeus maakten een overzicht!">
+  <meta property="og:url" content="//zeus.ugent.be/blok/">
+  <meta property="og:image" content="//zeus.ugent.be/blok/img/share.jpg">
+
+  <meta name="twitter:card" content="summary">
+  <meta name="twitter:url" content="//zeus.ugent.be/blok/">
+  <meta name="twitter:title" content="Bloklocaties in Gent">
+  <meta name="twitter:description" content="Samenhokken om te blokken? Er zijn maar liefst 4000 zitjes in Gent om dat te doen. Schamper en Zeus maakten een overzicht!">
+  <meta name="twitter:image" content="//zeus.ugent.be/blok/img/share.jpg">
+
+  <link rel="stylesheet" href="css/leaflet.css" />
+  <link rel="stylesheet" href="css/map.css" />
+
+  <script type="text/javascript" src="js/leaflet.js"></script>
+  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+  <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/2.0.0/handlebars.min.js"></script>
+  <script type="text/javascript" src="js/map.js"></script>
 </head>
 <body>
-  <iframe id="iframe" src="map.html" style="width: 1000px; height: 500px"></iframe>
+  <div id="map"></div>
+  <script id="popup-template" type="text/x-handlebars-template">
+    <div id="resto-popup">
+      <h3>{{name}} ({{capacity}} pl.)</h3>
+      <img src="img/{{type}}.png" class="type">
+      <div class="text">Locatie: {{address}}<br />
+      Van {{period.start}} tot {{period.end}}
+      </div>
+      <h4>Openingsuren</h4>
+      <table class="desktop">
+      <tr>
+      <td>Maandag</td>
+        <td>Dinsdag</td>
+        <td>Woensdag</td>
+        <td>Donderdag</td>
+        <td>Vrijdag</td>
+        <td>Zaterdag</td>
+        <td>Zondag</td>
+      </tr>
+      <tr>
+        <td>{{#if hours.monday}}{{{hours.monday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.tuesday}}{{{hours.tuesday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.wednesday}}{{{hours.wednesday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.thursday}}{{{hours.thursday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.friday}}{{{hours.friday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.saturday}}{{{hours.saturday}}}{{else}}Gesloten{{/if}}</td>
+        <td>{{#if hours.sunday}}{{{hours.sunday}}}{{else}}Gesloten{{/if}}</td>
+      </tr>
+      </table>
+      <table class="mobile">
+        <tr>
+          <td>Maandag</td>
+          <td>{{#if hours.monday}}{{{hours.monday}}}{{else}}Gesloten{{/if}}</td>
+        </tr>
+        <tr>
+            <td>Dinsdag</td>
+            <td>{{#if hours.tuesday}}{{{hours.tuesday}}}{{else}}Gesloten{{/if}}</td>
+        </tr>
+        <tr>
+            <td>Woensdag</td>
+            <td>{{#if hours.wednesday}}{{{hours.wednesday}}}{{else}}Gesloten{{/if}}</td>
+        </tr>
+        <tr>
+            <td>Donderdag</td>
+            <td>{{#if hours.thursday}}{{{hours.thursday}}}{{else}}Gesloten{{/if}}</td>
+        </tr><tr>
+            <td>Vrijdag</td>
+            <td>{{#if hours.friday}}{{{hours.friday}}}{{else}}Gesloten{{/if}}</td>
+        </tr>
+        <tr>
+            <td>Zaterdag</td>
+            <td>{{#if hours.saturday}}{{{hours.saturday}}}{{else}}Gesloten{{/if}}</td>
+        </tr>
+        <tr>
+            <td>Zondag</td>
+            <td>{{#if hours.sunday}}{{{hours.sunday}}}{{else}}Gesloten{{/if}}</td>
+        </tr>
+      </table>
+      {{#if extra}}{{{extra}}}{{/if}}
+    </div>
+  </script>
+  <script id="info-template" type="text/x-handlebars-template">
+    <a href="http://schamper.be/"><img id="schamper" src="img/schamper.png"></a>
+    <a href="http://zeus.ugent.be/"><img id="zeus" src="img/zeus.png"></a>
+  </script>
+  <script id="share-template" type="text/x-handlebars-template">
+    <div class="fb-share-button" data-href="//zeus.ugent.be/blok/" data-layout="button_count"></div>
+  </script>
+  <script id="legend-template" type="text/x-handlebars-template">
+    <div style="padding-top: 5px;">
+        <div style="width: 125px; height: 18px; padding-top: 5px; padding-left: 5px;">
+            <div style="height: 10px; width: 10px; background: rgb(209,39,35); margin-top: -1px; margin-left: 5px;"></div>
+            <span style="position: absolute; left: 25px; top: 5px;">Week en weekend</span>
+        </div>
+        <div style="width: 125px; height: 18px; padding-top: 5px; padding-left: 5px;">
+            <div style="height: 10px; width: 10px; background: rgb(36, 126, 202); margin-top: 1px; margin-left: 5px;"></div>
+            <span style="position: absolute; left: 25px; top: 30px;">Enkel week</span>
+        </div>
+    </div>
+  </script>
+
+  <!-- Facebook SDK -->
+  <div id="fb-root"></div>
+  <script>(function(d, s, id) {
+      var js, fjs = d.getElementsByTagName(s)[0];
+      if (d.getElementById(id)) return;
+      js = d.createElement(s); js.id = id;
+      js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&appId=146947948791011&version=v2.0";
+      fjs.parentNode.insertBefore(js, fjs);
+  }(document, 'script', 'facebook-jssdk'));</script>
+  <!-- Google Analytics SDK -->
+  <script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', 'UA-25444917-8', 'auto');
+  ga('send', 'pageview');
+
+  </script>
 </body>
 </html>
diff --git a/map.html b/map.html
deleted file mode 100644
index 142ed51..0000000
--- a/map.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <title>Bloklocaties in Gent</title>
-  <meta name="apple-itunes-app" content="app-id=602640924">
-  <meta name="google-play-app" content="app-id=be.ugent.zeus.hydra">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-
-  <meta property="og:site_name" content="Zeus WPI">
-  <meta property="og:type" content="article">
-  <meta property="og:title" content="Bloklocaties in Gent">
-  <meta property="og:description" content="Samenhokken om te blokken? Er zijn maar liefst 4000 zitjes in Gent om dat te doen. Schamper en Zeus maakten een overzicht!">
-  <meta property="og:url" content="//zeus.ugent.be/blok/">
-  <meta property="og:image" content="//zeus.ugent.be/blok/img/share.jpg">
-
-  <meta name="twitter:card" content="summary">
-  <meta name="twitter:url" content="//zeus.ugent.be/blok/">
-  <meta name="twitter:title" content="Bloklocaties in Gent">
-  <meta name="twitter:description" content="Samenhokken om te blokken? Er zijn maar liefst 4000 zitjes in Gent om dat te doen. Schamper en Zeus maakten een overzicht!">
-  <meta name="twitter:image" content="//zeus.ugent.be/blok/img/share.jpg">
-
-  <link rel="stylesheet" href="css/leaflet.css" />
-  <link rel="stylesheet" href="css/map.css" />
-  
-  <script type="text/javascript" src="js/leaflet.js"></script>
-  <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-  <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/handlebars.js/2.0.0/handlebars.min.js"></script>
-  <script type="text/javascript" src="js/map.js"></script>
-</head>
-<body>
-  <div id="map"></div>
-  <script id="popup-template" type="text/x-handlebars-template">
-    <div id="resto-popup">
-      <h3>{{name}} ({{capacity}} pl.)</h3>
-      <img src="img/{{type}}.png" class="type">
-      <div class="text">Locatie: {{address}}<br />
-      Van {{period.start}} tot {{period.end}}
-      </div>
-      <h4>Openingsuren</h4>
-      <table class="desktop">
-      <tr>
-      <td>Maandag</td>
-        <td>Dinsdag</td>
-        <td>Woensdag</td>
-        <td>Donderdag</td>
-        <td>Vrijdag</td>
-        <td>Zaterdag</td>
-        <td>Zondag</td>
-      </tr>
-      <tr>
-        <td>{{#if hours.monday}}{{{hours.monday}}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.tuesday}}{{{hours.tuesday}}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.wednesday}}{{{hours.wednesday}}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.thursday}}{{{hours.thursday}}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.friday}}{{{hours.friday}}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.saturday}}{{{hours.saturday}}}{{else}}Gesloten{{/if}}</td>
-        <td>{{#if hours.sunday}}{{{hours.sunday}}}{{else}}Gesloten{{/if}}</td>
-      </tr>
-      </table>
-      <table class="mobile">
-        <tr>
-          <td>Maandag</td>
-          <td>{{#if hours.monday}}{{{hours.monday}}}{{else}}Gesloten{{/if}}</td>
-        </tr>
-        <tr>
-            <td>Dinsdag</td>
-            <td>{{#if hours.tuesday}}{{{hours.tuesday}}}{{else}}Gesloten{{/if}}</td>
-        </tr>
-        <tr>
-            <td>Woensdag</td>
-            <td>{{#if hours.wednesday}}{{{hours.wednesday}}}{{else}}Gesloten{{/if}}</td>
-        </tr>
-        <tr>
-            <td>Donderdag</td>
-            <td>{{#if hours.thursday}}{{{hours.thursday}}}{{else}}Gesloten{{/if}}</td>
-        </tr><tr>
-            <td>Vrijdag</td>
-            <td>{{#if hours.friday}}{{{hours.friday}}}{{else}}Gesloten{{/if}}</td>
-        </tr>
-        <tr>
-            <td>Zaterdag</td>
-            <td>{{#if hours.saturday}}{{{hours.saturday}}}{{else}}Gesloten{{/if}}</td>
-        </tr>
-        <tr>
-            <td>Zondag</td>
-            <td>{{#if hours.sunday}}{{{hours.sunday}}}{{else}}Gesloten{{/if}}</td>
-        </tr>
-      </table>
-      {{#if extra}}{{{extra}}}{{/if}}
-    </div>
-  </script>
-  <script id="info-template" type="text/x-handlebars-template">
-    <a href="http://schamper.be/"><img id="schamper" src="img/schamper.png"></a>
-    <a href="http://zeus.ugent.be/"><img id="zeus" src="img/zeus.png"></a>
-  </script>
-  <script id="share-template" type="text/x-handlebars-template">
-    <div class="fb-share-button" data-href="//zeus.ugent.be/blok/" data-layout="button_count"></div>
-  </script>
-  <script id="legend-template" type="text/x-handlebars-template">
-    <div style="padding-top: 5px;">
-        <div style="width: 125px; height: 18px; padding-top: 5px; padding-left: 5px;">
-            <div style="height: 10px; width: 10px; background: rgb(209,39,35); margin-top: -1px; margin-left: 5px;"></div>
-            <span style="position: absolute; left: 25px; top: 5px;">Week en weekend</span>
-        </div>
-        <div style="width: 125px; height: 18px; padding-top: 5px; padding-left: 5px;">
-            <div style="height: 10px; width: 10px; background: rgb(36, 126, 202); margin-top: 1px; margin-left: 5px;"></div>
-            <span style="position: absolute; left: 25px; top: 30px;">Enkel week</span>
-        </div>
-    </div>
-  </script>
-
-  <!-- Facebook SDK -->
-  <div id="fb-root"></div>
-  <script>(function(d, s, id) {
-      var js, fjs = d.getElementsByTagName(s)[0];
-      if (d.getElementById(id)) return;
-      js = d.createElement(s); js.id = id;
-      js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&appId=146947948791011&version=v2.0";
-      fjs.parentNode.insertBefore(js, fjs);
-  }(document, 'script', 'facebook-jssdk'));</script>
-  <!-- Google Analytics SDK -->
-  <script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-25444917-8', 'auto');
-  ga('send', 'pageview');
-
-  </script>
-</body>
-</html>