9 files changed, 32 insertions, 52 deletions
diff --git a/templates/article.mdwn b/templates/article.mdwn
index 7fdc6528..bd209fc4 100644
--- a/templates/article.mdwn
+++ b/templates/article.mdwn
@@ -1,4 +1,4 @@
-[[!meta title="Fængende titel"]]
+[[!meta title="Artikelskabelon"]]
 
 [[!if test="included()" then="""
 
@@ -11,7 +11,7 @@ Manchetten, vises
 """
 else="""
 
-#Overskrift
+# Overskrift
 
 indledning, evt samme som manchet.
 
@@ -21,8 +21,8 @@ indledning, evt samme som manchet.
 
 [[Læs mere |/vejviseren/artikellink]]
 
-##Kilder
-Schifters Bådlaug på Holmen har afsnit om områdets historie på sin hjemmeside <http://www.baadlaug.dk>  
+## Kilder
+Schifters Bådlaug på Holmen har afsnit om områdets historie på sin hjemmeside <https://www.baadlaug.dk>  
 København Før nu og Aldrig, 2. udgave 1998 bind 12-13  
 Københavns Stadsarkiv  
 
diff --git a/templates/deco.mdwn b/templates/deco.mdwn
new file mode 100644
index 00000000..d6bd3ff9
--- /dev/null
+++ b/templates/deco.mdwn
@@ -0,0 +1,3 @@
+<div class="deco">
+<TMPL_VAR text>
+</div>
diff --git a/templates/grid-item.mdwn b/templates/grid-item.mdwn
new file mode 100644
index 00000000..fd2226ae
--- /dev/null
+++ b/templates/grid-item.mdwn
@@ -0,0 +1,3 @@
+<div class="grid-item">
+<TMPL_VAR content>
+</div>
diff --git a/templates/grid.mdwn b/templates/grid.mdwn
new file mode 100644
index 00000000..c75a9fe6
--- /dev/null
+++ b/templates/grid.mdwn
@@ -0,0 +1,3 @@
+<div class="grid">
+<TMPL_VAR content>
+</div>
diff --git a/templates/map.mdwn b/templates/map.mdwn
index a2e953ed..679fadaf 100644
--- a/templates/map.mdwn
+++ b/templates/map.mdwn
@@ -1,43 +1,5 @@
-[[!meta stylesheet=map rel="stylesheet"]]
+[[!meta stylesheet=map title="" rel="stylesheet"]]
+[[!meta stylesheet=css/map title="" rel="stylesheet"]]
 
 <div id="map"></div>
-<script src="/usr/share/javascript/leaflet/leaflet.js"></script>
-<script><TMPL_IF stamen>
-var attribOSM = 'Kartografi &copy; <a href="https://stamen.com/">Stamen Design</a>'
- +' under en <a href="https://creativecommons.org/licenses/by/3.0">Creative Commons Kreditering</a> licens.'
- +' Data &copy; <a href="https://www.openstreetmap.org/copyright#contributors">OpenStreetMap-bidragydere</a>'
- +' under <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a> licens';
-var OSMLayer = L.tileLayer('https://stamen-tiles.a.ssl.fastly.net/<TMPL_VAR stamen>/{z}/{x}/{y}.png', { attribution: attribOSM } );<TMPL_ELSE><TMPL_IF stamen-old>
-var attribOSM = 'Kartografi &copy; <a href="https://stamen.com/">Stamen Design</a>'
- +' under en <a href="https://creativecommons.org/licenses/by/3.0">Creative Commons Kreditering</a> licens.'
- +' Data &copy; <a href="https://www.openstreetmap.org/copyright#contributors">OpenStreetMap-bidragydere</a>'
- +' under en <a href="http://creativecommons.org/licenses/by-sa/3.0">Creative Commons Kreditering-DelPåSammeVilkår</a> licens';
-var OSMLayer = L.tileLayer('https://stamen-tiles.a.ssl.fastly.net/<TMPL_VAR stamen-old>/{z}/{x}/{y}.png', { attribution: attribOSM } );<TMPL_ELSE>
-var attribOSM = 'Kartografi &copy; <a href="https://www.openstreetmap.org/copyright#contributors">OpenStreetMap-bidragydere</a>'
- +' under en <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Kreditering-DelPåSammeVilkår</a> licens.';
- +' Data &copy; <a href="http://osmfoundation.org/">OpenStreetMap Foundation</a>'
- +' under <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a> licens';
-var OSMLayer = L.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: attribOSM } );</TMPL_IF></TMPL_IF>
-var Box = L.latLngBounds( [[<TMPL_VAR bounds-nw>],[<TMPL_VAR bounds-se>]] );
-var map = L.map('content', { layers: [OSMLayer] }).fitBounds(Box);
-map.attributionControl.setPrefix(false);
-
-L.control.scale({ imperial: false }).addTo(map);
-
-<TMPL_IF positionpopup>
-function round(n,d) {
-	return Math.round(Math.pow(10,d)*n)/Math.pow(10,d)
-};
-function latLngString(latLng) {
-	return round(latLng.lat,5) + ", " + round(latLng.lng,5)
-};
-var popup = L.popup();
-function positionPopup(e) {
-	popup
-		.setLatLng(e.latlng)
-		.setContent("Position (lat, long):<br>" + latLngString(e.latlng))
-		.openOn(map);
-}
-map.on('contextmenu', positionPopup);
-</TMPL_IF>
-</script>
+<script src="/js/lib/require.js" data-main="/js/tours" type="text/javascript"></script>
diff --git a/templates/note-linked.mdwn b/templates/note-linked.mdwn
new file mode 100644
index 00000000..fa96dc01
--- /dev/null
+++ b/templates/note-linked.mdwn
@@ -0,0 +1,7 @@
+[[!templatebody <<ENDBODY
+<a href="<TMPL_VAR link>">
+<div class="notebox">
+<TMPL_VAR text>
+</div>
+</a>
+ENDBODY]]
diff --git a/templates/overview.mdwn b/templates/overview.mdwn
index 5cd9a0ca..d3e41d89 100644
--- a/templates/overview.mdwn
+++ b/templates/overview.mdwn
@@ -10,13 +10,13 @@ Kort introtekst til oversigtsbrug. Få oversigter optræder dog selv i oversigte
 """
 else="""
 
-#Overskrift
+# Overskrift
 
 Introafsnit til bydelen 
 
 ## Standardture
 
-[[!inline pages="link(tag/tours) and link(tag/whatever)"]]
+[[!inline pages="tagged(tours) and tagged(whatever)"]]
 
 
 """]]
diff --git a/templates/tour.mdwn b/templates/tour.mdwn
index 43fbcb01..7e79afbb 100644
--- a/templates/tour.mdwn
+++ b/templates/tour.mdwn
@@ -10,13 +10,15 @@ Kort beskrivende appetitvækker på et par linier, fungerer som tekst i turovers
 """
 else="""
 
+[[!template id="deco" text="
 [[!img /img/billednavn.jpg class=deco]]
 [[!img /img/billednavn.jpg class=deco]]
 [[!img /img/billednavn.jpg class=deco]]
 [[!img /img/billednavn.jpg class=deco]]
+"]]
 
-#Overskrift
-##Evt underoverskrift
+# Overskrift
+## Evt underoverskrift
 
 Selve turbeskrivelsen.
 
diff --git a/templates/video.mdwn b/templates/video.mdwn
index b745baf7..0b8f18ad 100644
--- a/templates/video.mdwn
+++ b/templates/video.mdwn
@@ -1,11 +1,11 @@
 <div class="video">
 <h2><TMPL_VAR title></h2>
-<video width="<TMPL_VAR width>" height="<TMPL_VAR height>" preload controls>
+<video width="<TMPL_VAR width>" height="<TMPL_VAR height>" preload controls poster="//media.bynu.biks.dk/<TMPL_VAR stem>.jpg">
 <source src="//media.bynu.biks.dk/<TMPL_VAR stem>.mp4"  type="video/mp4" />
 <TMPL_UNLESS nowebm><source src="//media.bynu.biks.dk/<TMPL_VAR stem>.webm" type="video/webm" />
 </TMPL_UNLESS><TMPL_UNLESS noogg><source src="//media.bynu.biks.dk/<TMPL_VAR stem>.ogv"  type="video/ogg" />
-</TMPL_UNLESS><object width="<TMPL_VAR width>" height="<TMPL_VAR height>" type="application/x-shockwave-flash" data="http://vjs.zencdn.net/4.7/video-js.swf">
-<param name="movie" value="http://vjs.zencdn.net/4.7/video-js.swf" />
+</TMPL_UNLESS><object width="<TMPL_VAR width>" height="<TMPL_VAR height>" type="application/x-shockwave-flash" data="https://vjs.zencdn.net/4.7/video-js.swf">
+<param name="movie" value="https://vjs.zencdn.net/4.7/video-js.swf" />
 <param name="flashvars" value="src=//media.bynu.biks.dk/<TMPL_VAR stem>.mp4&amp;preload=true" />
 <img src="//media.bynu.biks.dk/<TMPL_VAR stem>.jpg" width="<TMPL_VAR width>" height="<TMPL_VAR height>" alt="<TMPL_VAR title>"
  title="Ingen videounderstøttelse, hent videoen i stedet." />