Commit f5bacebb authored by Oyvind.Gjesdal's avatar Oyvind.Gjesdal

Merge branch '8-noe-css-har-forsvunnet-i-oppgraderinger-endringer' into 'master'

Resolve "Noe css har forsvunnet i oppgraderinger/endringer"

Closes #8

See merge request !4
parents f110164f a3380576
Pipeline #82935 passed with stages
in 1 minute and 29 seconds
stages:
- admin_test
admin_test:
image: oyvindlg/gitlab-ci-library:node-12
stage: "admin_test"
before_script:
- eval $(ssh-agent -s)
variables:
DEST: /var/www/html/marcus-admin/components
stages:
- build
- deploy
- deploy_prod
build:
image: oyvindlg/gitlab-ci-library:node-6
stage: "build"
before_script:
- npm install -g gulp@3.9.0
- npm install gulp@3.9.0
script:
- npm install --ignore-scripts
- rm -rf node_modules/semantic/dist static/semantic/components && cp -r node_modules/semantic-ui static/semantic/
- cp -f ./static/themes/default.theme.config ./static/semantic/src/theme.config && cp -f ./default.semantic.json static/semantic/semantic.json && cp -r static/themes/uib static/semantic/src/themes/
- cd static/semantic && gulp build
artifacts:
paths:
- static/semantic/
- node_modules/leaflet
- node_modules/openseadragon
deploy:
image: oyvindlg/gitlab-ci-library:node
stage: deploy
before_script:
- eval $(ssh-agent -s)
- echo $MARCUS_TEST_KEY | base64 --decode | ssh-add -
- npm install -g gulp
script:
- npm install
- cp -f ./static/themes/default.theme.config ./static/semantic/src/theme.config
- cp -R ./static/themes/uib ./static/semantic/src/themes/
- cd static/semantic
- npx gulp build
- cd ../..
- rsync -r -e "ssh -o StrictHostKeyChecking=no" --exclude=./static/js/blackbox-search --delete ./ $MARCUS_USER@["$MARCUS_TEST_SERVER"]:/var/www/html/marcus-admin/components
- rsync -v -r -e "ssh -o StrictHostKeyChecking=no" --keep-dirlinks --exclude-from=rsync-exclude.txt --delete ./ $MARCUS_USER@"[$MARCUS_TEST_SERVER_IPV6]":$DEST
tags:
- spes
artifacts:
paths:
- static/semantic
- node_modules/fomantic-ui
deploy_prod:
image: oyvindlg/gitlab-ci-library:node
stage: deploy_prod
before_script:
- eval $(ssh-agent -s)
- echo $MARCUS_PROD_KEY | base64 --decode | ssh-add -
script:
- ssh -o StrictHostKeyChecking=no -6 $MARCUS_USER@"$MARCUS_SERVER_IPV6" echo 'hello'
- rsync -v -r -e "ssh -o StrictHostKeyChecking=no" --exclude 'static/js/blackbox-search' --delete ./ $MARCUS_USER@"[$MARCUS_SERVER_IPV6]":"$DEST"
- ssh $MARCUS_USER@"$MARCUS_SERVER_IPV6" "sudo /usr/bin/find /var/www/html/marcus-admin/cache -regex .+ -type f -delete"
tags:
- spes
only:
- master
when: manual
# admin-components
# Admin components
This repository contains all queries, templates and extra views for the Marcus administrative webside (admin.marcus.uib.no). The site is based on Semantic-UI. There is a submodule for the search
On commit, the current branch will be updated on https://admin.marcus.ubbe.no/home.
To update marcus admin, merge to `master` and manually run the `update-prod` job.
## Install
Configuration files used to change components
......@@ -18,9 +24,14 @@ npx gulp build
```
## Install Blackbox-search
https://gitlab.com/ubbdev/marcus-search-client
Blackbox searchclient is built from https://git.app.uib.no/uib-ub/spesialsamlingene/marcus-search-client/-/tree/modularize-admin and branches from modularize-admin (for tes
Updating the search of admin.marcus.uib.no is a manual CI-task, for the modularize-admin branch only. Visit the commit to update admin-search from in the modularize-admin branch, and click the play button for `deploy_prod`.
```bash
# To install manually locally (don't use for prod or test servers, which are managed from the git repo)
## static/js/blackbox-search er i .gitignore
cd static/js/
mkdir blackbox-search
......
{
"base": "static/semantic/",
"base": "",
"paths": {
"source": {
"config": "src/theme.config",
"definitions": "src/definitions/",
"site": "src/site/",
"themes": "../themes/"
"themes": "src/themes/"
},
"output": {
"packaged": "dist/",
......
{%if models.po|length != 0 %}
{%if models.po | length > 0 %}
<div class="ui segment">
<div class="header">
Denne siden har disse egenskapene
......@@ -11,13 +11,13 @@
<tr>
<td class="collapsing">{% ifchanged row.p.value %}<a href="{{row.p.value}}">{% if row.classLabel %}{{row.classLabel.curie}}{% else %}{{row.p.value}}{%endif%}</a>{% endifchanged%}</td>
<td>
{%if row.o.uri == 1 && row.label %}
{%if not row.o.uri | null && row.label %}
<a rel='{{row.p.value}}' href='{{row.o.value}}'>{{row.label.value}}</a>
{%endif%}
{%if row.o.uri == 1 && !row.label %}
{%if not row.o.uri | null && !row.label %}
<a rel='{{row.p.value}}' href='{{row.o.value}}'>{{row.o.curie}}</a>
{%endif%}
{%if row.o.uri == 0 && !row.label %}
{%if row.o.uri | null && !row.label %}
<span property='{{row.p.value}}'>{{row.o.value}}</span>
{%endif%}
</td>
......@@ -29,38 +29,3 @@
</table>
</div>
{%endif%}
<!--
{%if models.sp|length != 0 %}
<div class="ui segment">
<div class="header">
Disse objektene lenker til denne siden
</div>
<table class="ui basic collapsing celled table" about="{{uri}}">
<thead>
<tr><th>Subjekt</th><th>Predikat</th><th>Objekt</th></tr>
</thead>
{% for row in models.sp %}
<tr>
<td>
{%if row.s.uri == 1 && row.label %}
<a rel='{{row.p.value}}' href='{{row.s.value}}'>{{row.label.curie}}</a>
{%endif%}
{%if row.s.uri == 1 && !row.label %}
<a rel='{{row.p.value}}' href='{{row.s.value}}'>{{row.s.curie}}</a>
{%endif%}
{%if row.s.uri != 1 && !row.label %}
<span property='{{row.p.value}}'>{{row.s.value}}</span>
{%endif%}
</td>
<td class="collapsing">{% ifchanged row.p.value %}<a href="{{row.p.value}}">{% if row.classLabel %}{{row.classLabel.curie}}{% else %}{{row.p.value}}{%endif%}</a>{% endifchanged%}</td>
<td class="collapsing">{%if forloop.first%}<a href='{{lodspk.this.value}}'>Denne siden</a>{%endif%}</td>
</tr>
{% endfor %}
<tfoot>
<tr><th>Subjekt</th><th>Predikat</th><th>Objekt</th></tr>
</tfoot>
</table>
</div>
{%endif%}
-->
\ No newline at end of file
......@@ -10,7 +10,7 @@
<img data-src="holder.js/200x100">
</a>{% endif %}
<div class="middle aligned content">
<a class="header" href="{{row.uri.value}}">{% 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%}</a>
<a class="header" href="{{row.uri.value}}">{% if row.title && not row.title.value | null %}{{row.title.value}}{% else %}{% if row.label && not row.label.value | null %}{{row.label.value}}{% else %} {{row.identifier.value}}{%endif%}{%endif%}</a>
<!--{% if row.description %}
<div class="description">
<p>{{row.description.value|truncatewords:25}}</p>
......
......@@ -4,16 +4,16 @@
</strong></p>
{% endif %}
{% if first.main.madeafter.value != null || first.main.madebefore.value != null %}
{% if not first.main.madeafter.value | null || not first.main.madebefore.value | null %}
<p><i class="fa fa-calendar"></i>
{% if first.main.madeafter.value != null && first.main.madebefore.value != null %}
{% if not first.main.madeafter.value | null && not first.main.madebefore.value | null %}
Laget mellom <strong>{{ first.main.madeafter.value }}</strong> og <strong>{{ first.main.madebefore.value }}</strong>
{% endif %}
{% if first.main.madeafter.value != null && first.main.madebefore.value == null %}
{% if not first.main.madeafter.value | null && first.main.madebefore.value | null %}
Laget etter <strong>{{ first.main.madeafter.value }}</strong>
{% endif %}
{% if first.main.madeafter.value == null && first.main.madebefore.value != null %}
{% if first.main.madeafter.value | null && not first.main.madebefore.value | null %}
Laget før <strong>{{ first.main.madebefore.value }}</strong>
{% endif %}
</p>
{% endif %}
\ No newline at end of file
{% endif %}
{% if models.dzi|length != 0 %}
{% if models.dzi | length > 0 %}
{% set dzi_enabled = 'true' %}
{% set dzi_dr = 'true' %}
{% endif %}
{% if models.digitalresources | length > 0 %}
{% set dr_enabled = 'true' %}
{% set dzi_dr = 'true' %}
{% endif %}
{% if dzi_enabled == 'true' %}
<!-- Contains the OpenSeadragon viewer -->
<div class="ui top attached tab segment no-padding active" data-tab="dzi">
<div id="dzi1" style="height:50rem; background-color: black;"></div>
</div>
{% endif %}
{% if models.digitalresources|length != 0 %}
<div data-tab="jpeg" class="{% if models.dzi|length == 0 %}active{% endif %} ui top attached tab segment no-padding">
{% if models.digitalresources| length > 0 %}
<div data-tab="jpeg" class="{% if not dzi_enabled == 'true' %}active{% endif %} ui top attached tab segment no-padding">
<!-- fotorama.css & fotorama.js. -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css" rel="stylesheet">
......@@ -22,10 +30,10 @@
</div>
{% endif %}
{% if models.dzi|length != 0 && models.digitalresources|length != 0 %}
{% if dzi_enabled == 'true' && dr_enabled == 'true' %}
<div class="ui bottom attached tabular menu dr-tab">
<a class="item {% if models.dzi|length != 0 %}active{% else %}disabled{% endif %}" data-tab="dzi">Zoom</a>
<a class="item {% if models.dzi|length == 0 %}active{% endif %}" data-tab="jpeg">Jpeg</a>
<a class="item {% if dzi_enabled == 'true' %}active{% else %}disabled{% endif %}" data-tab="dzi">Zoom</a>
<a class="item {% if not dzi_enabled == 'true' %}active{% endif %}" data-tab="jpeg">Jpeg</a>
<div id="dzi-control" class="right menu">
......
......@@ -5,7 +5,7 @@
<button id="full-page" class="ui button" alt="Fullskjermvisning av og på"><i id="fullPage" class="fa fa-expand"></i></button>
<button id="zoom-out" class="ui button"><i class="fa fa-search-minus"></i></button>
<button id="zoom-in" class="ui button"><i class="fa fa-search-plus"></i></button>
{% if models.dzi|length > 1 %}
{% models.dzi|length > 1 %}
<button id="previous" class="ui button"><i class="fa fa-arrow-left"></i> forrige</button>
<button>gå til side &nbsp;<input style="width: 55px;" type="number" id="page" value="1"/> av <span id="tileSourcesLength"></span></button>
<button id="next" class="ui button">neste <i class="fa fa-arrow-right"></i></button>
......@@ -19,7 +19,7 @@
id: "dzi1",
prefixUrl: "{{lodspk.home}}vjs/openseadragon/images/",
tileSources: [
{% for row in models.dzi %}{%if !forloop.first && models.dzi|length > 1 %},{%endif%}
{% for row in models.dzi %}{%if !forloop.first && not models.dzi| null %},{%endif%}
"{{ row.dziUri.value }}"{% endfor %}
],
preserveViewport: false,
......
......@@ -11,7 +11,7 @@
</a>
{% endif %}
<div class="middle aligned content">
<a class="header" href="{{row.uri.value}}">{% 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%}</a>
<a class="header" href="{{row.uri.value}}">{% if row.title && not row.title.value | null %}{{row.title.value}}{% else %}{% if row.label && not row.label.value | null %}{{row.label.value}}{% else %} {{row.identifier.value}}{%endif%}{%endif%}</a>
<!-- {% if row.description %}
<div class="description">
<p>{{row.description.value|truncatewords:25}}</p>
......
<meta charset="utf-8">
<title>{{lodspk.title}} {% if first.main.title.value != "" %} - {{first.main.title.value}}{% else %} - {% if first.main.label.value != "" %}{{first.main.label.value}}{%endif%}{%endif%}</title>
<title>{{lodspk.title}} {% if not first.main.title.value | null %} - {{first.main.title.value}}{% else %} - {% if not first.main.label.value | null %}{{first.main.label.value}}{%endif%}{%endif%}</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<link rel="shortcut icon" href="//img/favicon-adm.ico" type="image/x-icon">
<link rel="icon" href="//img/favicon-adm.ico" type="image/x-icon">
......
......@@ -6,11 +6,8 @@
<a href="{{lodspk.home}}cataloguers"><i style="color: black;" class="fa fa-check-square-o fa-fw"></i> Siste 500</a>
</li>
<li>
<a href="http://marcus.uib.no/admin/upload.html"><i style="color: black;" class="fa fa-upload fa-fw"></i> Last opp filer</a>
<a href="/upload/"><i style="color: black;" class="fa fa-upload fa-fw"></i> Last opp filer</a>
</li>
<!-- <li>
<a class="text-muted" href="{{lodspk.home}}upload.html"><i style="color: black;" class="fa fa-upload fa-fw"></i> Last opp filer (kommer senere, under arbeid)</a>
</li> -->
<li>
<a href="{{lodspk.home}}new-resource"><i style="color: black;" class="fa fa-plus fa-fw"></i> Filer klare for registrering</a>
</li>
......@@ -54,4 +51,4 @@
<li>
<a href="{{lodspk.home}}manual"><i style="color: black;" class="fa fa-book fa-fw"></i> Veiledning</a>
</li>
</ul>
\ No newline at end of file
</ul>
<div class="ui horizontal list">
{% if models.sender|length != 0 %}
{% if models.sender| length > 0 %}
{% for row in models.sender %}
<div class="item"><a href="{{row.uri.value}}">{{ row.label.value }}</a></div>
{% endfor %}
......@@ -9,7 +9,7 @@
<div class="item"><i class="fa fa-arrow-right"></i> <i class="fa fa-envelope"></i></div>
{% if models.recipient|length != 0 %}
{% if models.recipient| length > 0 %}
{% for row in models.recipient %}
<div class="item"><a href="{{row.uri.value}}">{{ row.label.value }}</a></div>
{% endfor %}
......
......@@ -20,7 +20,7 @@
Katalogisér <i class="flag icon"></i>
</a>
<div class="content">
<a class="item" href="http://marcus.uib.no/admin/upload.html">
<a class="item" href="/upload/">
<i class="upload icon"></i> Last opp
</a>
<a class="item" href="{{lodspk.home}}search/?filter=isCatalogued%23Ikke%20katalogisert">
......@@ -113,4 +113,4 @@
<a class="item" href="https://sak.uib.no/projects/pw0/issues/new" target="_blank">
<i class="exclamation triangle icon"></i>Feil
</a>
</div>
\ No newline at end of file
</div>
......@@ -10,9 +10,9 @@
</script>
<ul class="list-inline social">
<li><a href='https://twitter.com/intent/tweet?text={% if first.main.title != "" %}{{first.main.title.value}}{% else %}{% if first.main.label != "" %}{{first.main.label.value}}{%endif%}{%endif%} Fra marcus.uib.no&url={{lodspk.local.value}}'><i class="fa fa-twitter fa-2x"></i></a></li>
<li><a href='https://twitter.com/intent/tweet?text={% if not first.main.title | null %}{{first.main.title.value}}{% else %}{% if not first.main.label | null %}{{first.main.label.value}}{%endif%}{%endif%} Fra marcus.uib.no&url={{lodspk.local.value}}'><i class="fa fa-twitter fa-2x"></i></a></li>
<li><a href="https://www.facebook.com/sharer/sharer.php?u={{lodspk.local.value}}" target="_blank"><i class="fa fa-facebook-square fa-2x"></i></a></li>
<li><a href="http://www.pinterest.com/pin/create/button/?url={{lodspk.local.value}}&media={% for row in models.photograph %}{% if 'lg.jpg' in row.img.value %}{{row.img.value}}{% endif %}{% endfor %}&description={% if first.main.title != '' %}{{first.main.title.value}}{% else %}{% if first.main.label != '' %}{{first.main.label.value}}{%endif%}{%endif%} Fra marcus.uib.no" data-pin-do="buttonPin" data-pin-height="16"></i></a></li>
<li><a href="http://www.pinterest.com/pin/create/button/?url={{lodspk.local.value}}&media={% for row in models.photograph %}{% if 'lg.jpg' in row.img.value %}{{row.img.value}}{% endif %}{% endfor %}&description={% if first.main.title != '' %}{{first.main.title.value}}{% else %}{% if not first.main.label | null %}{{first.main.label.value}}{%endif%}{%endif%} Fra marcus.uib.no" data-pin-do="buttonPin" data-pin-height="16"></i></a></li>
</ul>
......
......@@ -13,17 +13,17 @@
<p><i class="fa fa-stethoscope"></i><a data-toggle="collapse" data-target="#physical-reference"> Fysisk beskrivelse <span class="caret"></span></a></p>
<ul id="physical-reference" class="collapse">
{% if first.physical.height.value != null && first.physical.width.value != null %}
{% if not first.physical.height.value | null && not first.physical.width.value | null %}
<li><i class="fa fa-arrows-v"></i> {{ first.physical.height.value }}</li>
<li><i class="fa fa-arrows-h"></i> {{ first.physical.width.value }}</li>
{% endif %}
{% if first.main.pages.value != null %}
{% if not first.main.pages.value | null %}
<li>{{ first.main.pages.value }} sider</li>
{% endif %}
{% if first.physical.physicalCondition.value != null %}
{% if not first.physical.physicalCondition.value | null %}
<li><i>{{ first.physical.physicalCondition.value }}</i></li>
{% endif %}
{% if first.physical.physicalDescription.value != null %}
{% if not first.physical.physicalDescription.value | null %}
<li>{{ first.physical.physicalDescription.value }}</li>
{% endif %}
</ul>
......@@ -51,7 +51,7 @@
<script>$('[data-toggle="tooltip"]').tooltip({'placement': 'top'});</script>
{% endif %}
<!-- PDF DOWNLOAD -->
{% if models.pdf|length != 0 %}
{% if models.pdf| length > 0 %}
<li><small>Last ned</small><br><i class="fa fa-download"></i> <a href="{{first.pdf.uri.value }}">PDF</a></li>
{% endif %}
</ul>
......
......@@ -11,7 +11,7 @@
<div class="ui dropdown item">
<i class="flag icon"></i>Katalogisér
<div class="menu side-nav-popout">
<a class="item" href="http://marcus.uib.no/admin/upload.html">
<a class="item" href="/upload/">
<i class="upload icon"></i> Last opp
</a>
<a class="item" href="{{lodspk.home}}search/?filter=isCatalogued%23Ikke%20katalogisert">
......
......@@ -19,9 +19,11 @@
"license": "ISC",
"dependencies": {
"datatables": "^1.10.13",
"fomantic-ui": "^2.8.4",
"gulp": "3.9.1",
"semantic-ui": "2.2.4",
"leaflet": "^1.2.0",
"openseadragon": "^2.3.1",
"openseadragon": "~2.3.1",
"stream-series": "^0.1.1",
"timelinejs3": "^3.4.0"
}
}
static/js/blackbox-search
services/instance%2Fjournal
services/instance%2Forganization
types/bibo__Document
{
"base": "static/semantic",
"paths": {
"source": {
"config": "src/theme.config",
"definitions": "src/definitions/",
"site": "src/site/",
"themes": "src/themes/"
},
"output": {
"packaged": "dist/",
"uncompressed": "dist/components/",
"compressed": "dist/components/",
"themes": "dist/themes/"
},
"clean": "dist/"
},
"permission": false,
"autoInstall": true,
"rtl": false,
"version": "2.8.4"
"autoInstall": true
}
......@@ -23,7 +23,7 @@
<div class="equal width stackable row">
<div class="three wide column">
{% if first.main.logo != null %}
{% if not first.main.logo | null %}
<img class="ui circular image" src="{{first.main.logo.value}}">
{% endif %}
......
......@@ -17,7 +17,7 @@
<div class="ui segment">
<div class="ui grid">
<div class="three wide column">
{% if first.main.logo != null %}
{% if not first.main.logo | null %}
<img class="ui circular image" src="{{first.main.logo.value}}">
{% endif %}
......
......@@ -26,7 +26,7 @@ SELECT DISTINCT ?uri ?title ?label ?available ?description ?classLabel ?identif
OPTIONAL { ?uri ubbont:showWeb ?show . }
OPTIONAL { ?uri ubbont:cataloguer ?cat . ?cat foaf:name ?cataloguer }
#OPTIONAL { ?uri ubbont:sequenceNr ?nr }
OPTIONAL { ?uri dct:identifier ?identifier . }
{ ?uri dct:identifier ?identifier . }
OPTIONAL { ?uri dct:description ?description . }
OPTIONAL { ?uri dct:subject ?subject . ?subject skos:prefLabel ?subjectLabel . }
OPTIONAL { ?uri foaf:maker ?maker . ?maker foaf:name ?makerName . }
......
......@@ -28,7 +28,7 @@ SELECT DISTINCT ?uri ?title ?label ?available ?description ?classLabel ?identif
OPTIONAL { ?uri ubbont:showWeb ?show . }
#OPTIONAL { ?uri ubbont:cataloguer ?cat . ?cat foaf:name ?cataloguer }
#OPTIONAL { ?uri ubbont:sequenceNr ?nr }
OPTIONAL { ?uri dct:identifier ?identifier . }
{ ?uri dct:identifier ?identifier . }
OPTIONAL { ?uri dct:description ?description . }
#OPTIONAL { ?uri dct:subject ?subject . ?subject skos:prefLabel ?subjectLabel . }
#OPTIONAL { ?uri foaf:maker ?maker . ?maker foaf:name ?makerName . }
......
......@@ -22,7 +22,7 @@
<p>{% if first.main.altname %}Også kjent som: <ul class="list-inline text-muted">{% for row in models.main %}{% ifchanged row.label.value %}<li><i>{{row.altname.value}}</i></li>{% endifchanged %}{% endfor %}</ul>{% endif %}</p>
{% if first.dbpedia.sameas.dbparticle != null %}
{% if not first.dbpedia.sameas.dbparticle | null %}
<div class="ui message">
{% for i in models.dbpedia.sameas %}
{% ifchanged i.dbparticle.value %}
......
......@@ -21,12 +21,12 @@
<div class="equal width stackable row">
<div class="three wide column">
{% if first.main.logo != null %}
{% if not first.main.logo | null %}
<img class="ui image" src="{{first.main.logo.value}}">
{% endif %}
{% if first.main.begin.value != false || first.main.end.value != false %}
{% if not first.main.begin.value | null || not first.main.end.value | null %}
{% if first.main.begin.value == first.main.end.value %}
<p><strong>Dato</strong><br>
<p>{{first.main.begin.value}}</p>
......@@ -130,7 +130,7 @@
</div>
{% endif %}
{% if first.haspart.uri != null %}
{% if not first.haspart.uri | null %}
<div class="ui items">
{% for row in models.haspart %}
{% ifchanged row.uri.value %}
......
......@@ -22,7 +22,7 @@
<p>{% if first.main.altname %}Også kjent som: <ul class="list-inline text-muted">{% for row in models.main %}{% ifchanged row.label.value %}<li><i>{{row.altname.value}}</i></li>{% endifchanged %}{% endfor %}</ul>{% endif %}</p>
{% if first.dbpedia.sameas.dbparticle != null %}
{% if not first.dbpedia.sameas.dbparticle | null %}
<div class="ui message">
{% for i in models.dbpedia.sameas %}
{% ifchanged i.dbparticle.value %}
......@@ -80,7 +80,7 @@
<div class="ui list">
{% if first.main.birthdate %}<div class="item"><i class="icon asterisk"></i><div class="content">{{first.main.birthdate.value}}</div></div>{% endif %}
{% if first.main.deathdate %}<div class="item"><i class="icon"><strong></strong></i><div class="content">{{first.main.deathdate.value}}</div></div>{% endif %}
{% if first.main.email.value|length != 0 %}<div class="item"><i class="icon email"></i><div class="content">{{first.main.email.value}}</div></div>{% endif %}
{% if not first.main.email.value | null %}<div class="item"><i class="icon email"></i><div class="content">{{first.main.email.value}}</div></div>{% endif %}
</div>
......@@ -92,7 +92,7 @@
{% endfor %}
</p>
{% endif %}
:
</div>
<div class="column">
......
......@@ -22,7 +22,7 @@
<p>{% if first.main.altname %}Også kjent som: <ul class="list-inline text-muted">{% for row in models.main %}{% ifchanged row.label.value %}<li><i>{{row.altname.value}}</i></li>{% endifchanged %}{% endfor %}</ul>{% endif %}</p>
{% if first.dbpedia.sameas.dbparticle != null %}
{% if not first.dbpedia.sameas.dbparticle | null %}
<div class="ui clearing segment">
{% for i in models.dbpedia.sameas %}
{% ifchanged i.dbparticle.value %}
......
......@@ -19,7 +19,7 @@
</h1>
<p>{{ first.description.descriptions.value }}</p>
{% if first.haspart.uri != null %}
{% if not first.haspart.uri | null %}
<div class="ui divided items">
{% for row in models.haspart %}
{% ifchanged row.uri.value %}
......
......@@ -50,7 +50,7 @@
</div>
<div class="column">
{% if first.places.long.value != null || first.narrower.long.value != null %}
{% if not first.places.long.value | null || not first.narrower.long.value | null %}
<div class="row">
<div class="column">
......@@ -63,7 +63,7 @@
<script>
var map = L.map('map');
var bounds = [{% for row in models.narrower %}{% if row.lat.value != null %}[{{ row.lat.value }}, {%endif%}{% if row.long.value != "" %}{{ row.long.value }}]{%if forloop.first && row.lat.value != null%}, {%endif%}{%if !forloop.last && row.lat.value != null%}, {%endif%}{%endif%}{% endfor %}];
var bounds = [{% for row in models.narrower %}{% if not row.lat.value | null %}[{{ row.lat.value }}, {%endif%}{% if row.long.value != "" %}{{ row.long.value }}]{%if forloop.first && not row.lat.value | null%}, {%endif%}{%if !forloop.last && not row.lat.value | null%}, {%endif%}{%endif%}{% endfor %}];
bounds = $.grep(bounds,function(n){ return(n) });
{% if first.places.long.value %}
......@@ -86,13 +86,13 @@
L.control.layers.provided(baseLayers, overlayLayers, {collapsed: true}).addTo(map);