diff --git a/components/includes/footer.inc b/components/includes/footer.inc
index e3356886fd3ae81214121a061871577f00fd9784..406522f1ea84d718797472f46bf0e03c6aa7110a 100755
--- a/components/includes/footer.inc
+++ b/components/includes/footer.inc
@@ -10,12 +10,14 @@
<li><a href="http://marcus.uib.no/charters"><span class="glyphicon glyphicon-book"></span> Diplom</a></li> -->
</ul>
+<!--
<h3>Sider som må lages</h3>
<ul class="nav">
<li><a href="#">Om nettsiden</a></li>
<li><a href="#">Rettigheter</a></li>
<li><a href="http://marcus.uib.no/technology.html"><span class="glyphicon glyphicon-cog"></span> Teknologi</a></li>
</ul>
+-->
</div>
<div class="col-md-3">
diff --git a/components/services/charters/html.template b/components/services/charters/html.template
index 0f234d90412273e1f515dc6252c3fd479a7a3e13..91eb754f905bed2d18c40d2bcfabbc16fadab927 100755
--- a/components/services/charters/html.template
+++ b/components/services/charters/html.template
@@ -48,8 +48,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/charters/'+ nextPage;
- var prev_uri = 'http://data.ub.uib.no/cherters/'+ prevPage;
+ var next_uri = '{{lodspk.home}}charters/'+ nextPage;
+ var prev_uri = '{{lodspk.home}}charters/'+ prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/collections/html.template b/components/services/collections/html.template
index 2f8094a8591355d866e72f66e4d1f39f41a5a232..82f650d89d37eea25f84d81af2006f484567fb03 100755
--- a/components/services/collections/html.template
+++ b/components/services/collections/html.template
@@ -15,17 +15,17 @@
{% for row in models.main %}
- <div class="col-md-12">
+
<div class="row">
- <div class="col-md-3">
- <img class="img-circle img-responsive pull-left img-featurette" src="{{ row.logo.value }}">
+ <div class="col-md-3 col-sm-3 col-lg-3 hidden-xs">
+ <img class="img-circle img-border img-responsive pull-left img-featurette" src="{{ row.logo.value }}">
</div>
- <div class="col-md-9">
+ <div class="col-md-9 col-sm-9 col-lg-9">
<h3><a href="{{ row.uri.value }}">{{ row.label.value }}</a></h3>
<p>{{ row.description.value }}</p>
</div>
</div>
- </div>
+
{% endfor %}
</div>
diff --git a/components/services/instance%2Fcollection%2Fastrup-samlingen/html.template b/components/services/instance%2Fcollection%2Fastrup-samlingen/html.template
index 4e44f895df9f6ca1890d92ec26c7fd0a053994a7..cdccd13a107997c67f57b0423d4d9a76bad28db4 100755
--- a/components/services/instance%2Fcollection%2Fastrup-samlingen/html.template
+++ b/components/services/instance%2Fcollection%2Fastrup-samlingen/html.template
@@ -56,8 +56,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://marcus.uib.no/instance/collection/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
- var prev_uri = 'http://marcus.uib.no/instance/collection/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
+ var next_uri = '{{lodspk.home}}instance/collection/astrup-samlingen'+'/' + nextPage;
+ var prev_uri = '{{lodspk.home}}instance/collection/astrup-samlingen'+'/' + prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/count.query b/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/count.query
index d9faf0edf575ccfbf3e85a657e7912cb38fdb00b..594c7e79fb139a9d8cb25ca82b1f3ad300bdfc3f 100755
--- a/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/count.query
+++ b/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/count.query
@@ -1,7 +1,5 @@
-SELECT DISTINCT ?o (COUNT(?o) AS ?total) WHERE {
+SELECT (COUNT(?uri) AS ?total) WHERE {
- <{{ uri}}> dct:hasPart ?uri .
- ?uri a ?o .
+ <http://data.ub.uib.no/instance/collection/astrup-samlingen> dct:hasPart ?uri .
-}
-GROUP BY ?o
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/haspart.query b/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/haspart.query
index 20b05c931f8cfe05c5bcb3097d26ea4d1bfbcd98..91d0e7cadcd4e951e0eea459469cfcbdeaf5d6ab 100755
--- a/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/haspart.query
+++ b/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/haspart.query
@@ -1,7 +1,12 @@
-SELECT DISTINCT ?uri ?label ?description WHERE {
- <{{ uri }}> dct:hasPart ?uri .
+SELECT * WHERE {
+ { SELECT DISTINCT ?uri ?label ?description WHERE {
+ <http://data.ub.uib.no/instance/collection/astrup-samlingen> dct:hasPart ?uri .
OPTIONAL { ?uri dct:title ?label . }
OPTIONAL { ?uri rdfs:label ?label . }
OPTIONAL { ?uri dct:description ?description . }
-
-}
\ No newline at end of file
+ }
+ ORDER BY ?label
+ OFFSET {{lodspk.args.arg0|default:0}}
+ LIMIT 100
+ }
+}
diff --git a/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/main.query b/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/main.query
index e11861a30ce60af590a363cc240cb55bdd2a8e9e..7ebaf2e320f96ad602290d8037ab5a46a785be03 100755
--- a/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/main.query
+++ b/components/services/instance%2Fcollection%2Fastrup-samlingen/queries/main.query
@@ -1,5 +1,5 @@
SELECT DISTINCT ?label ?description WHERE {
- OPTIONAL { <{{ uri }}> rdfs:label ?label . }
- OPTIONAL { <{{ uri }}> dct:title ?label . }
- OPTIONAL { <{{ uri }}> dct:description ?description . }
+ OPTIONAL { <http://data.ub.uib.no/instance/collection/astrup-samlingen> rdfs:label ?label . }
+ OPTIONAL { <http://data.ub.uib.no/instance/collection/astrup-samlingen> dct:title ?label . }
+ OPTIONAL { <http://data.ub.uib.no/instance/collection/astrup-samlingen> dct:description ?description . }
}
\ No newline at end of file
diff --git a/components/services/instance%2Fcollection%2Fbrosing-topologiske-katalogkort/html.template b/components/services/instance%2Fcollection%2Fbrosing-topologiske-katalogkort/html.template
index c118500b3c2e72eed0fad53536abfcdd6ba7c243..f8eace588ea84d7ef6550ef320748c5ca896f0bf 100755
--- a/components/services/instance%2Fcollection%2Fbrosing-topologiske-katalogkort/html.template
+++ b/components/services/instance%2Fcollection%2Fbrosing-topologiske-katalogkort/html.template
@@ -53,8 +53,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/instance/collection/brosing-topologiske-katalogkort'+'{{lodspk.args.arg0}}'+'/' + nextPage;
- var prev_uri = 'http://data.ub.uib.no/instance/collection/brosing-topologiske-katalogkort'+'{{lodspk.args.arg0}}'+'/' + prevPage;
+ var next_uri = '{{uri}}'+'{{lodspk.args.arg0}}'+'/' + nextPage;
+ var prev_uri = '{{uri}}'+'{{lodspk.args.arg0}}'+'/' + prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/instance%2Fcollection/html.template b/components/services/instance%2Fcollection/html.template
index 4e44f895df9f6ca1890d92ec26c7fd0a053994a7..94c08fa7ee094f21db0fe15f947d6c445e509610 100755
--- a/components/services/instance%2Fcollection/html.template
+++ b/components/services/instance%2Fcollection/html.template
@@ -56,8 +56,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://marcus.uib.no/instance/collection/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
- var prev_uri = 'http://marcus.uib.no/instance/collection/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
+ var next_uri = '{{lodskp.home}}instance/collection/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
+ var prev_uri = '{{lodskp.home}}instance/collection/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/instance%2Fcollection/queries/count.query b/components/services/instance%2Fcollection/queries/count.query
index 9cdee88570fe542688d82fde93561f088ac6db10..6e88235b074b3a62ae9aeb6cf6e6d324cd3116bf 100755
--- a/components/services/instance%2Fcollection/queries/count.query
+++ b/components/services/instance%2Fcollection/queries/count.query
@@ -1,7 +1,4 @@
-SELECT DISTINCT ?o (COUNT(?o) AS ?total) WHERE {
+SELECT (COUNT(?imgUri) AS ?total) WHERE {
<http://data.ub.uib.no/instance/collection/{{ lodspk.args.arg0 }}> dct:hasPart ?imgUri .
- ?imgUri a ?o .
-
}
-GROUP BY ?o
\ No newline at end of file
diff --git a/components/services/instance%2Fmanuscript/html.template b/components/services/instance%2Fmanuscript/html.template
index 99e01b18e83070752ecd41e7dd460088165b711a..1821031db4e453e0ff3d518fa9c11602afb926be 100755
--- a/components/services/instance%2Fmanuscript/html.template
+++ b/components/services/instance%2Fmanuscript/html.template
@@ -116,8 +116,8 @@
{% endfor %}
</script>
- <script type="text/javascript" src="http://marcus.uib.no/files/js/openseadragon/openseadragon.js"></script>
- <script type="text/javascript" src="http://marcus.uib.no/files/js/ubbdstjfl/ubbdst.js"></script>
+ <script type="text/javascript" src="{{lodspk.home}}files/js/openseadragon/openseadragon.js"></script>
+ <script type="text/javascript" src="{{lodspk.home}}files/js/ubbdstjfl/ubbdst.js"></script>
{% if models.dzi %}
@@ -146,14 +146,14 @@
<script type="text/javascript">
var viewer = OpenSeadragon({
id: "dzi1",
- prefixUrl: "http://marcus.uib.no/files/js/openseadragon/images/",
+ prefixUrl: "{{lodspk.home}}files/js/openseadragon/images/",
tileSources: Ubbdst.firstpage,
minPixelRatio: 0.5
});
var viewer2 = OpenSeadragon({
id: "dzi2",
- prefixUrl: "http://marcus.uib.no/files/js/openseadragon/images/",
+ prefixUrl: "{{lodspk.home}}files/js/openseadragon/images/",
tileSources: Ubbdst.secondpage,
minPixelRatio: 0.5
});
diff --git a/components/services/instance%2Forganization/html.template b/components/services/instance%2Forganization/html.template
index c6a5094aaf0cfc811eb1acb9e575d0f857a5cd2b..6d8f3a79e6e6bbc004996799cd91544b0e87db00 100755
--- a/components/services/instance%2Forganization/html.template
+++ b/components/services/instance%2Forganization/html.template
@@ -69,8 +69,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/instance/organization/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
- var prev_uri = 'http://data.ub.uib.no/instance/organization/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
+ var next_uri = '{{lodspk.home}}instance/organization/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
+ var prev_uri = '{{lodspk.home}}instance/organization/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/instance%2Fperson/html.template b/components/services/instance%2Fperson/html.template
index cb6454514b271dc0a28bff21fc1d305066462355..c9cf29523cd25e6801c2463f5df5f3bad3b0ce89 100755
--- a/components/services/instance%2Fperson/html.template
+++ b/components/services/instance%2Fperson/html.template
@@ -70,8 +70,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/instance/person/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
- var prev_uri = 'http://data.ub.uib.no/instance/person/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
+ var next_uri = '{{lodspk.home}}instance/person/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
+ var prev_uri = '{{lodspk.home}}instance/person/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/instance%2Fspatialthing/html.template b/components/services/instance%2Fspatialthing/html.template
index 30e3557c09308b67218ee4ca469d5d36695b7ff6..c25db08c43a778eb7401bc9275a64203372540f1 100755
--- a/components/services/instance%2Fspatialthing/html.template
+++ b/components/services/instance%2Fspatialthing/html.template
@@ -120,8 +120,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/instance/spatialthing/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
- var prev_uri = 'http://data.ub.uib.no/instance/spatialthing/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
+ var next_uri = '{{lodspk.home}}instance/spatialthing/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
+ var prev_uri = '{{lodspk.home}}instance/spatialthing/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/manuscripts/html.template b/components/services/manuscripts/html.template
index 95b8eceeaea1e7de21bdb181cea3f72d1ed74f5c..cef700d03ab66dbde11788f19cef6a462e88d0c7 100755
--- a/components/services/manuscripts/html.template
+++ b/components/services/manuscripts/html.template
@@ -46,8 +46,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/manuscripts/'+ nextPage;
- var prev_uri = 'http://data.ub.uib.no/manuscripts/'+ prevPage;
+ var next_uri = '{{lodspk.home}}manuscripts/'+ nextPage;
+ var prev_uri = '{{lodspk.home}}manuscripts/'+ prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/organizations/html.template b/components/services/organizations/html.template
index b88696e4d13a06931f60b3ca682a15dd0df08fda..e89f7fa746cedd470f8032fd622b85e0caf5ca2c 100755
--- a/components/services/organizations/html.template
+++ b/components/services/organizations/html.template
@@ -56,8 +56,8 @@
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/organizations/'+ nextPage;
- var prev_uri = 'http://data.ub.uib.no/organizations/'+ prevPage;
+ var next_uri = '{{lodspk.home}}organizations/'+ nextPage;
+ var prev_uri = '{{lodspk.home}}organizations/'+ prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/persons/html.template b/components/services/persons/html.template
index be3f250ba6cf2cc64a0c3e01bdef68f824492b2e..714d83f175ad594fcb57f18e0d65e00af11c2b14 100755
--- a/components/services/persons/html.template
+++ b/components/services/persons/html.template
@@ -56,8 +56,8 @@
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/persons/'+ nextPage;
- var prev_uri = 'http://data.ub.uib.no/persons/'+ prevPage;
+ var next_uri = '{{lodspk.home}}persons/'+ nextPage;
+ var prev_uri = '{{lodspk.home}}persons/'+ prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/photographs/html.template b/components/services/photographs/html.template
index d7724ad482d370e084e53f8cadef153a7dc2a514..ad94b1b2ecc503791a8d7d45e12acb872f57f701 100755
--- a/components/services/photographs/html.template
+++ b/components/services/photographs/html.template
@@ -61,8 +61,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/photographs/'+ nextPage;
- var prev_uri = 'http://data.ub.uib.no/photographs/'+ prevPage;
+ var next_uri = '{{lodspk.home}}photographs/'+ nextPage;
+ var prev_uri = '{{lodspk.home}}photographs/'+ prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/places/html.template b/components/services/places/html.template
index ae8975cdb8d02994298131fbd266060302ba1e6d..41c7e3c4cdb77931588af1ab2b34fff45c55a005 100755
--- a/components/services/places/html.template
+++ b/components/services/places/html.template
@@ -60,8 +60,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/topic/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
- var prev_uri = 'http://data.ub.uib.no/topic/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
+ var next_uri = '{{lodspk.home}}places/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
+ var prev_uri = '{{lodspk.home}}places/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/topic%2Fsubject/html.template b/components/services/topic%2Fsubject/html.template
index 31051c436eb1dd96a3122e8f61a0a8d80367620d..c76ec053c38812e116b4abfd25bcb2aac7f974cd 100755
--- a/components/services/topic%2Fsubject/html.template
+++ b/components/services/topic%2Fsubject/html.template
@@ -62,8 +62,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://data.ub.uib.no/topic/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
- var prev_uri = 'http://data.ub.uib.no/topic/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
+ var next_uri = '{{lodspk.home}}topic/subject/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
+ var prev_uri = '{{lodspk.home}}topic/subject/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/services/topic/html.template b/components/services/topic/html.template
index f2243ee7078e9a2532dc7eeb1ec1dd8e39f43e07..476e43168a3091d9df200f98d0d59f49dcfbcce5 100755
--- a/components/services/topic/html.template
+++ b/components/services/topic/html.template
@@ -80,8 +80,8 @@
var offset = 100;
var nextPage = page+offset;
var prevPage = page - offset;
- var next_uri = 'http://marcus.uib.no/topic/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
- var prev_uri = 'http://marcus.uib.no/topic/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
+ var next_uri = '{{lodspk.home}}topic/'+'{{lodspk.args.arg0}}'+'/' + nextPage;
+ var prev_uri = '{{lodspk.home}}topic/'+'{{lodspk.args.arg0}}'+'/' + prevPage;
</script>
<ul class="pager">
<li><a href="" id="prev">Forrige 100</a></li>
diff --git a/components/static/img/krigstrykk.png b/components/static/img/krigstrykk.png
new file mode 100644
index 0000000000000000000000000000000000000000..166ab5bf1acf7dbd54478a02ba2af4aa519cb6db
Binary files /dev/null and b/components/static/img/krigstrykk.png differ
diff --git a/components/static/index.html b/components/static/index.html
index ee915aa79e3da16fe8a947aad388baf651b03449..0dbefe7bcd1d43a438175d428b2504bd8e94397b 100755
--- a/components/static/index.html
+++ b/components/static/index.html
@@ -213,7 +213,7 @@
<div class="carousel-caption">
<h1>Manuskript- og librarsamlingen</h1>
<p>Manuskript- og librarsamlingen er et fellesnavn for en rekke samlinger med forskjellig materiale knyttet til Avdeling for spesialsamlinger</p>
- <p><a class="btn btn-large btn-primary" href="#">Se samlingene</a></p>
+ <p><a class="btn btn-large btn-primary" href="{{lodspk.home}}collections">Se samlingene</a></p>
</div>
</div>
</div>
@@ -264,7 +264,7 @@
<img class="img-circle img-responsive pull-left img-featurette" src="img/ubb-ms-28-circle.png">
</div>
<div class="col-md-8">
- <h3>Manuskripsamlingen</h3>
+ <h3>Manuskriptsamlingen</h3>
<p>Manuskriptsamlingen inneholder håndskrevet og upublisert arkivmateriale. Store deler av den har vesentlig bergensk og vestnorsk interesse, men meget av samlingens lokalhistoriske stoff har rikspolitisk interesse på grunn av den dominerende stilling Bergen har spilt i norsk økonomisk, sosial og kulturell historie.</p>
<p><a class="btn btn-default" href="/instance/collection/manuskriptsamlingen">Se mer »</a></p>
</div>
@@ -281,11 +281,23 @@
</div>
<div class="col-md-8">
<h3>Astrup-samlingen</h3>
- <p>Trenger beskrivelse</p>
+ <p>Billedkunstneren Nikolai Johannes Astrup (1880 -1928) var en sentral billedkunstner rundt år 1900. Manuskript- og brevmaterialet som presenteres her er kommet til UB Bergens Spesialsamlinger over en årrekke, og er derfor hentet fra flere forskjellige håndskriftsamlinger i biblioteket. De mange private brevvekslingene mellom Astrup og venneparet Ågot og Per Kramer er et sentralt innslag i materialet, men her er også brever til flere kulturpersonligheter som for eksempel Haakon Shetelig og mer manuskriptpreget materiale.</p>
<p><a class="btn btn-default" href="/instance/collection/astrup-samlingen">Se mer »</a></p>
</div>
</div>
+
+ <div class="hidden-xs hidden-sm col-md-6">
+ <div class="hidden-xs hidden-sm col-lg-4 col-md-4">
+ <img class="img-circle img-border img-responsive pull-left img-featurette" src="img/krigstrykk.png">
+ </div>
+ <div class="col-md-8">
+ <h3>Krigstrykk</h3>
+ <p>Universitetsbibliotekets krigstrykksamling inneholder en rekke forskjellige typer trykk, utgitt i perioden 1940-45. Herunder hører norske og danske illegale aviser, engelske og amerikanske flyveblader, opprop, løpesedler og forskjellige andre typer propaganda-materiale.</p>
+ <p><a class="btn btn-default" href="/instance/collection/krigstrykk">Se mer »</a></p>
+ </div>
+ </div>
+
<!-- <div class="hidden-xs hidden-sm col-md-6">
<div class="col-lg-4 col-md-4">
<img class="img-circle img-responsive pull-left img-featurette" src="img/christie-circle.png">