summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2016-11-08 10:16:25 +0100
committerschneefux <schneefux+commit@schneefux.xyz>2016-11-08 10:16:25 +0100
commit6fcef93f580f9f47172cdfee5453f5021bc8e88b (patch)
tree0ea9030390bb2fceec5f36817ff879d6994e5b34
parentc65f7d8dd45ed96307e9045ca6f6eeec4a6a9383 (diff)
downloadpragblog-6fcef93f580f9f47172cdfee5453f5021bc8e88b.tar.gz
pragblog-6fcef93f580f9f47172cdfee5453f5021bc8e88b.zip
map shortcode -> theme
-rw-r--r--content/restaurants/el_pueblo_mexicana.md5
-rw-r--r--content/restaurants/u_graffu.md5
-rw-r--r--layouts/shortcodes/map.html153
-rw-r--r--layouts/shortcodes/rate.html13
-rw-r--r--themes/flog/layouts/_default/single.html155
5 files changed, 161 insertions, 170 deletions
diff --git a/content/restaurants/el_pueblo_mexicana.md b/content/restaurants/el_pueblo_mexicana.md
index 33e62c1..c4d7a9c 100644
--- a/content/restaurants/el_pueblo_mexicana.md
+++ b/content/restaurants/el_pueblo_mexicana.md
@@ -4,6 +4,9 @@ date: 2016-11-02
title: Restaurant el pueblo mexicana
image: mexicana.jpg
rating: 5
+latitude: 50.079595
+longitude: 14.4249872
+mapzoom: 17
---
Ein mexikanisches Restaurant am Wenzelsplatz.
@@ -18,5 +21,3 @@ Karten gab es aus tschechisch und englisch, was die Sache nicht zwingend einfach
Alle am Tisch waren zufrieden mit ihrem Essen, die Bedienungen waren alle nett und eine sprach sogar gebrochen Deutsch. Insgesamt war es ein schönes Essen, was nicht teuer war, so kostenden meine Tostadas gerade einmal 180 Kronen und ich habe es nicht einmal geschafft diese aufzuessen.
Das Restaurant verdient meiner Meinung nach 5 Sterne, da ich selbst nicht mal einen Kritikpunkt gefunden habe. Also kann ich es auf jeden Fall weiter empfehlen, da ich mich selbst schon ärgere es erst bei der letzten Gelegenheit ausprobiert habe.
-
-{{< map zoom="17" lat="50.079595" lon="14.4249872" >}}
diff --git a/content/restaurants/u_graffu.md b/content/restaurants/u_graffu.md
index 995118a..3c6dada 100644
--- a/content/restaurants/u_graffu.md
+++ b/content/restaurants/u_graffu.md
@@ -4,6 +4,9 @@ date: 2016-11-02
title: Restaurant U Graffu
image: ugraffu.jpg
rating: 4
+latitude: 50.075192
+longitude: 14.4272207
+mapzoom: 17
---
Burger und Chips am Wenzelsplatz.
@@ -16,5 +19,3 @@ Zum ersten Mal war ich Dienstagabend dort, da ich aber in Zuge von FLOG ein sehr
Auf Grund der positiven Erfahrungen am Vorabend und der vergleichsweise geringen Entfernung zum Hotel entschied ich mich am Mittwochmittag dort noch einmal zu speisen. Dieses Mal viel meine Wahl auf den Cheeseburger, um einen Vergleich zum Vortag ziehen zu können. Dieser war dann auch tatsächlich besser, als der am Vortag und hat damit die volle Punktzahl verdient. Die Pommesmenge war zwar nicht sonderlich ergiebig, jedoch war der Burger sehr groß, sodass man auch gut satt wurde. Jedoch erschien mir die Bedienung ein wenig mürrischer, als die vom Vortag.
Alles in allem denke ich, anders als die schlechte Google Bewertung mit 2,7, dass das Restaurant 4 wenn nicht sogar 4,5 Sterne verdient hat und dass falls ich noch einmal nach Prag fahre ich dort wieder einkehren werde.
-
-{{< map zoom="17" lat="50.075192" lon="14.4272207" >}}
diff --git a/layouts/shortcodes/map.html b/layouts/shortcodes/map.html
deleted file mode 100644
index c2f6d11..0000000
--- a/layouts/shortcodes/map.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<div class="section">
- <div id="loadingmap" class="preloader-wrapper small active" style="left: 45%;">
- <div class="spinner-layer spinner-blue-only">
- <div class="circle-clipper left">
- <div class="circle"></div>
- </div><div class="gap-patch">
- <div class="circle"></div>
- </div><div class="circle-clipper right">
- <div class="circle"></div>
- </div>
- </div>
- </div>
- <div id="mapview" style="width: 100%; height: 40em;"></div>
- <script type="text/javascript">
- var map,
- mapboxReadyAttached;
-
- if (typeof $ === 'undefined') {
- document.addEventListener('DOMContentLoaded', loadMapbox);
- }
- if (typeof mapboxReadyAttached === 'undefined') {
- mapboxReadyAttached = true;
- document.addEventListener('pageReady', loadMapbox);
- }
-
- function loadMapbox() {
- if ($('#mapview').length == 0) return; // map is inactive
-
- if (typeof mapboxgl === 'undefined') {
- console.log('loading mapbox files');
- $('<link>').appendTo('head')
- .attr({type: 'text/css', rel: 'stylesheet'})
- .attr('href', 'https://api.mapbox.com/mapbox-gl-js/v0.22.1/mapbox-gl.css');
- $.getScript('https://api.mapbox.com/mapbox-gl-js/v0.23.0/mapbox-gl.js', initMapbox);
- } else {
- console.log('mapbox files already present');
- initMapbox();
- }
- }
-
- function loadFallback() {
- if (typeof L === 'undefined') {
- console.log('loading mapbox fallback files');
- $('<link>').appendTo('head')
- .attr({type: 'text/css', rel: 'stylesheet'})
- .attr('href', 'https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.css');
- $.getScript('https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.js', initFallback);
- } else {
- console.log('mapbox fallback files already present');
- initFallback();
- }
- }
-
- function initMapbox() {
- if (mapboxgl.supported() === false) {
- console.log('MapboxGL unsupported, loading fallback');
- loadFallback();
- return;
- }
- console.log('creating new map instance');
- var lon = parseFloat({{ .Get "lon" }}),
- lat = parseFloat({{ .Get "lat" }}),
- zoom= parseFloat({{ .Get "zoom" }});
-
- if (typeof map !== 'undefined') {
- console.log('killed old map');
- map.remove();
- }
-
- mapboxgl.accessToken = 'pk.eyJ1IjoiY29kZS13dnMiLCJhIjoiY2lzNHM4bWUwMDAwdTJ0cDBjYms5em9hYSJ9.VLxxJ6aTbWUbQchg58tgkA';
- map = new mapboxgl.Map({
- pitch: 60,
- bearing: 45,
- container: 'mapview',
- style: 'mapbox://styles/mapbox/basic-v9',
- center: [lon, lat],
- zoom: zoom
- });
- map.on('load', showMapbox);
- }
-
- function initFallback() {
- console.log('creating new map fallback instance');
- var lon = parseFloat({{ .Get "lon" }}),
- lat = parseFloat({{ .Get "lat" }}),
- zoom= parseFloat({{ .Get "zoom" }});
- if (typeof map !== 'undefined') {
- console.log('killed old map for fallback');
- map.remove();
- }
- L.mapbox.accessToken = 'pk.eyJ1IjoiY29kZS13dnMiLCJhIjoiY2lzNHM4bWUwMDAwdTJ0cDBjYms5em9hYSJ9.VLxxJ6aTbWUbQchg58tgkA';
- map = L.mapbox.map('mapview')
- .setView([lat, lon], zoom);
- var layer = L.mapbox.tileLayer('mapbox.streets').addTo(map);
- layer.on('ready', showFallback);
- }
-
- /* ! mapboxgl: [lon, lat] - mapboxjs: [lat, lon]… */
- function showMapbox() {
- var lon = parseFloat({{ .Get "lon" }}),
- lat = parseFloat({{ .Get "lat" }}),
- zoom= parseFloat({{ .Get "zoom" }});
-
- console.log('updating map data', [lon, lat, zoom]);
-
- map.setCenter([lon, lat]);
- map.setZoom(zoom);
-
- var markers = {
- "type": "FeatureCollection",
- "features": [{
- "type": "Feature",
- "properties": {
- "icon": "fast-food"
- },
- "geometry": {
- "type": "Point",
- "coordinates": [lon, lat]
- }
- }]
- };
-
- if (!map.getSource('markers')) {
- map.addSource('markers', {
- 'type': 'geojson',
- 'data': markers
- });
- map.addLayer({
- "id": "markers",
- "type": "symbol",
- "source": "markers",
- "layout": {
- "icon-image": "{icon}-15"
- }
- });
- }
- $('#loadingmap').hide();
- $('#mapview').show();
- }
-
- function showFallback() {
- var lon = parseFloat({{ .Get "lon" }}),
- lat = parseFloat({{ .Get "lat" }}),
- zoom= parseFloat({{ .Get "zoom" }});
-
- console.log('updating fallback map data', [lon, lat, zoom]);
- map.setView([lat, lon], zoom);
- L.marker([lat, lon]).addTo(map);
- $('#loadingmap').hide();
- $('#mapview').show();
- }
- </script>
- </div>
diff --git a/layouts/shortcodes/rate.html b/layouts/shortcodes/rate.html
deleted file mode 100644
index 130b28e..0000000
--- a/layouts/shortcodes/rate.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<i class="material-icons">
-{{ range seq (.Get 0) }}
-star
-{{ end }}
-{{ $len := 5 }}
-{{/* handle halves here */}}
-{{ if eq 4 $len }}
-star_half
-{{ end }}
-{{ range seq (sub $len (int (.Get 0))) }}
-star_border
-{{ end }}
-</i>
diff --git a/themes/flog/layouts/_default/single.html b/themes/flog/layouts/_default/single.html
index b9165d7..13b62d5 100644
--- a/themes/flog/layouts/_default/single.html
+++ b/themes/flog/layouts/_default/single.html
@@ -27,6 +27,161 @@
<section itemprop="articleBody" class="flow-text">
{{ .Content }}
</section>
+ {{ if .Params.mapzoom }}
+ <div class="section">
+ <div id="loadingmap" class="preloader-wrapper small active" style="left: 45%;">
+ <div class="spinner-layer spinner-blue-only">
+ <div class="circle-clipper left">
+ <div class="circle"></div>
+ </div><div class="gap-patch">
+ <div class="circle"></div>
+ </div><div class="circle-clipper right">
+ <div class="circle"></div>
+ </div>
+ </div>
+ </div>
+ <div id="mapview" style="width: 100%; height: 40em;"></div>
+ <script type="text/javascript">
+ var map,
+ mapboxReadyAttached;
+
+ if (typeof $ === 'undefined') {
+ document.addEventListener('DOMContentLoaded', loadMapbox);
+ }
+ if (typeof mapboxReadyAttached === 'undefined') {
+ mapboxReadyAttached = true;
+ document.addEventListener('pageReady', loadMapbox);
+ }
+
+ function loadMapbox() {
+ if ($('#mapview').length == 0) return; // map is inactive
+
+ if (typeof mapboxgl === 'undefined') {
+ console.log('loading mapbox files');
+ $('<link>').appendTo('head')
+ .attr({type: 'text/css', rel: 'stylesheet'})
+ .attr('href', 'https://api.mapbox.com/mapbox-gl-js/v0.22.1/mapbox-gl.css');
+ $.getScript('https://api.mapbox.com/mapbox-gl-js/v0.23.0/mapbox-gl.js', initMapbox);
+ } else {
+ console.log('mapbox files already present');
+ initMapbox();
+ }
+ }
+
+ function loadFallback() {
+ if (typeof L === 'undefined') {
+ console.log('loading mapbox fallback files');
+ $('<link>').appendTo('head')
+ .attr({type: 'text/css', rel: 'stylesheet'})
+ .attr('href', 'https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.css');
+ $.getScript('https://api.mapbox.com/mapbox.js/v2.4.0/mapbox.js', initFallback);
+ } else {
+ console.log('mapbox fallback files already present');
+ initFallback();
+ }
+ }
+
+ function initMapbox() {
+ if (mapboxgl.supported() === false) {
+ console.log('MapboxGL unsupported, loading fallback');
+ loadFallback();
+ return;
+ }
+ console.log('creating new map instance');
+ var lon = parseFloat({{ .Params.longitude }}),
+ lat = parseFloat({{ .Params.latitude }}),
+ zoom= parseFloat({{ .Params.mapzoom }});
+
+ if (typeof map !== 'undefined') {
+ console.log('killed old map');
+ map.remove();
+ }
+
+ mapboxgl.accessToken = 'pk.eyJ1IjoiY29kZS13dnMiLCJhIjoiY2lzNHM4bWUwMDAwdTJ0cDBjYms5em9hYSJ9.VLxxJ6aTbWUbQchg58tgkA';
+ map = new mapboxgl.Map({
+ pitch: 60,
+ bearing: 45,
+ container: 'mapview',
+ style: 'mapbox://styles/mapbox/basic-v9',
+ center: [lon, lat],
+ zoom: zoom
+ });
+ map.on('load', showMapbox);
+ }
+
+ function initFallback() {
+ console.log('creating new map fallback instance');
+ var lon = parseFloat({{ .Params.longitude }}),
+ lat = parseFloat({{ .Params.latitude }}),
+ zoom= parseFloat({{ .Params.mapzoom }});
+ if (typeof map !== 'undefined') {
+ console.log('killed old map for fallback');
+ map.remove();
+ }
+ L.mapbox.accessToken = 'pk.eyJ1IjoiY29kZS13dnMiLCJhIjoiY2lzNHM4bWUwMDAwdTJ0cDBjYms5em9hYSJ9.VLxxJ6aTbWUbQchg58tgkA';
+ map = L.mapbox.map('mapview')
+ .setView([lat, lon], zoom);
+ var layer = L.mapbox.tileLayer('mapbox.streets').addTo(map);
+ layer.on('ready', showFallback);
+ }
+
+ /* ! mapboxgl: [lon, lat] - mapboxjs: [lat, lon]… */
+ function showMapbox() {
+ var lon = parseFloat({{ .Params.longitude }}),
+ lat = parseFloat({{ .Params.latitude }}),
+ zoom= parseFloat({{ .Params.mapzoom }});
+
+ console.log('updating map data', [lon, lat, zoom]);
+
+ map.setCenter([lon, lat]);
+ map.setZoom(zoom);
+
+ var markers = {
+ "type": "FeatureCollection",
+ "features": [{
+ "type": "Feature",
+ "properties": {
+ "icon": "fast-food"
+ },
+ "geometry": {
+ "type": "Point",
+ "coordinates": [lon, lat]
+ }
+ }]
+ };
+
+ if (!map.getSource('markers')) {
+ map.addSource('markers', {
+ 'type': 'geojson',
+ 'data': markers
+ });
+ map.addLayer({
+ "id": "markers",
+ "type": "symbol",
+ "source": "markers",
+ "layout": {
+ "icon-image": "{icon}-15"
+ }
+ });
+ }
+ $('#loadingmap').hide();
+ $('#mapview').show();
+ }
+
+ function showFallback() {
+ var lon = parseFloat({{ .Params.longitude }}),
+ lat = parseFloat({{ .Params.latitude }}),
+ zoom= parseFloat({{ .Params.mapzoom }});
+
+ console.log('updating fallback map data', [lon, lat, zoom]);
+ map.setView([lat, lon], zoom);
+ L.marker([lat, lon]).addTo(map);
+ $('#loadingmap').hide();
+ $('#mapview').show();
+ }
+ </script>
+ </div> <!-- /map section -->
+ {{ end }}
</article>
</main>
</div>