From 15ba1a3805ed4a6ab476f934b64db5b4a47effdb Mon Sep 17 00:00:00 2001
From: Oeyvind Liland Gjesdal <ogj077@hindustan.uib.no>
Date: Wed, 26 Aug 2015 13:49:01 +0200
Subject: [PATCH] commit for all changes to be added to test-server
---
.../exhibition/queries/producedin.query | 9 +++++
components/services/home/html.template | 39 +------------------
.../services/instance%2Fevent/html.template | 4 +-
.../instance%2Fevent/queries/haspart.query | 8 +++-
components/types/bibo__Document/html.template | 20 ++++++----
.../bibo__Document/queries/exhibitions.query | 10 +++++
.../types/ubbont__Photograph/html.template | 9 ++++-
.../queries/exhibitions.query | 10 +++++
.../types/ubbont__Postcard/html.template | 9 ++++-
.../queries/exhibitions.query | 10 +++++
10 files changed, 77 insertions(+), 51 deletions(-)
create mode 100644 components/services/exhibition/queries/producedin.query
create mode 100644 components/types/bibo__Document/queries/exhibitions.query
create mode 100644 components/types/ubbont__Photograph/queries/exhibitions.query
create mode 100644 components/types/ubbont__Postcard/queries/exhibitions.query
diff --git a/components/services/exhibition/queries/producedin.query b/components/services/exhibition/queries/producedin.query
new file mode 100644
index 00000000..bae47d4b
--- /dev/null
+++ b/components/services/exhibition/queries/producedin.query
@@ -0,0 +1,9 @@
+SELECT DISTINCT ?uri ?label ?logo WHERE {
+ GRAPH <urn:x-arq:UnionGraph> {
+ <http://data.ub.uib.no/exhibition/{{lodspk.args.arg0}}> <http://purl.org/NET/c4dm/event.owl#producedIn> ?uri .
+ OPTIONAL { ?uri dct:title ?label . }
+ OPTIONAL { ?uri rdfs:label ?label . }
+ OPTIONAL { ?uri skos:prefLabel ?label . }
+ OPTIONAL { ?uri foaf:logo ?logo . }
+}
+}
\ No newline at end of file
diff --git a/components/services/home/html.template b/components/services/home/html.template
index b37d5075..b0cf836b 100644
--- a/components/services/home/html.template
+++ b/components/services/home/html.template
@@ -318,7 +318,7 @@
</div>
-<!-- NY UTSTILLINGSBLOKK - TARJE 10.07.2015
+<!-- NY UTSTILLINGSBLOKK - TARJE 10.07.2015-->
<div class="row">
<div class="col-md-12">
@@ -354,45 +354,8 @@
</div>
<br>
<br>
- </div>
-
-
--->
-
-<!-- SLETT FRA HER - TARJE 10.07.2015 -->
- <div class="row">
- <div class="col-md-12">
- <h3 class="slim-section-h">Utstillinger</h3>
- </div>
-
- <div class="col-md-8">
- <div class="col-lg-4 col-md-4 col-xs-3">
- <a href="/exhibition/danielssen"><img style="margin-top: 15px;" class="img-responsive img-circle" src="../img/danielssen/ubb-bs-fol-00842_007-sq.jpg" alt="EM-01456-Christie" width="" height="" /></a>
- </div>
- <h3><a href="/exhibition/danielssen">Daniel Cornelius Danielssen 1815 – 2015</a></h3>
- <p>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>
-
-<!--
- <a href="/exhibition/den-reisende-christie"><img style="margin-top: 15px;" class="img-responsive img-circle" src="../img/den-reisende-christie/EM-01456-Christie_crop.png" alt="EM-01456-Christie" width="" height="" /></a>
- <h3><a href="/exhibition/den-reisande-christie">Den reisande Christie</a></h3>
-
- <p>«Jeg har ofte rejst, og en stor Deel af mit Liv er rejst bort for mig». Slik opna Wilhelm Frimann Koren Christie (1778-1849) ei reisedagbok i 1815. Christie var embetsmann og jurist født inn i den norske eliten i Kristiansund. Han hadde ei strålande karriere som dommar, stiftamtmann og leiar for tolletaten i Bergen. Han var ein av dei viktigaste politikarane i 1814, men etter nokre år på Stortinget tok livet hans ei anna retning: Han stifta i 1825 Bergens Museum, ein kunnskapsinstitusjon som er forløparen til Universitetet i Bergen. I høve 200 årsjubileet for Grunnlova og <a href="http://www.uib.no/grunnlovsjubileet2014/48481/wilhelm-fk-christie-presidenten">lanseringa av ein biografi om Christie</a>, presenterer Spesialsamlingane ved Universitetsbiblioteket i Bergen ei stor mengd digitalisert materiale om Christie. Med reisemotivet som gjennomgåande tema gir denne utstillinga ein inngang til dette materialet. Reisene fortel oss noko om samfunnet på byrjinga av 1800-talet: om politikk, kunnskap og utveksling av tankar, gjenstandar og idear.<small><a href="/exhibition/den-reisande-christie"> ...les mer</a></small></p>
--->
- <div class="col-md-4">
- <h4>Flere utstillinger</h4>
- <ul class="list-inline">
- {% for row in models.exhibitions %}
- <li style="margin: 5px;"><a href="{{row.uri.value}}"><strong>{{row.label.value}}</strong></a></li>
- {% endfor %}
- </ul>
-
- </div>
- </div>
- <br>
- <br>
<!-- SLETT TIL HER - TARJE 10.07.2015 -->
<div style="margin-bottom: 25px;" class="row no-gutters">
diff --git a/components/services/instance%2Fevent/html.template b/components/services/instance%2Fevent/html.template
index 6b49a77d..8997f73b 100755
--- a/components/services/instance%2Fevent/html.template
+++ b/components/services/instance%2Fevent/html.template
@@ -162,9 +162,9 @@
<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" %}
+ {% if row.classLabel.value != "Samling" || row.classLabel.value != "Utstilling" %}
<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>
+ <a href="{{row.uri.value}}"><img class="img-responsive {% if row.classLabel.value == "Samling" || row.classLabel.value == "Utstilling" %}img-circle{%else%}img-rounded{%endif%}" {% 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%2Fevent/queries/haspart.query b/components/services/instance%2Fevent/queries/haspart.query
index db6f94be..c9bd48c0 100755
--- a/components/services/instance%2Fevent/queries/haspart.query
+++ b/components/services/instance%2Fevent/queries/haspart.query
@@ -10,9 +10,13 @@ SELECT DISTINCT ?uri ?title ?label ?description ?hasTranscription ?hasPage ?clas
OPTIONAL { ?uri dct:description ?description . }
OPTIONAL { ?uri dct:subject ?subject . ?subject skos:prefLabel ?subjectLabel . }
OPTIONAL { ?uri foaf:maker ?maker . ?maker foaf:name ?makerName . }
- #OPTIONAL { ?uri ubbont:hasThumbnail ?img . }
+ OPTIONAL { ?uri foaf:logo ?img . }
OPTIONAL { ?uri ubbont:hasRepresentation/dct:hasPart/ubbont:hasSMView ?img . }
-}
+ OPTIONAL { ?uri ubbont:hasRepresentation/dct:hasPart ?page.
+ ?page ubbont:sequenceNr 2.
+ ?page ubbont:hasResource ?resource.
+ ?resource ubbont:hasSMView ?img . }
+ }
GRAPH ubbont:ubbont {
?class rdfs:label ?classLabel .
FILTER(langMatches(lang(?classLabel), ""))
diff --git a/components/types/bibo__Document/html.template b/components/types/bibo__Document/html.template
index 78921097..c8bbd1ff 100755
--- a/components/types/bibo__Document/html.template
+++ b/components/types/bibo__Document/html.template
@@ -273,13 +273,19 @@
{% endautoescape %}
{% endfor %}
- <!-- SUBJECTS -->
- {% 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 itemprop="keywords"><a href="{{ row.uri.value }}">{{ row.label.value }}</a></span>{%endifchanged%}{%endfor%}
- </p>
- {% endif %}
+ <!-- EXHIBTIONS -->
+ {% if models.exhibitions|length != 0 %}
+ <p class="lead">Dette bildet er en del av utstillingen{% if models.exhibitions|length > 1 %}e{%endif%}
+ {%for row in models.exhibitions%}{%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 %}
+
+ <!-- SUBJECTS -->
+ {% if models.subjects|length != 0 %}
+ <p class="lead">Dette bildet er knyttet til {% if models.subjects|length > 1 %}emnene{%else%}emnet{%endif%}
+ {%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 %}
<!-- ALBUM -->
{% if models.albums|length != 0 %}
diff --git a/components/types/bibo__Document/queries/exhibitions.query b/components/types/bibo__Document/queries/exhibitions.query
new file mode 100644
index 00000000..e4d521d3
--- /dev/null
+++ b/components/types/bibo__Document/queries/exhibitions.query
@@ -0,0 +1,10 @@
+SELECT DISTINCT ?uri ?label WHERE {
+GRAPH <urn:x-arq:UnionGraph> {
+ <{{ uri }}> dct:isPartOf ?uri .
+ ?uri a ubbont:Exhibition ;
+ dct:title ?label .
+
+ #OPTIONAL { ?uri rdfs:label ?label . }
+ }
+}
+
diff --git a/components/types/ubbont__Photograph/html.template b/components/types/ubbont__Photograph/html.template
index df299030..d03da34f 100755
--- a/components/types/ubbont__Photograph/html.template
+++ b/components/types/ubbont__Photograph/html.template
@@ -307,10 +307,17 @@
<p itemprop="description" class="lead">{{ row.description.value }}</p>
{% endautoescape %}
{% endfor %}
+
+ <!-- EXHIBTIONS -->
+ {% if models.exhibitions|length != 0 %}
+ <p class="lead">Dette bildet er en del av utstillingen{% if models.exhibitions|length > 1 %}e{%endif%}
+ {%for row in models.exhibitions%}{%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 %}
<!-- SUBJECTS -->
{% if models.subjects|length != 0 %}
- <p class="lead">Dette bildet er knyttet til emnene
+ <p class="lead">Dette bildet er knyttet til {% if models.subjects|length > 1 %}emnene{%else%}emnet{%endif%}
{%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 %}
diff --git a/components/types/ubbont__Photograph/queries/exhibitions.query b/components/types/ubbont__Photograph/queries/exhibitions.query
new file mode 100644
index 00000000..e4d521d3
--- /dev/null
+++ b/components/types/ubbont__Photograph/queries/exhibitions.query
@@ -0,0 +1,10 @@
+SELECT DISTINCT ?uri ?label WHERE {
+GRAPH <urn:x-arq:UnionGraph> {
+ <{{ uri }}> dct:isPartOf ?uri .
+ ?uri a ubbont:Exhibition ;
+ dct:title ?label .
+
+ #OPTIONAL { ?uri rdfs:label ?label . }
+ }
+}
+
diff --git a/components/types/ubbont__Postcard/html.template b/components/types/ubbont__Postcard/html.template
index 299a308c..90078531 100644
--- a/components/types/ubbont__Postcard/html.template
+++ b/components/types/ubbont__Postcard/html.template
@@ -279,9 +279,16 @@
{% endautoescape %}
{% endfor %}
+ <!-- EXHIBTIONS -->
+ {% if models.exhibitions|length != 0 %}
+ <p class="lead">Dette bildet er en del av utstillingen{% if models.exhibitions|length > 1 %}e{%endif%}
+ {%for row in models.exhibitions%}{%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 %}
+
<!-- SUBJECTS -->
{% if models.subjects|length != 0 %}
- <p class="lead">Dette postkortet er knyttet til emnene
+ <p class="lead">Dette bildet er knyttet til {% if models.subjects|length > 1 %}emnene{%else%}emnet{%endif%}
{%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 %}
diff --git a/components/types/ubbont__Postcard/queries/exhibitions.query b/components/types/ubbont__Postcard/queries/exhibitions.query
new file mode 100644
index 00000000..e4d521d3
--- /dev/null
+++ b/components/types/ubbont__Postcard/queries/exhibitions.query
@@ -0,0 +1,10 @@
+SELECT DISTINCT ?uri ?label WHERE {
+GRAPH <urn:x-arq:UnionGraph> {
+ <{{ uri }}> dct:isPartOf ?uri .
+ ?uri a ubbont:Exhibition ;
+ dct:title ?label .
+
+ #OPTIONAL { ?uri rdfs:label ?label . }
+ }
+}
+
--
GitLab