schema.org microdata on charters

components/types/bibo__Document/html.template

@@ -90,7 +90,7 @@
 		<div class="col-md-4 col-md-push-8">
 			<!-- CLASS AND MAKER -->
 		    {% for row in models.main %}
-			    <h4 style="">{{ row.classLabel.value }}
+			    <h4>{{ row.classLabel.value }}
 			{% endfor %} 
 			{% if first.maker.maker.value == null %}</h4>{% endif %}
 				
@@ -202,6 +202,7 @@
 			<!-- 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>
 			
+			<!-- OWNER -->
 			{% if models.owner|length != 0 %}
 			<p style="margin-left: 6px;"><small>
 				<i class="fa fa-archive"></i> Eies av {%for row in models.owner%}{%if !forloop.last%}, {%endif%}<a href="{{row.uri.value}}">{{row.label.value}}</a>{%endfor%}</button>

components/types/ubbont__Charter/html.template

@@ -10,7 +10,7 @@
 		    	<div class="page-header">
 			    <h1 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%}</h1>
 			    {% if row.alternative %}
-			    <h2><small>{{row.alternative.value}}</small></h2>
+			    <h2 itemprop="alternativeHeadline"><small>{{row.alternative.value}}</small></h2>
 			    {% endif %}
 			    </div>
 				{% endfor %}
@@ -89,7 +89,7 @@
 			<div class="col-md-4 col-md-push-8">
 			<!-- CLASS AND MAKER -->
 		    {% for row in models.main %}
-			    <h4 style="">{{ row.classLabel.value }}
+			    <h4>{{ row.classLabel.value }}
 			{% endfor %} 
 			{% if first.maker.maker.value == null %}</h4>{% endif %}
 				
@@ -98,7 +98,7 @@
 			<ul class="list-unstyled">
 			    {% for row in models.maker %}
 			    {% ifchanged row.maker.value %}
-			    	<li class="h4" itemprop="creator" itemscope itemtype="http://schema.org/Person"><i class="fa fa-pencil-square-o"></i> <a itemprop="url" href="{{ row.maker.value }}">{{ row.makerName.value }}</a></li>
+			    	<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>
 			    {% endifchanged %}
 			    {% endfor %}
 			</ul>
@@ -201,14 +201,19 @@
 		<!-- 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>
 
-		
+			<!-- OWNER -->
+			{% if models.owner|length != 0 %}
+			<p style="margin-left: 6px;"><small>
+				<i class="fa fa-archive"></i> Eies av {%for row in models.owner%}{%if !forloop.last%}, {%endif%}<a href="{{row.uri.value}}">{{row.label.value}}</a>{%endfor%}</button>
+			</small></p>
+			{%endif%}
 
 			</div>
 			
 			<div class="col-md-8 col-md-pull-4">	    
 		    {% for row in models.description %}
 			    {% autoescape off %}
-			    <p class="lead">{{ row.description.value }}</p>
+			    <p itemprop="description" class="lead">{{ row.description.value }}</p>
 			    {% endautoescape %}
 		    {% endfor %}
 			    
@@ -216,7 +221,7 @@
 			{% if models.subjects|length != 0 %}
 			<!-- <p><small><i class="fa fa-tags"></i> Emne(r)</small></p>-->
 				<p class="lead">Dette dokumentet handler om 
-					{%for row in models.subjects%}{%ifchanged row.uri.value%}{%if forloop.first%}{%else%}, {%endif%}<span><a href="{{ row.uri.value }}">{{ row.label.value }}</a></span>{%endifchanged%}{%endfor%} 
+					{%for row in models.subjects%}{%ifchanged row.uri.value%}{%if forloop.first%}{%else%}, {%endif%}<span itemprop="keywords"><a href="{{ row.uri.value }}">{{ row.label.value }}</a></span>{%endifchanged%}{%endfor%} 
 				</p>
 			{% endif %}
 			

components/types/ubbont__Charter/queries/owner.query

+SELECT DISTINCT ?uri ?title ?label ?alternative ?available ?identifier ?img WHERE {
+    <{{ uri }}> bibo:owner ?uri .
+    OPTIONAL { ?uri dct:title ?title . }
+    OPTIONAL { ?uri rdfs:label ?label . }
+    OPTIONAL { ?uri foaf:name ?label . }
+    OPTIONAL { ?uri skos:prefLabel ?label . }
+    OPTIONAL { ?uri dct:alternative ?alternative . }
+    OPTIONAL { ?uri dct:identifier ?identifier . }
+	OPTIONAL { <{{ uri }}> foaf:logo ?img . }
+	OPTIONAL { <{{ uri }}> ubbont:hasThumbnail ?img . }
+}
+

components/types/ubbont__Photograph/html.template

@@ -94,7 +94,7 @@
 
 		<!-- CLASS AND MAKER -->
 	    {% for row in models.main %}
-		    <h4 style="">{{ row.classLabel.value }}
+		    <h4>{{ row.classLabel.value }}
 		{% endfor %} 
 		{% if first.maker.maker.value == null %}</h4>{% endif %}