From e0cba939b54adab6dd923a45d8a2972286366fff Mon Sep 17 00:00:00 2001
From: oyvind <oyvindlg@gmail.com>
Date: Tue, 16 May 2017 11:05:28 +0200
Subject: [PATCH] modified, deleted and changed files, batch.

---
 components/includes/header.inc                |   3 +-
 components/includes/nav.inc                   |   2 +-
 .../exhibition%2Fdanielssen/html.template     |   3 +-
 components/services/exhibition/html.template  | 146 +++++------
 .../services/exhibition/queries/haspart.query |   1 +
 .../exhibition/queries/timeline.query         |  18 +-
 .../services/exhibitions/queries/main.query   |  55 +++-
 components/services/home/html.template        |  13 +-
 .../home/queries/latestdocuments.query        |  39 ---
 .../instance%2Fcollection/html.template       |  12 +-
 .../instance%2Forganization/html.template     |   3 +
 .../queries/main.query                        |  11 +-
 .../services/instance%2Fperson/html.template  |   6 +-
 components/services/search/html.template      | 235 ------------------
 .../services/search/queries/main.queryX       |  17 --
 components/static/cart.html                   |  32 +--
 components/static/css/basic.css               |  23 ++
 components/static/css/print.css               |  24 +-
 components/static/success.html                |   2 +-
 components/static/technology.html             |   2 +-
 components/types/bibo__Document/html.template |  62 +++--
 .../types/bibo__Document/queries/dzi.query    |   2 +-
 .../types/ubbont__Charter/html.template       |   7 +-
 .../types/ubbont__Photograph/html.template    |  95 ++++---
 .../types/ubbont__Postcard/html.template      |  21 +-
 robots.txt                                    |   2 +-
 26 files changed, 348 insertions(+), 488 deletions(-)
 delete mode 100644 components/services/home/queries/latestdocuments.query
 delete mode 100755 components/services/search/html.template
 delete mode 100755 components/services/search/queries/main.queryX

diff --git a/components/includes/header.inc b/components/includes/header.inc
index 77edf6a7..2042a318 100755
--- a/components/includes/header.inc
+++ b/components/includes/header.inc
@@ -30,6 +30,7 @@
 	<script src="//netdna.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
 
 	<link href="{{lodspk.home}}css/basic.css" rel="stylesheet" type="text/css" media="screen" />
+	<link href="{{lodspk.home}}css/print.css" rel="stylesheet" type="text/css" media="print" />
     
     <!-- Font Awesome -->
     <!-- <link rel="stylesheet" href="{{lodspk.home}}static/Font-Awesome/css/font-awesome.min.css"> -->
@@ -183,7 +184,7 @@
 
 								
 				<li><a href="{{lodspk.home}}collections"><i style="color: #aaa;" class="fa fa-th fa-fw"></i>  Samlinger</a></li>
-				<li><a href="{{lodspk.home}}images"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
+				<li><a href="{{lodspk.home}}search/?filter=type.exact%23Fotografi&filter=type.exact%23Album&filter=type.exact%23Grafikk&filter=type.exact%23Postkort"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
 				<li><a href="{{lodspk.home}}events"><i style="color: #aaa;" class="fa fa-calendar fa-fw"></i>  Hendelser</a></li>
 				<li><a href="{{lodspk.home}}albums"><i style="color: #aaa;" class="fa fa-book fa-fw"></i>  Album</a></li>
 				<li><a href="{{lodspk.home}}exhibitions"><i style="color: #aaa;" class="fa fa-university fa-fw"></i>  Utstillinger</a></li></ul>
diff --git a/components/includes/nav.inc b/components/includes/nav.inc
index 87285b7f..fc8b091e 100755
--- a/components/includes/nav.inc
+++ b/components/includes/nav.inc
@@ -1,5 +1,5 @@
 	<li><a href="{{lodspk.home}}collections"><i style="color: black;" class="fa fa-th fa-fw"></i>  Samlinger</a></li>
-	<li><a href="{{lodspk.home}}images"><i style="color: black;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
+	<li><a href="{{lodspk.home}}search/?filter=type.exact%23Fotografi&filter=type.exact%23Album&filter=type.exact%23Grafikk&filter=type.exact%23Postkort"><i style="color: black;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
 	<li class="hidden"><a href="{{lodspk.home}}topics"><i style="color: black;" class="fa fa-tags fa-fw"></i>  Emner</a></li>
 	<li class="hidden"><a href="{{lodspk.home}}agents"><i style="color: black;" class="fa fa-users fa-fw"></i>  Aktører</a></li>
 	<li><a href="{{lodspk.home}}events"><i style="color: black;" class="fa fa-calendar fa-fw"></i>  Hendelser</a></li>
diff --git a/components/services/exhibition%2Fdanielssen/html.template b/components/services/exhibition%2Fdanielssen/html.template
index 23bf2075..41c9fff8 100644
--- a/components/services/exhibition%2Fdanielssen/html.template
+++ b/components/services/exhibition%2Fdanielssen/html.template
@@ -18,7 +18,8 @@
 			
 			<h1 id="danielssen" class="anchor">Daniel Cornelius Danielssen 1815 – 2015</h1>
 			<div class="row">
-				<div class="col-sm-8 col-md-8"><p><small>Av <strong>Ola Søndenå</strong> og <strong>Marianne Paasche</strong></small></p>
+				<div class="col-sm-8 col-md-8">
+				  <p><small>Av <strong>Ola Søndenå</strong> og <strong>Marianne Paasche</strong></small></p>
 					<p class="lead">Bjørnstjerne Bjørnson kalte ham «en av de genialeste og lyseste naturer jeg har kjent», han var leder for Bergens Museum i nesten 30 år, var grunnleggeren av den moderne vitenskapelige lepraforskningen, var zoolog, stortingsmann og kulturpersonlighet, og fikk symbolsk nok et vulkankrater oppkalt etter seg på Jan Mayen. Mannen med den svarte kalotten og det hvite skjegget var et kraftsentrum av de sjeldne – sta, energisk og engasjert var han med på å prege samfunnsutviklingen i Bergen og Norge gjennom store deler av 1800-tallet. 4. juli 2015 feires 200-årsdagen til Danielssen, paradoksalt nok i en periode der hans kjære museumsbygning på Rakkarhaugen midlertidig står tom og forlatt, i det som burde vært et jubelår for å feire bygningens 150-års jubileum.</p>		
 				</div>
 			</div>
diff --git a/components/services/exhibition/html.template b/components/services/exhibition/html.template
index 387cba80..d3c6df99 100644
--- a/components/services/exhibition/html.template
+++ b/components/services/exhibition/html.template
@@ -16,12 +16,50 @@
 		
 				
 	    <h1><span itemprop="name">{% for row in models.main %}{% if row.title && row.title.value != "" %}{{row.title.value}}{% else %}{% if row.label && row.label.value != "" %}{{row.label.value}}{% else %} {{row.identifier.value}}{%endif%}{%endif%}{% endfor %}</span> <span class="badge">{{ first.count.total.value }}</span></h1>
-	    {% for row in models.main %}
-	    	{% if row.alternative %}
-			    <h2 itemprop="alternativeHeadline"><small>{{first.main.alternative.value}}</small></h2>
-			{% endif %}
-		{% endfor %}
-	    <div class="decode-description" itemprop="description">{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div>
+	    
+		  <div class="row">
+				<div class="col-sm-8 col-md-8">
+  				{% for row in models.main %}
+    	    	{% if row.alternative %}
+    			    <h2 itemprop="alternativeHeadline"><small>{{first.main.alternative.value}}</small></h2>
+            {% endif %}
+    	  	{% endfor %}
+	  	
+          <div class="decode-description" itemprop="description">{% autoescape off %}{{ first.description.descriptions.value|decodedescription }}{% endautoescape %}</div>
+        </div>
+        
+        <div class="col-sm-3 col-md-3">
+          {% if first.main.logo != null %}
+  				<div class="col-md-12">
+  					<img itemprop="primaryImageOfPage" class="collection-logo img-circle img-border img-responsive" src="{{first.main.logo.value}}">
+  				</div>
+  				<div class="clearfix"></div>
+  				{% endif %}
+				
+          {% if models.subexhibition|length != 0 %}    
+          <h4>Kapitler:</h4>
+          <ol>
+          {% for row in models.subexhibition %}
+            <li><a href="{{ row.uri.value }}"><strong>{{row.label.value}}</strong></a></li>
+          {% endfor %}
+          </ol>
+          {% endif %}
+			  
+			  </div>
+		  </div>
+	    
+	    <div class="row">
+  	    <div class="col-md-12">
+    	    {% if models.relatedcollections|length != 0 %}
+          <h4>Relaterte samlinger:</h4>
+          <ul>
+          {% for row in models.relatedcollections %}
+            <li><a href="{{ row.uri.value }}"><strong>{{row.label.value}}</strong></a></li>
+          {% endfor %}
+          </ul>
+			  {% endif %}
+        </div>
+  	  </div>
 	    
 	{% if models.producedin|length != 0 %}
 		{% for row in models.producedin %}
@@ -30,46 +68,26 @@
 	{% endif %}	 	    
 	    	
 		<hr>
-		
-    {% if first.main.timeline.value %}
-	<div id="timeline-embed"></div>
-
-   <!-- BEGIN TimelineJS -->
-		<script>         	
-            var timeline_config = {
-                    type:       'timeline',
-					width:              '100%',
-		            height:             '480',
-		            lang:				'no',
-		            source:             '{{first.main.timeline.value}}',
-		            embed_id:           'timeline-embed',               //OPTIONAL USE A DIFFERENT DIV ID FOR EMBED
-		            start_at_end:       false,                          //OPTIONAL START AT LATEST DATE
-		            //start_at_slide:     '1',                            //OPTIONAL START AT SPECIFIC SLIDE
-		            start_zoom_adjust:  '2',                            //OPTIONAL TWEAK THE DEFAULT ZOOM LEVEL
-		            debug:              true                           //OPTIONAL DEBUG TO CONSOLE
-
-                };       
-        </script>    
-<script type="text/javascript" src="http://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>
-
-	<!-- END TimelineJS -->
-	{% endif %}
-
-    <h2>{% if lodspk.query %} / <small>"{{lodspk.query}}"</small> {%else%}{%endif%}</h2>
-	{% if lodspk.query %}
-	<ul class="list-unstyled">
-		{% for row in models.search %}
-	   		<li><a href="{{ row.uri.value }}"><i class="fa fa-book"></i>  {{row.label.value}}</a></li>
-	   	{% endfor %}
-	</ul>
-	{% else %}
+		</div>
+</div></div>
+		<div class="container-fluid">
+      {% if first.main.timeline.value %}
+    	<div id="timeline-embed">
+      	<iframe src="{{ first.timeline.timeline.value }}" frameborder="0" width="100%" height="750"></iframe>
+    	</div>
+    
+    	<!-- END TimelineJS -->
+    	{% endif %}
+    </div>
+    
+         <div class="container">
+    	<div class="row">
+			
+		<div class="col-md-12">
 	
     {% if first.haspart.uri != null %}
-    {% if !lodspk.query && first.count.total.value > 100 %}
-        <script>
+    {% if first.count.total.value > 100 %}
+      <script>
 	    if ("{{lodspk.args.arg1}}".length < 1)
 	    	{page = 0;}
 	    	else {page = "{{lodspk.args.arg1}}";}
@@ -98,45 +116,8 @@
 		document.write('</ul>');
 		</script>
 	{% endif %}
-	
-<!--
-	{% for row in models.haspart %}
-	<div itemprop="hasPart" itemscope itemtype="{% if row.classLabel.value != "Samling" %}http://schema.org/CreativeWork{%else%}http://schema.org/CollectionPage{%endif%}" itemid="{{row.uri.value}}" class="row">
-	   {% ifchanged row.uri.value %}
-	   <div style="margin-bottom: 15px; border-bottom: 1px solid #ddd;" class="col-sm-12 col-md-12">
-	    	{% if row.classLabel.value != "Samling" %}
-		    	<div style="margin-bottom: 15px;" class="col-sm-3 col-md-4">
-		    		<a href="{{row.uri.value}}"><img class="img-responsive img-rounded" {% if row.img %}{% else %}data-src="holder.js/100%x150/text:Ingen forhåndsvisning"{% endif %} src="{{row.img.value}}" /></a>
-		    	</div>
-	    	{% endif %}
-	    	{% if row.classLabel.value == "Samling" %}
-		    	<div class="col-sm-2 col-md-2">
-		    		<a style="color:#bbb;" href="{{row.uri.value}}">{% if row.img %}<img class="img-responsive img-rounded" src="{{row.img.value}}" />{% else %}<span class="fa-stack fa-3x">
-  <i class="fa fa-circle fa-stack-2x"></i>
-  <i class="fa fa-archive fa-stack-1x fa-inverse"></i>
-</span>{% endif %}</a>
-		    	</div>
-	    	{% endif %}
-	    	<div class="{% if row.classLabel.value != "Samling" %}col-sm-8 col-md-8{%else%}col-sm-10 col-md-10{%endif%}">
-	    	{% if row.makerNames %}
-		    	<p><i style="margin-right: 5px;" data-trigger="hover" data-toggle="tooltip" data-placement="left" title="Personer knyttet til samlingen eller dokumentet" class="fa fa-users"></i> <strong>{{row.makerNames.value}}</strong></p>
-		    	{% endif %}
-		    	<h4><a itemprop="url" href="{{ row.uri.value }}"> <span itemprop="name">{% if row.title && row.title.value != "" %}{{row.title.value}}{% else %}{% if row.label && row.label.value != "" %}{{row.label.value}}{% else %} {{row.identifier.value}}{%endif%}{%endif%}</span></a></h4>
-		    	{% if row.description.value %}<p>{{row.description.value|striptags|truncatewords:35}}</p>{% endif %}
-		    	
-		    	{% if row.subjectLabels %}
-		    	<p class="text-muted"><i class="fa fa-tags"></i> <i itemprop="keywords">{{row.subjectLabels.value}}</i></p>
-				{% endif %}
-				
-				<p> {% if row.classLabel %}<span class="label label-info">{{row.classLabel.value}}</span> {% endif %} {% if row.hasTranscription.value == "true" %}<span data-trigger="hover" data-toggle="tooltip" data-placement="left" title="Dokumentet har en moderne avskrift" class="label label-primary">Transkribert</span>{% endif %} {% if row.hasPage.value == "true" %}<span data-trigger="hover" data-toggle="tooltip" data-placement="left" title="Dokumentet er digitalisert" class="label label-default">Faksimile</span>{% endif %} <span class="text-muted"><i style="margin-right: 5px;" data-trigger="hover" data-toggle="tooltip" data-placement="left" title="Arkivnøkkel" class="fa fa-key"></i>{{row.identifier.value}}</span></p>
-			</div>
-		</div>
-		{% endifchanged %}		
-	</div>
-	{% endfor %}
 	{% endif %}
--->
-	
+
 					<div class="row th-grid">
 				{% for row in models.haspart %}
 				    <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
@@ -166,7 +147,6 @@
 				</script>
 	
     <script>$('[data-toggle="tooltip"]').tooltip({'placement': 'top'});</script>
-    	{% endif %}
     	
     {% if !lodspk.query && first.count.total.value > 100 %}
         <script>
diff --git a/components/services/exhibition/queries/haspart.query b/components/services/exhibition/queries/haspart.query
index 77cadf8b..14656846 100644
--- a/components/services/exhibition/queries/haspart.query
+++ b/components/services/exhibition/queries/haspart.query
@@ -11,6 +11,7 @@ SELECT DISTINCT ?uri ?title ?label ?description  ?classLabel ?identifier (group_
 	OPTIONAL { ?uri ubbont:hasThumbnail ?img . }
 	BIND ( EXISTS { ?uri ubbont:hasPage ?page } AS ?hasPage )
 	BIND ( EXISTS { ?uri ubbont:hasTranscription ?transcription } AS ?hasTranscription )
+	FILTER( ?class != ubbont:Exhibition )
 }
 	GRAPH ubbont:ubbont {
 	?class rdfs:label ?classLabel .
diff --git a/components/services/exhibition/queries/timeline.query b/components/services/exhibition/queries/timeline.query
index 806ed1b9..e42e40e8 100644
--- a/components/services/exhibition/queries/timeline.query
+++ b/components/services/exhibition/queries/timeline.query
@@ -1,15 +1,5 @@
-SELECT DISTINCT ?media ?startDate ?headline ?text ?thumbnail ?year ?month ?day WHERE { 
-GRAPH <urn:x-arq:UnionGraph>  {
-?media dct:isPartOf <http://data.ub.uib.no/exhibition/{{ lodspk.args.arg0 }}>  ;
-dct:created ?startDate .
-OPTIONAL { ?media rdfs:label ?headline . }
-OPTIONAL { ?media dct:title ?headline . }
-OPTIONAL { ?media dct:description ?text . }
-OPTIONAL { ?media dct:abstract ?text . }
-OPTIONAL { ?media ubbont:hasPage/ubbont:hasThumbnail ?thumbnail . }
-BIND ( year(?startDate) AS ?year ) 
-BIND ( month(?startDate) AS ?month ) 
-BIND ( day(?startDate) AS ?day ) 
-FILTER(regex(str(?thumbnail), "_1_thumb", "i"))
-}
+SELECT ?timeline WHERE { 
+  GRAPH <urn:x-arq:UnionGraph>  {
+    <http://data.ub.uib.no/exhibition/{{ lodspk.args.arg0 }}> ubbont:hasTimeline ?timeline .
+  }
 }
\ No newline at end of file
diff --git a/components/services/exhibitions/queries/main.query b/components/services/exhibitions/queries/main.query
index d95feb43..82318209 100644
--- a/components/services/exhibitions/queries/main.query
+++ b/components/services/exhibitions/queries/main.query
@@ -2,11 +2,64 @@ SELECT DISTINCT ?uri ?label ?description ?logo ?alternative WHERE {
 	GRAPH <urn:x-arq:UnionGraph>  {
 	?uri a ubbont:Exhibition .
 	?uri ubbont:showWeb true .
+	OPTIONAL { ?uri ubbont:sequenceNr ?seq . }
 	OPTIONAL { ?uri rdfs:label ?label . }
 	OPTIONAL { ?uri dct:title ?label . }
 	OPTIONAL { ?uri dct:alternative ?alternative . }
 	OPTIONAL { ?uri dct:description ?description . }
 	OPTIONAL { ?uri foaf:logo ?logo . }
+	NOT EXISTS { ?uri dct:isPartOf ?partOf . }
+	FILTER ( ?uri != <http://data.ub.uib.no/exhibition/71fbdd3f-eed9-4dae-a5c8-9b40e7ea45bd>
+# || ?uri != <http://data.ub.uib.no/exhibition/b16328d7-0874-4b42-8053-d5d66b02ca46>
+# || ?uri != <http://data.ub.uib.no/exhibition/53ba51b8-5029-4ac7-a2aa-f47e943d3ff5>
+# || ?uri != <http://data.ub.uib.no/exhibition/65f6e01d-f24b-4232-ab1e-4ca790d6868b>
+# || ?uri != <http://data.ub.uib.no/exhibition/5d9ad83f-73e4-4d8b-8a52-480e2ed76c0d>
+# || ?uri != <http://data.ub.uib.no/exhibition/d36981f7-0d93-4dda-a5be-8d3b104c4958>
+# || ?uri != <http://data.ub.uib.no/exhibition/0e8aa8a9-a166-4cbb-b798-d210e18a506e>
+# || ?uri != <http://data.ub.uib.no/exhibition/e76d5c62-7b20-42c6-aa13-3fc7a243bdb5>
+# || ?uri != <http://data.ub.uib.no/exhibition/60b37d65-a276-4dfd-8e4a-c79a658ddfa3>
+# || ?uri != <http://data.ub.uib.no/exhibition/a16ee11e-2991-42eb-b151-2ee84daf1dda>
+# || ?uri != <http://data.ub.uib.no/exhibition/7da10f07-06ff-40ec-ba8f-fabf458bfa40>
+# || ?uri != <http://data.ub.uib.no/exhibition/5ed032a5-f361-4975-8663-5c00742a5f82>
+# || ?uri != <http://data.ub.uib.no/exhibition/31e3fe62-060d-462e-8310-b296eff383c3>
+# || ?uri != <http://data.ub.uib.no/exhibition/7a84b875-adc2-4587-a82e-1eb76a9e9085>
+# || ?uri != <http://data.ub.uib.no/exhibition/27f422ed-c2fe-41f0-babd-8b8d03ad1f43>
+# || ?uri != <http://data.ub.uib.no/exhibition/6fa3df2f-7333-492b-8478-87cd05c176d9>
+# || ?uri != <http://data.ub.uib.no/exhibition/5ae7b03a-ffaa-4d4c-ad80-8d1df07b4ade>
+# || ?uri != <http://data.ub.uib.no/exhibition/9d0fa899-c984-43f8-b70a-05d688e4d1ed>
+# || ?uri != <http://data.ub.uib.no/exhibition/0d56a8bd-e636-4648-bbac-b892e634185a>
+# || ?uri != <http://data.ub.uib.no/exhibition/6bfc3b67-4342-49ee-b89c-b88553d41549>
+# || ?uri != <http://data.ub.uib.no/exhibition/b1cb5f34-e35f-40f6-9da1-3a6dfed40648>
+# || ?uri != <http://data.ub.uib.no/exhibition/efad7c50-a65a-47c3-9324-2642c47b8251>
+# || ?uri != <http://data.ub.uib.no/exhibition/9ecd4afe-b648-4d5b-b77a-acad40955e5d>
+# || ?uri != <http://data.ub.uib.no/exhibition/eb6bdee1-73a4-4c2e-b22b-b6b320694a6e>
+# || ?uri != <http://data.ub.uib.no/exhibition/437ffaed-9bb7-40d9-b91e-58ac6266ee4b>
+# || ?uri != <http://data.ub.uib.no/exhibition/9d008e6f-5f48-4e66-9909-7340879b67f0>
+# || ?uri != <http://data.ub.uib.no/exhibition/b807a8ab-9f93-4aad-89c6-d1931d948a26>
+# || ?uri != <http://data.ub.uib.no/exhibition/bc91e78d-eef6-4833-8831-c63c066c7268>
+# || ?uri != <http://data.ub.uib.no/exhibition/cd1ecf10-6ec5-449a-8b57-c39b6e29f009>
+# || ?uri != <http://data.ub.uib.no/exhibition/e0511132-e340-4c1f-a5aa-31168be22be5>
+# || ?uri != <http://data.ub.uib.no/exhibition/93fc33e4-c79c-42a1-b7c9-6397c891be85>
+# || ?uri != <http://data.ub.uib.no/exhibition/6e88e615-8687-47bc-bf3f-5ec8fd349bb9>
+# || ?uri != <http://data.ub.uib.no/exhibition/18eed87e-97dc-4d39-8c64-0bedc3c7d900>
+# || ?uri != <http://data.ub.uib.no/exhibition/4b930453-0767-4fd1-8194-618baec0ad85>
+# || ?uri != <http://data.ub.uib.no/exhibition/4adc0168-761d-4b4e-b4ab-56915178f134>
+# || ?uri != <http://data.ub.uib.no/exhibition/1d13e69a-6cf8-4f7b-a67a-2b11cfc82a53>
+# || ?uri != <http://data.ub.uib.no/exhibition/79b00f5c-d123-4ddf-b399-6178c7d1a714>
+# || ?uri != <http://data.ub.uib.no/exhibition/e58aabd5-1c3b-4828-b16d-2647dc9544fa>
+# || ?uri != <http://data.ub.uib.no/exhibition/2bed9e9b-5504-495b-8a01-f889fe1dfd23>
+# || ?uri != <http://data.ub.uib.no/exhibition/d4de00eb-7e90-463b-ad87-cc1c2c0fbb73>
+# || ?uri != <http://data.ub.uib.no/exhibition/006b9d7c-a596-4cfc-a412-dd109cc21052>
+# || ?uri != <http://data.ub.uib.no/exhibition/5d9f5e88-6668-4d63-b8d5-2aeced191daf>
+# || ?uri != <http://data.ub.uib.no/exhibition/7517f821-5911-4541-a64b-ff2dad2087b5>
+# || ?uri != <http://data.ub.uib.no/exhibition/5613c710-b9e4-4da8-ae8e-53d3181064e5>
+# || ?uri != <http://data.ub.uib.no/exhibition/d08b6009-a51c-44e8-a294-156e3d72a9ba>
+# || ?uri != <http://data.ub.uib.no/exhibition/09726e98-5806-404b-82a0-815c056f457c>
+# || ?uri != <http://data.ub.uib.no/exhibition/3743f2ec-20e4-402a-bc85-6b6f8f701b79>
+# || ?uri != <http://data.ub.uib.no/exhibition/27e294b4-a51e-483a-9369-a56ac2e11ef1>
+# || ?uri != <http://data.ub.uib.no/exhibition/f0e0291f-ff11-4b18-8dc2-392c2121b2ac>
+# || ?uri != <http://data.ub.uib.no/exhibition/b3c24277-6a36-4224-887e-63bf35b2663f> 
+)
 }
 }
-ORDER BY ?label
\ No newline at end of file
+ORDER BY ?seq ?title
\ No newline at end of file
diff --git a/components/services/home/html.template b/components/services/home/html.template
index 7b7d4c66..9043b32e 100644
--- a/components/services/home/html.template
+++ b/components/services/home/html.template
@@ -167,7 +167,7 @@
 
 								
 				<li><a href="{{lodspk.home}}collections"><i style="color: #aaa;" class="fa fa-th fa-fw"></i>  Samlinger</a></li>
-				<li><a href="{{lodspk.home}}images"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
+				<li><a href="{{lodspk.home}}search/?filter=type.exact%23Fotografi&filter=type.exact%23Album&filter=type.exact%23Grafikk&filter=type.exact%23Postkort"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
 				<li><a href="{{lodspk.home}}events"><i style="color: #aaa;" class="fa fa-calendar fa-fw"></i>  Hendelser</a></li>
 				<li><a href="{{lodspk.home}}albums"><i style="color: #aaa;" class="fa fa-book fa-fw"></i>  Album</a></li>
 				<li><a href="{{lodspk.home}}exhibitions"><i style="color: #aaa;" class="fa fa-university fa-fw"></i>  Utstillinger</a></li></ul>
@@ -226,7 +226,6 @@
 		</div>
 	</div>
 	
-	
 	<div class="row">
 		<div style="width: 90%; margin: auto;">
 			<h5>Siste registrerte fotografi / <a href="/latest">se flere</a></h5>
@@ -359,6 +358,15 @@
 			</div>
 			
 
+			<div class="col-md-6">
+				<div class="col-lg-4 col-md-4 col-xs-3">
+				<a href="/exhibition/chk"><img style="margin-top: 15px;" class="img-responsive img-circle" src="http://data.ub.uib.no/files/bs/ubb/ubb-ms/ubb-ms-utst/ubb-ms-utst-0058/jpg/ubb-ms-utst-0058_th.jpg" width="" height="" /></a>
+			</div>
+			<h3><a href="/exhibition/chk">Catharine Hermine Kølle (1788-1859)</a></h3>
+				<p>Med solide beksømsko, vandrestav og pistol i sekken vandret Catharine Kølle ut i verden og inn i historien, oppsiktsvekkende i sin samtid som enslig reisende kvinne, en barrierebrytende individualist i en tid da dette ellers var forbeholdt menn. Hun dokumenterte sitt liv og sine reiser gjennom 250 akvareller og 1850 sider tekst, upublisert i hennes levetid, en kunst- og kulturhistorisk skatt som nå for første gang blir presentert i sin helhet.</p>
+			</div>
+			
+			<!--
 			<div class="col-md-6">
 				<div class="col-lg-4 col-md-4 col-xs-3">
 				<a href="/exhibition/uib-1948"><img style="margin-top: 15px;" class="img-responsive img-circle" src="../img/universitas-bergensis-est/logo-uib-1948-sm.jpg" width="" height="" /></a>
@@ -367,6 +375,7 @@
 				<p>Innvielsen av Universitet i Bergen 30. august 1948 vakte stor oppmerksomhet i inn- og utland. Ved høytidelighetene sendte høyskoler og universiteter i hele Norden praktfulle og symboltunge gratulasjoner til det nye universitetet.</p>
 				<p>Fremskrittet stod i fokus da Stortinget vedtok opprettelsen av Universitetet i Bergen på den symboltunge dagen 9. April 1946. UiB var det første universitetet i Norge opprettet av et norsk storting, og det første i Norden etter krigen. To år senere trådte Loven om Universitet i Bergen i kraft og UiB ble høytidelig åpnet av Kronprins Olav 30. August 1948, som for anledningen ankom seremonien med studenterlue.</p>
 			</div>
+			-->
 			
 			<!--<div class="col-md-6">
 				<div class="col-lg-4 col-md-4 col-xs-3">
diff --git a/components/services/home/queries/latestdocuments.query b/components/services/home/queries/latestdocuments.query
deleted file mode 100644
index fac01f31..00000000
--- a/components/services/home/queries/latestdocuments.query
+++ /dev/null
@@ -1,39 +0,0 @@
-SELECT DISTINCT ?uri ?image ?title ?available ?maker WHERE   {
-
-  GRAPH <urn:x-arq:UnionGraph> 
-    {
-      { SELECT ?available ?uri 
-          {  
-          GRAPH ubbont:ubbont {
-            ?subclass rdfs:subClassOf* ubbont:WrittenWork .
-          }
-
-            BIND (( NOW()) AS ?now).
-            BIND (( str(day(?now))) as ?day).
-            BIND (( str(month(?now))) as ?month).
-            BIND (( str(year(?now))) as ?year).
-            BIND (( xsd:date(concat(str(?year),"-", ?month,"-",?day))) as ?date)
-            BIND (( ?date - "P20D"^^<http://www.w3.org/2001/XMLSchema#duration>) as ?twentyDaysAgo).
-            ?uri dct:available ?available.
-            ?uri a ?subclass .
-            ?uri ubbont:hasThumbnail ?thumb.
-            FILTER (xsd:date(?available) > ?twentyDaysAgo)
-          }
-        ORDER BY desc(?available)
-        LIMIT 20
-      }
-      ?uri ubbont:hasThumbnail ?thumb.
-      OPTIONAL { ?uri ubbont:hasRepresentation/dct:hasPart ?page.
-        ?page ubbont:sequenceNr 1.
-        ?page ubbont:hasResource ?resource.
-      OPTIONAL {?resource ubbont:hasXSView ?xsImage.  }  
-      OPTIONAL {?resource ubbont:hasSMView ?smImage. }
-    }
-    OPTIONAL { ?uri ubbont:hasRepresentation/dct:hasPart ?part.
-		OPTIONAL { ?part ubbont:hasSMView ?imgSM }
-		OPTIONAL { ?part ubbont:hasXSView ?imgXS }
-  }
-  BIND (COALESCE(?imgXS,?imgSM,?xsImage,?smImage) AS ?image).
-  }
-}
-LIMIT 10
diff --git a/components/services/instance%2Fcollection/html.template b/components/services/instance%2Fcollection/html.template
index 6b11becd..f9a00bec 100755
--- a/components/services/instance%2Fcollection/html.template
+++ b/components/services/instance%2Fcollection/html.template
@@ -5,7 +5,7 @@
 				<div class="bs-sidebar hidden-xs hidden-sm affix">
 				
 				{% if first.main.logo != null %}
-				<div class="col-md-10">
+				<div class="col-md-12">
 					<img itemprop="primaryImageOfPage" class="collection-logo img-circle img-border img-responsive" src="{{first.main.logo.value}}">
 				</div>
 				<div class="clearfix"></div>
@@ -22,6 +22,14 @@
 				<div class="clearfix"></div>
 				{% endif %}			
 				
+				{% if models.webresources|length != 0 %}
+					<p class="text-center"><strong class="text-muted">Nettsider</strong><br>
+						{% for row in models.webresources %}
+						<a target="_blank" href="{{row.uri.value}}">{{row.label.value}}</a> <i class="text-muted fa fa-external-link"></i><br>
+						{% endfor %}
+					</p>
+				{% endif %}	
+				
 				<!-- ALL DATA -->
 				<button type="button" class="btn btn-xs btn-link all-data" data-toggle="modal" data-target="#full-meta-view"><i class="fa fa-heart m-button-red pulse animated"></i> Vis data</button>
 
@@ -147,7 +155,7 @@
 	   <div  class="col-sm-12 col-md-12">
 	    	{% if row.classLabel.value != "Samling" %}
 		    	<div style="margin-bottom: 15px;" class="col-xs-6 col-sm-4 col-md-5">
-		    		<a href="{{row.uri.value}}"><img class="img-responsive" {% if row.img %}{% else %}data-src="holder.js/100%x150/text:Ingen forhåndsvisning"{% endif %} src="{{row.img.value}}" /></a>
+		    		<a href="{{row.uri.value}}"><img class="img-responsive thumbnail" {% if row.img %}{% else %}data-src="holder.js/100%x150/text:Ingen forhåndsvisning"{% endif %} src="{{row.img.value}}" /></a>
 		    	</div>
 	    	{% endif %}
 	    	{% if row.classLabel.value == "Samling" %}
diff --git a/components/services/instance%2Forganization/html.template b/components/services/instance%2Forganization/html.template
index b1dbd77a..62a42ea7 100755
--- a/components/services/instance%2Forganization/html.template
+++ b/components/services/instance%2Forganization/html.template
@@ -11,6 +11,9 @@
 					{% endif %}
 					<br>
 					<p class="text-center"><a itemprop="url" href="{{lodspk.local.curie}}"><strong itemprop="name">{{ first.main.name.value }}</strong></a></p>
+					{% if first.main.email.value %}
+					<p class="text-center"><i class="fa fa-envelope"></i> <a href="mailto:{{ first.main.email.value }}">Kontakt</a></p>
+					{% endif %}
 				</div>
 				<br>
 			
diff --git a/components/services/instance%2Forganization/queries/main.query b/components/services/instance%2Forganization/queries/main.query
index 45f96ce9..3d22d899 100644
--- a/components/services/instance%2Forganization/queries/main.query
+++ b/components/services/instance%2Forganization/queries/main.query
@@ -1,11 +1,12 @@
-SELECT ?name ?altname ?description ?sameAs ?img ?hasLong WHERE {
+SELECT ?name ?altname ?description ?sameAs ?img ?email ?hasLong WHERE {
 	GRAPH <urn:x-arq:UnionGraph>  {
-	<http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> a foaf:Organization .
-	OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> foaf:name ?name . }
-	OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> skos:altLabel ?altname . }
-	OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> dct:description ?description . }
+	  <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> a foaf:Organization .
+  	OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> foaf:name ?name . }
+  	OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> skos:altLabel ?altname . }
+  	OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> dct:description ?description . }
     OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> foaf:img ?img . }
     OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> ubbont:hasThumbnail ?img . }
+    OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> schema:email ?email . }
     OPTIONAL { <http://data.ub.uib.no/instance/organization/{{ lodspk.args.arg0 }}> owl:sameAs ?sameAs .  
     	FILTER(STRSTARTS(STR(?sameAs), "http://dbpedia.org")) 
     	}
diff --git a/components/services/instance%2Fperson/html.template b/components/services/instance%2Fperson/html.template
index 4bc51f9a..87e54c65 100755
--- a/components/services/instance%2Fperson/html.template
+++ b/components/services/instance%2Fperson/html.template
@@ -19,7 +19,7 @@
 					<p class="text-center"><strong class="text-muted">Også kjent som</strong><br>
   					<ul class="list-unstyled text-center">
   						{% for row in models.main %}
-    						{% ifchanged row.name.value %}
+    						{% ifchanged row.altname.value %}
     						  <li><i>{{row.altname.value}}</i></li>
     						{% endifchanged %}
   						{% endfor %}
@@ -60,7 +60,9 @@
 					<p class="text-center"><strong class="text-muted">Yrke</strong><br>
   					<ul class="list-unstyled text-center">
   						{% for row in models.main %}
-  							<li>{{row.profession.value}}</li>
+  						  {% ifchanged row.profession.value %}
+    							<li>{{row.profession.value}}</li>
+    						{% endifchanged %}
   						{% endfor %}
 						</ul>
 					{% endif %}
diff --git a/components/services/search/html.template b/components/services/search/html.template
deleted file mode 100755
index 8022212f..00000000
--- a/components/services/search/html.template
+++ /dev/null
@@ -1,235 +0,0 @@
-<!DOCTYPE html>
-<html lang="no" prefix="og: http://ogp.me/ns#">
-
-  <head>
-    <meta charset="utf-8">
-    <title>{{lodspk.title}}</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <link rel="shortcut icon" type="image/x-icon" href="{{lodspk.home}}/img/favicon.ico">
-
-	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-<!-- 	<script src="//code.jquery.com/jquery.js"></script>  -->
-	<!-- <script type="text/javascript" src="{{lodspk.home}}js/jquery.js"></script> -->
-
-	<!-- Latest compiled and minified CSS -->
-	<link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-
-	<!-- Latest compiled and minified JavaScript -->
-	<script src="//netdna.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
-
-	<link href="{{lodspk.home}}css/basic.css" rel="stylesheet" type="text/css" media="screen" />
-    <link href="{{lodspk.home}}css/print.css" rel="stylesheet" type="text/css" media="print" />
-
-    <!-- Font Awesome -->
-    <!-- <link rel="stylesheet" href="{{lodspk.home}}static/Font-Awesome/css/font-awesome.min.css"> -->
-    <link href="//netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
-
-	<link href='http://fonts.googleapis.com/css?family=IM+Fell+Great+Primer' rel='stylesheet' type='text/css'>
-
-
-  </head>
-  <body>
-      <div id="wrap">
-<header>
-			<nav style="margin-bottom: 0;" class="navbar navbar-inverse navbar-static-top marcus-header" role="navigation">  
-				<div class="container-fluid">
-					<div class="navbar-header">
-			            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-			              <i class="fa fa-bars fa-2x" aria-hidden="true"></i>
-			            </button>
-			            <img class="logo" style="float: left;" data-pin-nopin="true" src="{{lodspk.home}}img/UiBmerke_white.svg">
-			            <a class="navbar-brand" href="{{lodspk.home}}">{{lodspk.title}}</a>
-			            <a class="nav-subtitle hidden-xs hidden-sm" href="{{lodspk.home}}"><small>Spesialsamlingene ved <br>Universitetsbiblioteket i Bergen</small></a>
-		        	</div>
-		        	
-        	
-	        	<div class="collapse navbar-collapse">
-	            		     <ul class="nav navbar-nav navbar-right">
-						 <li><a href="{{lodspk.home}}">Hjem</a></li>
-
-		              	<li class="dropdown">
-						  	<a id="browse1" class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="#"> Meny <i class="fa fa-chevron-down" aria-hidden="true"></i></a>
-						  	<ul class="dropdown-menu" aria-labelledby="browse1" role="meny">
-							
-
-								
-				<li><a href="{{lodspk.home}}collections"><i style="color: #aaa;" class="fa fa-th fa-fw"></i>  Samlinger</a></li>
-				<li><a href="{{lodspk.home}}images"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
-				<li><a href="{{lodspk.home}}events"><i style="color: #aaa;" class="fa fa-calendar fa-fw"></i>  Hendelser</a></li>
-				<li><a href="{{lodspk.home}}albums"><i style="color: #aaa;" class="fa fa-book fa-fw"></i>  Album</a></li>
-				<li><a href="{{lodspk.home}}exhibitions"><i style="color: #aaa;" class="fa fa-university fa-fw"></i>  Utstillinger</a></li></ul>
-						</li>
-						<li class="dropdown">
-							<a id="browse1" class="dropdown-toggle" role="button" data-toggle="dropdown" data-target="#" href="#"> Om <i class="fa fa-chevron-down" aria-hidden="true"></i></a>
-							<ul class="dropdown-menu" aria-labelledby="browse2" role="meny">
-								<li><a href="{{lodspk.home}}about-marcus"><i class="fa fa-archive"></i> Om Marcus</a></li>
-								<li><a href="http://sparql.ub.uib.no"><i class="fa fa-cubes"></i> Ã…pne data (Sparql)</a></li>
-								<li><a href="{{lodspk.home}}technology.html"><i style="color: black;" class="fa fa-cog"></i> Teknologi</a></li>
-								<li><a href="{{lodspk.home}}stats"><i style="color: black;" class="fa fa-bar-chart-o"></i> Statistikk</a></li>
-							</ul>
-						</li>						
-            	<li>
-            		<a href="/cart.html"><span class="fa fa-lg fa-shopping-cart"></span> <span class="hidden">Handlekurv</span> <span style="margin-top: -8px;" class="label label-primary simpleCart_quantity"></span></a>
-				</li>
-		</ul>
-
-				</div>
-	
-			</div>
-	    </nav><!--/.nav-collapse -->
-      </header>
-
-
- <div class="container main-body">
-    	<div class="row">
-
-			<div class="col-md-12">
-
-			<div class="service-search">
-			<h1>Søk</h1>
-			<p class="lead">Søket er i en tidlig fase og vil bli forbedret fortløpende.</p>
-			<div class="hidden alert alert-danger" role="alert"><p><strong>Feil!</strong> Vi har for tiden problemer med søk etter fotografi. Det jobbes med å fikse problemet så fort som mulig!</p></div>
-			</div>
-
-
-			<div class="facet-view-simple"></div>
-    
-
-	<script type="text/javascript" src="http://marcus.uib.no/js/facetview/vendor/linkify/1.0/jquery.linkify-1.0-min.js"></script>
-	<link rel="stylesheet" href="http://marcus.uib.no/js/facetview/vendor/jquery-ui-1.8.18.custom/jquery-ui-1.8.18.custom.css">
-	<script type="text/javascript" src="http://marcus.uib.no/js/facetview/vendor/jquery-ui-1.8.18.custom/jquery-ui-1.8.18.custom.min.js"></script>
-	<script type="text/javascript" src="http://marcus.uib.no/js/facetview/jquery.facetview.js"></script>
-	<link rel="stylesheet" href="http://marcus.uib.no/js/facetview/css/facetview.css">
-
-<script type="text/javascript">
-jQuery(document).ready(function($) {
-	$('.facet-view-simple').facetview({
-		search_url: 'http://kirishima.uib.no/elasticsearch/rdfdata/_search?',
-		search_index: 'elasticsearch',
-		pager_on_top: true,
-		facets: [{
-			'field': 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type.exact',
-			'size': 70,
-			'display': 'Typer'
-		}, {
-			'field': 'http://purl.org/dc/terms/subject.exact',
-			'size': 10,
-			'display': 'Emner fra trefflisten'
-		}, {
-			'field': 'http://purl.org/dc/terms/isPartOf.exact',
-			'size': 10,
-			'display': 'Samling'
-		}, {
-			'field': 'http://purl.org/NET/c4dm/event.owl#producedIn.exact',
-			'size': 10,
-			'display': 'Hendelser'
-		}],
-		result_display: [
-			[{
-				"pre": '<div class="col-md-8 col-xs-8"><h3 style="margin-top:7px;"><a target="_blank" href="',
-				"field": "http://www.w3.org/1999/02/22-rdf-syntax-ns#about",
-				"post": '">'
-			}, {
-				"pre": "",
-				"field": "http://xmlns.com/foaf/0.1/name",
-				"post": "</h3></a>"
-			}, {
-				"pre": "",
-				"field": "http://www.w3.org/2000/01/rdf-schema#label",
-				"post": "</h3></a>"
-			}, {
-				"pre": "",
-				"field": "http://www.w3.org/2004/02/skos/core#prefLabel",
-				"post": "</h3></a>"
-			}],
-			[{
-				"pre": '<br><span class="text-muted">Født: ',
-				"field": "http://dbpedia.org/ontology/birthDate",
-				'post': '</span>'
-			}, {
-				"pre": '<span class="text-muted"> - Død: ',
-				"field": "http://dbpedia.org/ontology/deathDate",
-				"post": '</span>'
-			}],
-			[{
-				"pre": '<p>',
-				"field": "http://purl.org/dc/terms/description",
-				"post": "</p>"
-			}],
-			[{
-				"pre": "<br><b>Skapt av:</b> ",
-				"field": "http://xmlns.com/foaf/0.1/maker"
-			}, {
-				"pre": "<br><b>Dato:</b> ",
-				"field": "http://purl.org/dc/terms/created"
-			}],
-			[{
-				"pre": "<br> <b>Emne:</b> ",
-				"field": "http://purl.org/dc/terms/subject",
-			}, {
-				"pre": "<br> <b>Sted:</b> ",
-				"field": "http://purl.org/dc/terms/spatial",
-				"post": "<br>"
-			}, {
-				"pre": "<br> <b>Relatert til:</b> ",
-				"field": "http://purl.org/dc/terms/relation"
-			}], [{
-				"pre": '<br><span class="label label-info">',
-				"field": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
-				"post": '</span>'
-			}, {
-				"pre": ' <span class="label label-default"><b>Signatur:</b> ',
-				"field": "http://purl.org/dc/terms/identifier",
-				"post": '</span>'
-			},
-			{
-				"pre": '<div class="hidden">',
-				"field": "http://www.w3.org/1999/02/22-rdf-syntax-ns#about",
-				"post": '</div></div>'
-			}],
-			[{
-				"pre": '<div class="col-md-4 col-xs-4"><a target="_blank" href="',
-				"field": "http://www.w3.org/1999/02/22-rdf-syntax-ns#about",
-				"post": '">'
-			}, {
-				"pre": '<img class="thumbnail img-responsive" style="margin-left: 15px; margin-bottom: 5px;" src="',
-				"field": "http://xmlns.com/foaf/0.1/img",
-				"post": '">'
-			}],
-			[{
-				"pre": '<img class="thumbnail img-responsive" style="margin-left: 15px; margin-bottom: 5px;" src="',
-				"field": "http://data.ub.uib.no/ontology/hasThumbnail",
-				"post": "\"></div>"
-			}]
-		],
-		default_operator: "AND",
-		default_freetext_fuzzify: "*",
-		permanent_filters: true,
-		pushstate: true,
-		search_sortby: [{
-			"display": "Signatur",
-			"field": "http://purl.org/dc/terms/identifier"
-			},{
-			"display": "Navn/tittel",
-			"field": "http://www.w3.org/2000/01/rdf-schema#label"
-			}
-		],
-		include_facets_in_querystring: false,
-		paging: {
-			size: 40
-		},
-		pager_slider: false,
-		display_images: false,
-		searchwrap_start: '<div id="facetview_results">',
-		searchwrap_end: '</div>',
-		resultwrap_start: '<hr style="margin:10px -15px 10px -15px; border-top: 1px dashed #ccc; border-left: 1px dashed #ccc;"><div style="position:relative; padding-bottom: 15px; page-break-inside: avoid;" class="row" id="facetview_result">',
-		resultwrap_end: '</div>'
-	});
-});
-</script>
-	
-</div></div></div>
-
-{%include "../../includes/footer.inc"%}  
-</body>
-</html>
diff --git a/components/services/search/queries/main.queryX b/components/services/search/queries/main.queryX
deleted file mode 100755
index b1fb08b3..00000000
--- a/components/services/search/queries/main.queryX
+++ /dev/null
@@ -1,17 +0,0 @@
-SELECT DISTINCT ?resource ?label ?classLabel ?doc ?docLabel ?birth ?death WHERE {
-  ?resource text:query ('{{lodspk.args.arg0}}') .
-  OPTIONAL { ?resource skos:prefLabel ?label . }
-  OPTIONAL { ?resource foaf:name ?label . }
-  OPTIONAL { ?resource ubbont:invertedName ?label . }
-  OPTIONAL { ?resource dct:title ?label . }
-  OPTIONAL { ?resource rdfs:label ?label . }
-  OPTIONAL { ?resource dbo:birthDate ?birth . }
-  OPTIONAL { ?resource dbo:deathDate ?death . }
-  ?resource rdf:type ?class .
-  ?class rdfs:label ?classLabel .
-  FILTER(langMatches(lang(?classLabel), ""))
-  }
-
-
-
-
diff --git a/components/static/cart.html b/components/static/cart.html
index 62ba675a..db8b3a8b 100755
--- a/components/static/cart.html
+++ b/components/static/cart.html
@@ -103,7 +103,7 @@
 
 								
 				<li><a href="{{lodspk.home}}collections"><i style="color: #aaa;" class="fa fa-th fa-fw"></i>  Samlinger</a></li>
-				<li><a href="{{lodspk.home}}images"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
+				<li><a href="{{lodspk.home}}search/?filter=type.exact%23Fotografi&filter=type.exact%23Album&filter=type.exact%23Grafikk&filter=type.exact%23Postkort"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
 				<li><a href="{{lodspk.home}}events"><i style="color: #aaa;" class="fa fa-calendar fa-fw"></i>  Hendelser</a></li>
 				<li><a href="{{lodspk.home}}albums"><i style="color: #aaa;" class="fa fa-book fa-fw"></i>  Album</a></li>
 				<li><a href="{{lodspk.home}}exhibitions"><i style="color: #aaa;" class="fa fa-university fa-fw"></i>  Utstillinger</a></li></ul>
@@ -169,34 +169,34 @@
 					</div>
 					
 					<!-- Text input-->
-                    <div class="form-group">
-                      <label class="col-md-4 control-label" for="c_phone">Telefon</label>
-                      <div class="col-md-6">
-                      <input id="c_phone" name="c_phone"placeholder="Telefonnummer" data-parsley-minlength="8" data-parsley-trigger="change" data-parsley-type="number" class="form-control input-md">
-                      </div>
-                    </div>
+          <div class="form-group">
+            <label class="col-md-4 control-label" for="c_phone">Telefon</label>
+            <div class="col-md-6">
+            <input id="c_phone" name="c_phone"placeholder="Telefonnummer" data-parsley-minlength="8" data-parsley-trigger="change" data-parsley-type="number" class="form-control input-md">
+            </div>
+          </div>
 
 					<!-- Text input-->
 					<div class="form-group">
-					  <label class="col-md-4 control-label" for="c_streetAddress">Adresse</label>  
+					  <label class="col-md-4 control-label" for="c_streetAddress"><span class="required-star">*</span> Adresse</label>  
 					  <div class="col-md-6">
-					  <input id="c_streetAddress" name="c_streetAddress" type="text" placeholder="Adresse" class="form-control input-md" data-parsley-excluded>   
+					  <input id="c_streetAddress" name="c_streetAddress" type="text" placeholder="Adresse" class="form-control input-md" data-parsley-excluded required>   
 					  </div>
 					</div>
 					
 					<!-- Text input-->
 					<div class="form-group">
-					  <label class="col-md-4 control-label" for="c_postCode">Postnummer</label>  
+					  <label class="col-md-4 control-label" for="c_postCode"><span class="required-star">*</span> Postnummer</label>  
 					  <div class="col-md-6">
-					  <input id="c_postCode" name="c_postCode" placeholder="Postnummer" data-parsley-minlength="4" data-parsley-trigger="change" class="form-control input-md">
+					  <input id="c_postCode" name="c_postCode" placeholder="Postnummer" data-parsley-minlength="4" data-parsley-trigger="change" class="form-control input-md" required>
 					  </div>
 					</div>
 					
 					<!-- Text input-->
 					<div class="form-group">
-					  <label class="col-md-4 control-label" for="c_postPlace">Poststed</label>  
+					  <label class="col-md-4 control-label" for="c_postPlace"><span class="required-star">*</span> Poststed</label>  
 					  <div class="col-md-6">
-					  <input id="c_postPlace" name="c_postPlace" type="text" placeholder="Poststed" class="form-control input-md">
+					  <input id="c_postPlace" name="c_postPlace" type="text" placeholder="Poststed" class="form-control input-md" required>
 					  </div>
 					</div>
 				
@@ -449,10 +449,10 @@
                   </div>	
 	
 					<div class="form-group">
-  					<label class="col-md-4 control-label" for="c_extBillingID">Referansenummer</label>
+  					<label class="col-md-4 control-label" for="c_extBillingID">Din referanse</label>
   					<div class="col-md-6">
   						<input id="c_extBillingID" name="c_extBillingID" type="text" placeholder="Fakturareferanse" class="form-control input-md">
-  						<span class="help-block">Referansenummer/fakturareferanse dersom det er nødvendig.</span>
+  						<span class="help-block">Din referanse/fakturareferanse dersom det er nødvendig.</span>
   					</div>
   				</div>
   				
@@ -513,6 +513,8 @@
             <li>Bildefiler skal ikke forandres eller manipuleres. Utsnitt bør unngås, men hvis det brukes, skal dette oppgis i bildeteksten.</li>
             <li>Bruker skal vise aktsomhet ved gjengivelse av bilder, slik at det ikke skjer til skade for / krenker avbildede personer eller skader fotografens ry (jfr. Ã…ndsverksloven).</li>
 					</ol>
+					<p>Vi gjør oppmerksom på at grunnet ulike originalformater vil bestilte papirbilder variere noe fra oppgitt størrelse.</p>
+					<br>
 					<label for="kontrakt">
 					<input type="checkbox" id="kontrakt" name="kontrakt" data-parsley-multiple="kontrakt" data-parsley-mincheck="2" data-parsley-validate-if-empty data-parsley-error-message="Du må bekrefte at du har lest og godkjent bruksvilkårene" data-parsley-errors-container=".my_error_container" data-parsley-class-handler=".my_error_container" data-parsley-group="kontrakt" required="required" required/> Jeg har lest og godtar bruksvilkårene</label>
 					<input style="visibility: hidden;" type="checkbox" name="kontrakt" value="false" data-parsley-group="kontrakt" data-parsley-multiple="kontrakt" checked />  
diff --git a/components/static/css/basic.css b/components/static/css/basic.css
index 102857c9..e1f29541 100755
--- a/components/static/css/basic.css
+++ b/components/static/css/basic.css
@@ -266,6 +266,10 @@ column-count:2;
 	 border-bottom: 1px solid #ddd; padding-left:15px; padding-bottom: 5px;
 }
 
+.thumbnail {
+  max-height: 450px;
+}
+
 /* WIKIPEDIA REFERENCING INFORMATION */
 #wikipedia-reference *, spreadsheet-reference * { font-size: 0.9em; }
 /* SPO view */
@@ -1075,3 +1079,22 @@ li .btn-marcus-arkiv {
   flex: 0 0 auto;
   margin-bottom: 30px;
 }
+
+/*
+ * Parsley.js validation
+ *
+ */
+
+.my_error_container {
+    color: red;
+    font-size: 1.3em;
+}
+
+/*
+ * Print image
+ *
+ */
+
+.digitalresource-print {
+  display: none;
+}
\ No newline at end of file
diff --git a/components/static/css/print.css b/components/static/css/print.css
index 25c7a11b..011c87ff 100644
--- a/components/static/css/print.css
+++ b/components/static/css/print.css
@@ -1,3 +1,10 @@
+@page {
+    size: 297mm 210mm; /* landscape */
+    /* you can also specify margins here: */
+    margin: 25mm;
+    margin-right: 45mm; /* for compatibility with both A4 and Letter */
+  }
+  
 #facetview_rightcol > div > div.btn-group.btn-group-sm {
 	display: none ;
 }
@@ -23,8 +30,23 @@
 	margin-left: 30px;
 }
 
-a[href]:after {
+p a[href]:after {
 	font-size: 12px;
 	content: "\A (" attr(href) ")";
 	white-space: pre;
+}
+
+.hidden-xs, #disqus_thread, .social, .simpleCart_shelfItem, .social-sidebar, .digitalresources-info, .digitalresource-block, .feedback-data-block {
+  display: none !important;
+}
+
+.digitalresource-print {
+  display: block;
+  float: right !important;
+}
+
+.digitalresource-print img {
+  
+  width: 50%;
+  margin-bottom: 20px;
 }
\ No newline at end of file
diff --git a/components/static/success.html b/components/static/success.html
index 90d68e08..2b713b3f 100755
--- a/components/static/success.html
+++ b/components/static/success.html
@@ -134,7 +134,7 @@
 
 								
 				<li><a href="{{lodspk.home}}collections"><i style="color: #aaa;" class="fa fa-th fa-fw"></i>  Samlinger</a></li>
-				<li><a href="{{lodspk.home}}images"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
+				<li><a href="{{lodspk.home}}search/?filter=type.exact%23Fotografi&filter=type.exact%23Album&filter=type.exact%23Grafikk&filter=type.exact%23Postkort"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
 				<li><a href="{{lodspk.home}}events"><i style="color: #aaa;" class="fa fa-calendar fa-fw"></i>  Hendelser</a></li>
 				<li><a href="{{lodspk.home}}albums"><i style="color: #aaa;" class="fa fa-book fa-fw"></i>  Album</a></li>
 				<li><a href="{{lodspk.home}}exhibitions"><i style="color: #aaa;" class="fa fa-university fa-fw"></i>  Utstillinger</a></li></ul>
diff --git a/components/static/technology.html b/components/static/technology.html
index 2b8741f3..00bcc0b4 100755
--- a/components/static/technology.html
+++ b/components/static/technology.html
@@ -102,7 +102,7 @@
 
 								
 				<li><a href="{{lodspk.home}}collections"><i style="color: #aaa;" class="fa fa-th fa-fw"></i>  Samlinger</a></li>
-				<li><a href="{{lodspk.home}}images"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
+				<li><a href="{{lodspk.home}}search/?filter=type.exact%23Fotografi&filter=type.exact%23Album&filter=type.exact%23Grafikk&filter=type.exact%23Postkort"><i style="color: #aaa;" class="fa fa-picture-o fa-fw"></i>  Bilder</a></li>
 				<li><a href="{{lodspk.home}}events"><i style="color: #aaa;" class="fa fa-calendar fa-fw"></i>  Hendelser</a></li>
 				<li><a href="{{lodspk.home}}albums"><i style="color: #aaa;" class="fa fa-book fa-fw"></i>  Album</a></li>
 				<li><a href="{{lodspk.home}}exhibitions"><i style="color: #aaa;" class="fa fa-university fa-fw"></i>  Utstillinger</a></li></ul>
diff --git a/components/types/bibo__Document/html.template b/components/types/bibo__Document/html.template
index 1f3f1575..1eaac3d1 100755
--- a/components/types/bibo__Document/html.template
+++ b/components/types/bibo__Document/html.template
@@ -67,10 +67,10 @@
 			<link  href="http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css" rel="stylesheet"> <!-- 3 KB -->
 			<script src="http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js"></script> <!-- 16 KB -->
 		    
-			    <div id="printable" class="fotorama" data-width="100%" data-height="650" data-allowfullscreen="native" data-fit="contain">
+			    <div id="printable" class="fotorama" data-width="100%" data-height="650" data-allowfullscreen="native" data-fit="scaledown">
 			    	{% for row in models.digitalresources %}    
 						<img src="{{row.imgSM.value}}" data-full="{{row.imgMD.value}}" alt=""/>
-					{% endfor %}
+            {% endfor %}
 				</div>
 		    </div>
 		    {% endif %}
@@ -102,6 +102,17 @@
 			    {% endfor %}
 			</ul>
 		    {% endif %}
+		    
+		    {% if models.reproducedby|length != 0 %}
+		    <h4><small>reprodusert av</small></h4>
+		    <ul class="list-unstyled">
+		    {% for row in models.reproducedby %}
+		    {% ifchanged row.url.value %}
+		    	<li class="h4" itemprop="creator" itemscope><a itemprop="url" href="{{ row.url.value }}"><span itemprop="name">{{ row.label.value }}</span></a></li>
+		    {% endifchanged %}
+		    {% endfor %}
+		    </ul>
+		    {% endif %}
 
         <!-- BIBSYS MAKER -->
         {% if models.bibsys.maker %}  
@@ -226,26 +237,28 @@
 			    $(".social-sidebar").popover();   
 			});
 			</script>
-	
-			<a class="qr" tabindex="0" data-toggle="popover" data-html="true" data-container="body" data-placement="right" data-content='<!-- QR CODE --><div id="qrcode"></div> 	<script type="text/javascript"> $("#qrcode").qrcode({ render: "image", minVersion: 3, maxVersion: 40, size: 150, quiet: 2, radius: 0.3, ecLevel: "Q", fill: "#00a7df", text:"{{lodspk.local.curie}}" }); </script>'>
-			<span class="fa-stack fa-lg m-button-black">
-			  <i class="fa fa-circle-thin fa-stack-2x"></i>
-			  <i class="fa fa-qrcode fa-stack-1x"></i>
-			</span>
-			</a>
-			<script type="text/javascript">
-			$(document).ready(function(){
-			    $(".qr").popover();   
-			});
-			</script>
 			
-			<hr class="slim">
-		
-			<!-- EMAIL FEEDBACK -->
-			<button type="button" class="btn btn-xs btn-link"><i class="fa fa-exclamation-triangle m-button-black"></i> <a href="mailto:mslib@uib.no?subject=Marcus - tilbakemelding på {{first.main.identifier.value}}&body=Tilbakemeldingen gjelder: {{first.main.identifier.value}} ({{lodspk.local.curie}}). La lenken være med, vi trenger den for å svare.">Feil? Gi oss beskjed!</a></button>
-			<!-- ALL DATA -->
-			<button type="button" class="btn btn-xs btn-link all-data" data-toggle="modal" data-target="#full-meta-view"><i class="fa fa-heart m-button-red pulse animated"></i> Vis data</button>
-			<button type="button" class="btn btn-xs btn-link"><i class="fa fa-external-link-square"></i> <a href="http://sparql.ub.uib.no/sparql?query=DESCRIBE+%3C{{lodspk.this.value}}%3E" target=_blank>Sparql</a></button>
+      <div class="feedback-data-block">
+  			<a class="qr" tabindex="0" data-toggle="popover" data-html="true" data-container="body" data-placement="right" data-content='<!-- QR CODE --><div id="qrcode"></div> 	<script type="text/javascript"> $("#qrcode").qrcode({ render: "image", minVersion: 3, maxVersion: 40, size: 150, quiet: 2, radius: 0.3, ecLevel: "Q", fill: "#00a7df", text:"{{lodspk.local.curie}}" }); </script>'>
+  			<span class="fa-stack fa-lg m-button-black">
+  			  <i class="fa fa-circle-thin fa-stack-2x"></i>
+  			  <i class="fa fa-qrcode fa-stack-1x"></i>
+  			</span>
+  			</a>
+  			<script type="text/javascript">
+  			$(document).ready(function(){
+  			    $(".qr").popover();   
+  			});
+  			</script>
+  			
+  			<hr class="slim">
+  		
+  			<!-- EMAIL FEEDBACK -->
+  			<button type="button" class="btn btn-xs btn-link"><i class="fa fa-exclamation-triangle m-button-black"></i> <a href="mailto:mslib@uib.no?subject=Marcus - tilbakemelding på {{first.main.identifier.value}}&body=Tilbakemeldingen gjelder: {{first.main.identifier.value}} ({{lodspk.local.curie}}). La lenken være med, vi trenger den for å svare.">Feil? Gi oss beskjed!</a></button>
+  			<!-- ALL DATA -->
+  			<button type="button" class="btn btn-xs btn-link all-data" data-toggle="modal" data-target="#full-meta-view"><i class="fa fa-heart m-button-red pulse animated"></i> Vis data</button>
+  			<button type="button" class="btn btn-xs btn-link"><i class="fa fa-external-link-square"></i> <a href="http://sparql.ub.uib.no/sparql?query=DESCRIBE+%3C{{lodspk.this.value}}%3E" target=_blank>Sparql</a></button>
+      </div>
 			
 			<!-- OWNER -->
 			{% if models.owner|length != 0 %}
@@ -310,7 +323,12 @@
 
 		</div>
 			
-			<div class="col-md-8 col-md-pull-4">	    
+			<div class="col-md-8 col-md-pull-4">
+  			
+  			<div class="digitalresource-print">
+  	   <img src="{{first.digitalresources.imgMD.value}}">
+	   </div>
+	   	    
 		    {% for row in models.description %}
 			    {% autoescape off %}
 			    <div class="decode-description" itemprop="description" class="lead">{% autoescape off %}{{ row.description.value|decodedescription }}{% endautoescape %}</div>
diff --git a/components/types/bibo__Document/queries/dzi.query b/components/types/bibo__Document/queries/dzi.query
index 490bbe78..70392db2 100755
--- a/components/types/bibo__Document/queries/dzi.query
+++ b/components/types/bibo__Document/queries/dzi.query
@@ -5,6 +5,6 @@ SELECT DISTINCT ?dziUri WHERE {
     ?page ubbont:hasDZIView|ubbont:hasResource/ubbont:hasDZIView ?dziUri0 .
     FILTER (regex(STR(?dziUri0), "dzi","i"))	
     BIND(REPLACE(?dziUri0, "marcus.uib.no","data.ub.uib.no","i") as ?dziUri)
-}
+  }
 }
 ORDER BY ?dziUri
\ No newline at end of file
diff --git a/components/types/ubbont__Charter/html.template b/components/types/ubbont__Charter/html.template
index eb6ff8aa..297cb571 100644
--- a/components/types/ubbont__Charter/html.template
+++ b/components/types/ubbont__Charter/html.template
@@ -211,7 +211,12 @@
 
 			</div>
 			
-			<div class="col-md-8 col-md-pull-4">	    
+			<div class="col-md-8 col-md-pull-4">
+			
+			<div class="digitalresource-print">
+  	   <img src="{{first.digitalresources.imgMD.value}}">
+	   </div>
+	   	    
 		    {% for row in models.description %}
 			    {% autoescape off %}
 			    <div itemprop="description">{% autoescape off %}{{ row.description.value|decodedescription }}{% endautoescape %}</div>
diff --git a/components/types/ubbont__Photograph/html.template b/components/types/ubbont__Photograph/html.template
index b3578766..26ae41f8 100755
--- a/components/types/ubbont__Photograph/html.template
+++ b/components/types/ubbont__Photograph/html.template
@@ -43,7 +43,7 @@
 				<!-- SOCIAL LINKS -->
 				{% include "../../includes/social.inc" %}
 			</div>
-	    </div>
+	  </div>
     
     <div class="row digitalresource-block">
 	    {% if models.dzi|length != 0 && models.digitalresources|length != 0 %}
@@ -89,15 +89,17 @@
 			<script src="http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.js"></script> <!-- 16 KB -->
 		    
 			    <div class="fotorama" data-width="100%" data-height="650" data-allowfullscreen="native">    
-					<img href="{{first.digitalresources.imgMD.value}}" data-fit="none" data-full="{{first.digitalresources.imgMD.value}}" alt=""/>
-					<img href="{{first.digitalresources.imgSM.value}}" data-fit="none" data-full="{{first.digitalresources.imgSM.value}}" alt=""/>
-				</div>
+  					<img href="{{first.digitalresources.imgMD.value}}" data-fit="scaledown" data-full="{{first.digitalresources.imgMD.value}}" alt=""/>
+  					<img href="{{first.digitalresources.imgSM.value}}" data-fit="scaledown" data-full="{{first.digitalresources.imgSM.value}}" alt=""/>
+  				</div>
 		    </div>
 		    {% endif %}
 		</div> <!-- END tab-content -->
     </div>
     <!-- END digitalresource-block -->
-    
+    <div class="digitalresource-print">
+  	   <img src="{{first.digitalresources.imgMD.value}}">
+	   </div>
 
 	<div class="row">
 		<div class="col-md-4 col-md-push-8">
@@ -114,12 +116,24 @@
 		<ul class="list-unstyled">
 		    {% for row in models.maker %}
 		    {% ifchanged row.maker.value %}
-		    	<li class="h4" itemprop="creator" itemscope itemtype="http://schema.org/Person">{% if row.thumb %}<img itemprop="image" class="img-circle" style="width:35px;" src="{{row.thumb.value}}">{%else%}<i class="fa fa-pencil-square-o"></i>{%endif%} <a itemprop="url" href="{{ row.maker.value }}"><span itemprop="name">{{ row.makerName.value }}</span></a></li>
+		    	<li class="h4" itemprop="creator" itemscope>{% if row.thumb %}<img itemprop="image" class="img-circle" style="width:35px;" src="{{row.thumb.value}}">{%else%}<i class="fa fa-pencil-square-o"></i>{%endif%} <a itemprop="url" href="{{ row.maker.value }}"><span itemprop="name">{{ row.makerName.value }}</span></a></li>
 		    {% endifchanged %}
 		    {% endfor %}
+		    
 		</ul>
 	    {% endif %}
 	    
+	    {% if models.reproducedby|length != 0 %}
+		    <h4><small>reprodusert av</small></h4>
+		    <ul class="list-unstyled">
+		    {% for row in models.reproducedby %}
+		    {% ifchanged row.url.value %}
+		    	<li class="h4" itemprop="creator" itemscope><a itemprop="url" href="{{ row.url.value }}"><span itemprop="name">{{ row.label.value }}</span></a></li>
+		    {% endifchanged %}
+		    {% endfor %}
+		    </ul>
+		  {% endif %}
+	    
 	    <!-- COMMISSIONED BY -->
 	    {% if models.commissionedby|length != 0 %}
 	    <hr class="slim">
@@ -157,7 +171,7 @@
 		    	Laget etter <strong>{{ first.main.madeafter.value }}</strong>
 		    {% endif %}
 		    {% if first.main.madeafter.value == null && first.main.madebefore.value != null %}
-		    	Laget før <strong>{{ first.main.madebefore.value }}</strong>
+		    	Laget før <strong>{{ first.main.madebefore.value }}</strong>
 		    {% endif %}
 		    </p>
 		{% endif %}
@@ -180,7 +194,7 @@
 				    	<li><p class="timeline-date">{{ first.main.madeafter.value }}</p> <div class="timeline-content">skapt etter</div></li>
 				    {% endif %}
 				    {% if first.main.madebefore.value != null %}
-				    	<li><p class="timeline-date">{{ first.main.madebefore.value }}</p> <div class="timeline-content">skapt før</div></li>
+				    	<li><p class="timeline-date">{{ first.main.madebefore.value }}</p> <div class="timeline-content">skapt før</div></li>
 				    {% endif %}  
 			    </li>
 				{% endif %}
@@ -194,7 +208,7 @@
 		<!-- ALBUM -->
 	    {% if models.albums|length != 0 %}
     	<hr>
-	    <p><i class="fa fa-book"></i> Finnes i albumet<br>
+	    <p class="album-info"><i class="fa fa-book"></i> Finnes i albumet<br>
 	    	<a href="{{ first.albums.uri.value }}">{% if first.albums.label.value %}{{ first.albums.label.value }}{% else %}{{ first.albums.identifier.value }}{% endif %}</a>
 	    </p>
 		{% endif %}
@@ -203,7 +217,7 @@
 			<!-- WEBRESOURCES -->
 			{% if models.webresources|length != 0 %}
 			<hr class="slim">
-					<p><strong class="text-muted">Nettsider</strong><br>
+					<p class="webresources-info"><strong class="text-muted">Nettsider</strong><br>
 						{% for row in models.webresources %}
 						<a target="_blank" href="{{row.uri.value}}">{{row.label.value}}</a> <i class="text-muted fa fa-external-link"></i><br>
 						{% endfor %}
@@ -249,13 +263,15 @@
 -->
 		
 		<!-- SHOPPING CART -->
-		<p>{% include "../../includes/simplecart.inc" %}</p>
-	    
+		{% if first.showsimplecart.showsimplecart.value == "true" %}
+		  <p>{% include "../../includes/simplecart.inc" %}</p>
+	  {% endif %}
+	  
 	    <hr class="slim">
 	    
 		<!-- DOWNLOAD -->
 	    {% if models.digitalresources|length != 0 %}	
-		<div class="btn-group">
+		<div class="digitalresources-info btn-group">
 		  <button type="button" class="btn btn-sm btn-default"><i class="fa fa-download"></i> Last ned</button>
 		  <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">
 		    <span class="caret"></span>
@@ -287,30 +303,33 @@
 			});
 		</script>
 	
-		<a class="qr" tabindex="0" data-toggle="popover" data-html="true" data-container="body" data-placement="right" data-content='<!-- QR CODE --><div id="qrcode"></div> 	<script type="text/javascript"> $("#qrcode").qrcode({ render: "image", minVersion: 3, maxVersion: 40, size: 150, quiet: 2, radius: 0.3, ecLevel: "Q", fill: "#00a7df", text:"{{lodspk.local.curie}}" }); </script>'>
-		<span class="fa-stack fa-lg m-button-black">
-		  <i class="fa fa-circle-thin fa-stack-2x"></i>
-		  <i class="fa fa-qrcode fa-stack-1x"></i>
-		</span>
-		</a>
+    <div class="feedback-data-block">
+  		<a class="qr" tabindex="0" data-toggle="popover" data-html="true" data-container="body" data-placement="right" data-content='<!-- QR CODE --><div id="qrcode"></div> 	<script type="text/javascript"> $("#qrcode").qrcode({ render: "image", minVersion: 3, maxVersion: 40, size: 150, quiet: 2, radius: 0.3, ecLevel: "Q", fill: "#00a7df", text:"{{lodspk.local.curie}}" }); </script>'>
+  		<span class="fa-stack fa-lg m-button-black">
+  		  <i class="fa fa-circle-thin fa-stack-2x"></i>
+  		  <i class="fa fa-qrcode fa-stack-1x"></i>
+  		</span>
+  		</a>
+  		
+  		<script type="text/javascript">
+  			$(document).ready(function(){
+  			    $(".qr").popover();   
+  			});
+  		</script>
+  	
+  		<hr class="slim">
+  
+  		<!-- EMAIL FEEDBACK -->
+  		<button type="button" class="btn btn-xs btn-link">
+  			<i class="fa fa-exclamation-triangle m-button-black"></i> 
+  			<a href="mailto:billed@ub.uib.no?subject=Marcus - tilbakemelding på {{first.main.identifier.value}}&body=Tilbakemeldingen gjelder: {{first.main.identifier.value}} ({{lodspk.local.curie}}). La lenken være med, vi trenger den for å svare.">Feil? Send oss en epost.</a>
+  			</button>
+  				
+  		<!-- ALL DATA -->
+  		<button type="button" class="btn btn-xs btn-link all-data" data-toggle="modal" data-target="#full-meta-view"><i class="fa fa-heart m-button-red pulse animated"></i> Vis data</button>
+  		<button type="button" class="btn btn-xs btn-link"><i class="fa fa-external-link-square"></i> <a href="http://sparql.ub.uib.no/sparql?query=DESCRIBE+%3C{{lodspk.this.value}}%3E" target=_blank>Sparql</a></button>
 		
-		<script type="text/javascript">
-			$(document).ready(function(){
-			    $(".qr").popover();   
-			});
-		</script>
-	
-		<hr class="slim">
-
-		<!-- EMAIL FEEDBACK -->
-		<button type="button" class="btn btn-xs btn-link">
-			<i class="fa fa-exclamation-triangle m-button-black"></i> 
-			<a href="mailto:billed@ub.uib.no?subject=Marcus - tilbakemelding på {{first.main.identifier.value}}&body=Tilbakemeldingen gjelder: {{first.main.identifier.value}} ({{lodspk.local.curie}}). La lenken være med, vi trenger den for å svare.">Feil? Send oss en epost.</a>
-			</button>
-				
-		<!-- ALL DATA -->
-		<button type="button" class="btn btn-xs btn-link all-data" data-toggle="modal" data-target="#full-meta-view"><i class="fa fa-heart m-button-red pulse animated"></i> Vis data</button>
-		<button type="button" class="btn btn-xs btn-link"><i class="fa fa-external-link-square"></i> <a href="http://sparql.ub.uib.no/sparql?query=DESCRIBE+%3C{{lodspk.this.value}}%3E" target=_blank>Sparql</a></button>
+		</div>
 
 		{% if models.owner|length != 0 %}
 		<p style="margin-left: 6px;"><small>
@@ -320,7 +339,9 @@
 
 	</div>
 		
-	<div class="col-md-8 col-md-pull-4">		    
+	<div class="col-md-8 col-md-pull-4">
+  	
+	   		    
 	    {% for row in models.description %}
 		    {% autoescape off %}
 		    <p itemprop="description" class="lead">{{ row.description.value }}</p>
diff --git a/components/types/ubbont__Postcard/html.template b/components/types/ubbont__Postcard/html.template
index 89cb59c6..cc3760f7 100644
--- a/components/types/ubbont__Postcard/html.template
+++ b/components/types/ubbont__Postcard/html.template
@@ -272,7 +272,12 @@
 
 	</div>
 		
-	<div class="col-md-8 col-md-pull-4">		    
+	<div class="col-md-8 col-md-pull-4">		
+	
+	  <div class="digitalresource-print">
+  	   <img src="{{first.digitalresources.imgMD.value}}">
+	   </div>
+	       
 	    {% for row in models.description %}
 		    {% autoescape off %}
 		    <div itemprop="description">{{ row.description.value|decodedescription }}</div>
@@ -418,6 +423,16 @@
 		</div>
 		{% endif %}
 		
+		<!-- TECHNIQUE -->
+		{% if models.technique|length != 0 %}
+		<h4>Teknikk</h4>
+			{% for row in models.technique %}
+				<h5>{{row.label.value}}</h5>
+				<p>{{row.description.value}}</p>
+			{% endfor %}
+		{% endif %}
+		
+		
 		<!-- PLACES/MAP -->
 		{% if models.places|length != 0 %}
 		<div class="row">
@@ -460,10 +475,6 @@
 			<p id="wikipedia-reference">
 	            <code class="citation-block">&#123;&#123;cite web |url={{lodspk.local.curie}} |title={{first.main.label.value}} |author=Avdeling for spesialsamlinger |accessdate={{lodspk.currentDate}} |publisher=University of Bergen Library&#125;&#125;</code>
 			</p>
-			<p>
-				<button type="button" class="btn btn-xs btn-default disabled">Endnote <small>(kommer)</small></button>
-				<button type="button" class="btn btn-xs btn-default disabled">RIS <small>(kommer)</small></button>
-			</p>
 		</div>
 	</div>
 </div>
diff --git a/robots.txt b/robots.txt
index e407438d..0ea9f024 100644
--- a/robots.txt
+++ b/robots.txt
@@ -3,4 +3,4 @@ User-agent: *
 Disallow: /search
 
 User-agent: Twitterbot
-Disallow: 
\ No newline at end of file
+Disallow: 
-- 
GitLab