fixed merge conflict from not pulling
This commit is contained in:
jerodcle
commit
21ca746454
2 changed files with 126 additions and 136 deletions
128
index.html
128
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>
|
||||
|
|
|
|||
134
map.html
134
map.html
|
|
@ -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>
|
||||
Loading…
Reference in a new issue