Commit 68e5b0a4 authored by Oyvind.Gjesdal's avatar Oyvind.Gjesdal
Browse files

Merge branch '25-tidslinjer-har-fallt-ut' into 'master'

Resolve "Tidslinjer har fallt ut"

Closes #25

See merge request !25
parents a1238e53 0ad29670
......@@ -27,11 +27,11 @@
</div>
</div>
<div class="container-fluid">
<iframe style="border-top: 1px solid #eee; margin-bottom: 20px;" src='http://timemapper.okfnlabs.org/tarjelavik/danielssen?embed=1' width='100%' height='750' frameborder='0'></iframe>
<iframe style="border-top: 1px solid #eee; margin-bottom: 20px;" src='https://timemapper.okfnlabs.org/tarjelavik/danielssen?embed=1' width='100%' height='750' frameborder='0'></iframe>
</div>
</div>
</div>
{%include "../../includes/footer.inc"%}
</body>
</html>
../../../../../../../../media/img/danielssen/dcd_katalog.pdf
\ No newline at end of file
../../../../../../../../media/img/danielssen/dcd_katalog.pdf
......@@ -27,7 +27,7 @@
</div>
</div>
<div class="container-fluid">
<iframe style="border-top: 1px solid #eee; margin-bottom: 20px;" src='http://cdn.knightlab.com/libs/timeline/latest/embed/index.html?source=0Ajz2PzxiR2_7dDJfWEZEakVVR2hxamxIRHZIRGQ1M2c&font=Georgia-Helvetica&maptype=toner&start_zoom_adjust4&lang=no&hash_bookmark=true&height=750' width='100%' height='750' frameborder='0'></iframe>
<iframe style="border-top: 1px solid #eee; margin-bottom: 20px;" src='https://cdn.knightlab.com/libs/timeline/latest/embed/index.html?source=0Ajz2PzxiR2_7dDJfWEZEakVVR2hxamxIRHZIRGQ1M2c&font=Georgia-Helvetica&maptype=toner&start_zoom_adjust4&lang=no&hash_bookmark=true&height=750' width='100%' height='750' frameborder='0'></iframe>
</div>
</div>
</div>
......
......@@ -214,7 +214,7 @@ $('#dotNav li').click(function(){
<div class="row">
<hr>
<div class="col-md-12">
<iframe src="http://timemapper.okfnlabs.org/tarjelavik/den-reisende-christie?embed=1" frameborder="0" style="border: none;" width="100%" height="700;"></iframe>
<iframe src="https://timemapper.okfnlabs.org/tarjelavik/den-reisende-christie?embed=1" frameborder="0" style="border: none;" width="100%" height="700;"></iframe>
</div>
</div>
......@@ -246,7 +246,7 @@ $('#dotNav li').click(function(){
<div class="row">
<hr>
<div class="col-md-12">
<iframe src="http://timemapper.okfnlabs.org/tarjelavik/tidslinje-cristie-tingreiser?embed=1" frameborder="0" style="border: none;" width="100%" height="780;"></iframe>
<iframe src="https://timemapper.okfnlabs.org/tarjelavik/tidslinje-cristie-tingreiser?embed=1" frameborder="0" style="border: none;" width="100%" height="780;"></iframe>
</div>
</div>
......@@ -275,7 +275,7 @@ Lenke til tingboka: I tingbøkene for Nordhordland, som er å finna ved Statsark
<div class="row">
<hr>
<div class="col-md-12">
<iframe src="http://timemapper.okfnlabs.org/tarjelavik/tidslinje-cristie-politiske-reiser?embed=1" frameborder="0" style="border: none;" width="100%" height="780;"></iframe>
<iframe src="https://timemapper.okfnlabs.org/tarjelavik/tidslinje-cristie-politiske-reiser?embed=1" frameborder="0" style="border: none;" width="100%" height="780;"></iframe>
</div>
</div>
......
......@@ -37,7 +37,7 @@
<!-- BEGIN TIDSLINJE -->
<div class="container-fluid">
<h2 class="h1 text-center">Handlingsforløp</h2>
<iframe style="border-top: 1px solid #eee; margin-bottom: 20px;" src="http://timemapper.okfnlabs.org/tarjelavik/slaget-paa-vaagen?embed=1" width='100%' height='750' frameborder='0'></iframe>
<iframe style="border-top: 1px solid #eee; margin-bottom: 20px;" src="https://timemapper.okfnlabs.org/tarjelavik/slaget-paa-vaagen?embed=1" width='100%' height='750' frameborder='0'></iframe>
</div>
......@@ -1140,4 +1140,4 @@
</script>
</body>
</html>
\ No newline at end of file
</html>
......@@ -46,7 +46,7 @@
</div>
<div class="container-fluid">
<h2 class="h1 text-center">Handlingsforløp</h2>
<iframe style="border-top: 1px solid #eee; margin-bottom: 20px;" src="http://timemapper.okfnlabs.org/tarjelavik/strilekrigen?embed=1" width='100%' height='750' frameborder='0'></iframe>
<iframe style="border-top: 1px solid #eee; margin-bottom: 20px;" src="https://timemapper.okfnlabs.org/tarjelavik/strilekrigen?embed=1" width='100%' height='750' frameborder='0'></iframe>
</div>
<div style="background-color: black; color: #ddd;" class="container-fluid">
......@@ -2138,4 +2138,4 @@ Berit Vetlejord (Åsane).</p>
</script>
</body>
</html>
\ No newline at end of file
</html>
......@@ -82,7 +82,7 @@
<hr>
{% if first.main.timeline.value %}
{% if not first.main.timeline.value | null %}
<div id="timeline-embed"></div>
<!-- BEGIN TimelineJS -->
<script>
......@@ -100,10 +100,10 @@
};
</script>
<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
<!-- always load the CSS -->
<link rel="stylesheet" type="text/css" href="http://cdn.knightlab.com/libs/timeline/latest/css/timeline.css">
<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/timeline-min.js"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.knightlab.com/libs/timeline/latest/css/timeline.css">
<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/timeline-min.js"></script>
<!-- END TimelineJS -->
{% endif %}
......
......@@ -92,10 +92,10 @@
};
</script>
<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js"></script>
<!-- always load the CSS -->
<link rel="stylesheet" type="text/css" href="http://cdn.knightlab.com/libs/timeline/latest/css/timeline.css">
<script type="text/javascript" src="http://cdn.knightlab.com/libs/timeline/latest/js/timeline-min.js"></script>
<link rel="stylesheet" type="text/css" href="https://cdn.knightlab.com/libs/timeline/latest/css/timeline.css">
<script type="text/javascript" src="https://cdn.knightlab.com/libs/timeline/latest/js/timeline-min.js"></script>
<!-- END TimelineJS -->
{% endif %}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment