Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into rtl branch #10

Merged
merged 197 commits into from
Nov 22, 2018
Merged
Changes from 1 commit
Commits
Show all changes
197 commits
Select commit Hold shift + click to select a range
f63a834
Merge remote-tracking branch 'upstream/master'
tfrancart Nov 7, 2017
c38d876
Merge remote-tracking branch 'origin/master'
tfrancart Nov 21, 2017
8c06044
Merge remote-tracking branch 'upstream/master'
tfrancart Nov 21, 2017
10252ba
adding limited support for showing skosxl:prefLabels
Nov 23, 2017
88beb7f
Added SPARQL query to query for super properties of a property
tfrancart Dec 4, 2017
0fc6f90
Used graph-agnostic queries through default endpoint to retrieve label
tfrancart Dec 4, 2017
0448f42
Fixed call to Namespace.shorten(). Added types to property declarations
tfrancart Dec 4, 2017
59bc3e0
Issue 666 - squash commits (#8)
tfrancart Nov 30, 2017
7b235c5
1. Ability to fetch and return dct:subject of ConceptSchemes in the list
tfrancart Nov 22, 2017
93cb504
Merge branch 'master' of https://github.com/tfrancart/Skosmos.git
tfrancart Dec 19, 2017
d4923c1
Merge branch 'master' of https://github.com/NatLibFi/Skosmos.git
tfrancart Dec 19, 2017
5978fd5
skos-xl labels should now work
Dec 19, 2017
f424cd6
fixing the preflabel right pad
Dec 19, 2017
632169a
fixing the unit tests
Dec 19, 2017
d3db5de
Merge pull request #670 from tfrancart/issue-669-1
Dec 19, 2017
0f1d785
Merge branch 'master' of https://github.com/NatLibFi/Skosmos into sko…
Dec 19, 2017
0ef48fd
fixing the skosxl qtips not appearing after ajaxing content, related …
Dec 19, 2017
4e422d5
removing unused ?member variable, fixes #655
Dec 19, 2017
86adfd4
moving mapping concept notations inside the a element, related to #623
Dec 19, 2017
8359d9b
Read property label from current vocabulary before querying the default
tfrancart Dec 19, 2017
02d872d
updating the composer dependencies before 1.10 release
Dec 21, 2017
41f54ff
Look for property label and superproperties in the current EasyRdf Model
tfrancart Jan 3, 2018
637f917
Merge remote-tracking branch 'upstream/master'
tfrancart Jan 5, 2018
07c1286
Use locale-based sort to sort values in concept page
tfrancart Jan 5, 2018
43d19f9
Merge pull request #671 from tfrancart/issue-669-2
Jan 8, 2018
7fdcb18
initializing the superprops variable as an empty array
Jan 8, 2018
7c2e1f4
pulled files from master
kouralex Jan 10, 2018
17456a2
Issue #665 Remove SERVICE_LOGO old constant and related code
Jan 9, 2018
d10c4f6
Add Jena Fuseki to gitignore
Jan 9, 2018
cb3abd4
updating composer packages, related to #684
Jan 12, 2018
cfbaac6
running travis with php 7.0, related to #684
Jan 12, 2018
db0318d
migrating to phpunit 6, related to #684
Jan 12, 2018
cc4fb52
moving to new codeclimate reporter
Jan 12, 2018
8846b26
removing copypaste error
Jan 12, 2018
fa60727
updating the mockery package, related to #684
Jan 12, 2018
20a21fa
moving old dependencies to composer, related to #684
Jan 12, 2018
8ab9cdd
loading the remaining dependencies that were not managed by composer …
Jan 12, 2018
1ef321e
Fix hard crash on missng skosxl:literalForm
semanticfire Jan 13, 2018
4ef44ec
Merge pull request #687 from semanticfire/patch-1
Jan 15, 2018
43c1aaa
finished jsonld augmentation
kouralex Jan 15, 2018
3a105ad
cleaned code and added phpdoc
kouralex Jan 16, 2018
1f86d07
Merge branch 'master' into concept-graph-jsonld-external
kouralex Jan 16, 2018
6cfa51f
Implements CBD solution for blank nodes and adds reification nodes
kouralex Jan 18, 2018
7bb88dd
refactored duplicate code
kouralex Jan 18, 2018
31b7549
adding a configurable property that enables defining a priority for l…
Jan 19, 2018
4264c48
improving the fallback language order feature, related to #688
Jan 22, 2018
548ef9e
fixing the missing prefLabel language tag when showing a fallback lab…
Jan 22, 2018
902e9be
adding a few tests for getLanguageOrder(), related to #688
Jan 22, 2018
aacc68c
using the configurable fallback languages for the concept property va…
Jan 22, 2018
f0613ea
using the skosmos:feedbackLanguages for the rest api hierarchy fallba…
Jan 22, 2018
858968c
fixing missing lang parameter from a getLanguageOrder-call, related t…
Jan 22, 2018
6eab889
code style cleanup: removing trailing whitespaces
Jan 23, 2018
4999faf
whoops
Jan 23, 2018
622d25a
Cleaned for PR and made tests
kouralex Jan 23, 2018
fc054d5
pulling updates from master
kouralex Jan 23, 2018
ff411bb
add build/ directory to .gitignore
kouralex Jan 23, 2018
3c1a528
fixes #690
Jan 24, 2018
60690e3
using the configurable fallback language for the REST API children fu…
Jan 26, 2018
795dcf5
filtering out hiddenLabels always when the concept has been found ear…
Jan 26, 2018
e4c2538
fixes #692
Jan 26, 2018
a2b3dcc
applying a band aid for the broken mobile screen vocabulary info layo…
Jan 26, 2018
ca4aac5
recoded long URIs as shortened versions as requested
kouralex Jan 29, 2018
439a577
Merge pull request #689 from NatLibFi/concept-graph-jsonld-external
Jan 29, 2018
ca070f2
only querying for concept info when the search has found some results…
Jan 30, 2018
d0e27ef
Merge branch 'master' of https://github.com/NatLibFi/Skosmos
Jan 30, 2018
4a9ae7d
Merge pull request #680 from tfrancart/issue-679
Jan 30, 2018
7f31cf0
fix #701 updates embedded json-ld data correctly
kouralex Feb 4, 2018
990d785
add language ordering to passed through variables to javascript
kouralex Feb 4, 2018
787ebc0
fixing wrong translations
Feb 9, 2018
0e67a14
using a more specific selector for the sidebar custom scrollbar
Feb 9, 2018
3809d26
fixing a bug with displaying language codes for fallback labels
Feb 9, 2018
b2d64a0
using the configured languages as fallbacks too
Feb 9, 2018
2f57b9e
fixing false language tags sometimes appearing with mapping concepts
Feb 9, 2018
9cf8caf
Issue #661 add a copy to clipboard button
kinow Feb 13, 2018
40bef30
Add Dutch translations by @mrvdries and @ismakutl. Fixes #710
osma Feb 13, 2018
ea69f9d
Merge pull request #709 from kinow/add-copy-to-clipboard
Feb 16, 2018
9a46a1b
css for the copy button
Feb 16, 2018
ee25003
fixes hard crash when collection doesnt return a label
kouralex Feb 19, 2018
fc0c86b
adding a random fallback for the guessLanguage so the negotiator wont…
Feb 23, 2018
58a8f32
run Travis tests with newer Fuseki 3.6.0
osma Mar 12, 2018
44e4f56
define Code Climate variable as global, separating it from matrix vars
osma Mar 12, 2018
7607f89
Remove support for obsolete APC caching functions. Fixes #728
osma Mar 12, 2018
c80e429
Issue #712: display the concepts of the first letter available
kinow Feb 23, 2018
3131538
Default to the first letter of the alphabet when no letter is selecte…
osma Mar 16, 2018
1e07da9
Add Dockerfile and a docker-compose to run SKOSMOS with Fuseki
kinow Feb 4, 2018
2329a2d
Add Dockerfile container_name's
kinow Mar 12, 2018
6a1fbd5
Add volume binding example in comments for Fuseki
kinow Mar 12, 2018
375fe4d
Rename Skosmos docker-compose created container name to skosmos
kinow Mar 16, 2018
de27112
Fixes #638
kouralex Apr 5, 2018
6a3278c
fix constructor call due to previously done refactoring(?)
kouralex Apr 11, 2018
e875530
Run Travis tests also under PHP 7.1 and 7.2
osma Apr 12, 2018
3b492fb
add checks to prevent sizeof() related warnings in PHP 7.2
kouralex Apr 12, 2018
224f8ee
fix PHP 7.1+ build test by changing the name for error raised
kouralex Apr 12, 2018
5d29998
Changed test fuseki port to 13030; upgraded test fuseki to 3.7.0; fix…
kouralex Apr 12, 2018
222a273
Merge branch 'master' of https://github.com/NatLibFi/Skosmos into tra…
osma Apr 12, 2018
d09a54a
allow tests to fail on PHP 7.2 due to JsonLD compatibility problems
osma Apr 12, 2018
c1f32d1
expect different exceptions depending on PHP version (7.0 vs 7.1+)
osma Apr 12, 2018
fe866a1
adjust build matrix: test fuseki SNAPSHOT only on php 7.1, allow fail…
osma Apr 12, 2018
d31b17a
further adjust build matrix
osma Apr 12, 2018
bcee453
specify PHP versions without quotes
osma Apr 12, 2018
22750f1
adjust build matrix: only test fuseki SNAPSHOT on php 7.1
osma Apr 12, 2018
35d74b4
bump Fuseki version to 3.7.0 also on Travis tests
osma Apr 12, 2018
007896e
move notifications to new NatLibFi Slack instance
osma Apr 12, 2018
8d66548
Allow request input to be mocked
danmichaelo Apr 3, 2018
25ce463
Refactor getQueryParamArray to always return array
danmichaelo Apr 3, 2018
ed1c8b2
Add mapping relations to JSON-LD context
danmichaelo Apr 3, 2018
1a5cc6c
Add additional fields to JSON-LD context for search endpoint
danmichaelo Apr 3, 2018
2459de9
Merge branch 'fix-fatal-argumentcaughterror'
osma Apr 13, 2018
5d8424b
Add unit test for #744 / PR #756. Fixes #744
osma Apr 13, 2018
ef8493e
Merge branch 'test-relatedmatch' of https://github.com/danmichaelo/Sk…
osma Apr 13, 2018
6f1807a
Open all hierarchies when a concept is in multiple schemes. Fixes #765
osma May 4, 2018
164acc3
fix layout issue due to having a <p> element instead of <span> in sko…
kouralex May 9, 2018
7b517f1
Change feedback message headers to use Reply-To and make name and e-m…
osma May 23, 2018
c56eec7
Set the feedback email sender address properly when a vocabulary-spec…
osma May 28, 2018
9b11ec9
Add Arabic translation from Transifex. Fixes #767
osma May 30, 2018
aea8e8f
Fix Dockerfile by automatically answering yes to apt-get install locales
kinow Jun 2, 2018
6d28f04
Issue #738 replace .inc configuration files by .ttl (turtle) files.
kinow May 30, 2018
d51c82a
Fix scrutinizer issues
kinow Jun 2, 2018
89cae46
Remove unused graph variable from Model
kinow Jun 4, 2018
8287a16
Use a list for skosmos:languages
kinow Jun 4, 2018
aee8384
add skosmos:globalPlugins example which was forgotten in PR #769
osma Jun 5, 2018
2d28268
Use RDFS properties for language settings. Fixes #772
osma Jun 5, 2018
c68a971
Fix test config for #772
osma Jun 5, 2018
73fd33d
Replace PHP explode function call by a Turtle list for globalPlugins
kinow Jun 7, 2018
b89c916
Include unit test for new globalPlugins with list, and update distrib…
kinow Jun 8, 2018
c03b0c0
Issue #771 config migrate tool
kinow Jul 11, 2018
3cdb1be
Replace exit() by exceptions, and fail earlier if invalid mode
kinow Aug 14, 2018
53c750b
Leave values not defined as comments
kinow Aug 14, 2018
2a8fb6d
Fix search with double quotes
kinow Apr 27, 2018
20f0df1
Upgrade Travis config to use newest Fuseki 3.8.0
osma Aug 22, 2018
06b8b20
Use Fuseki 3.8.0 by default for tests
osma Aug 22, 2018
b9ca601
fix getVersion when on a branch with no tags available in recent history
osma Aug 24, 2018
854520f
use the dev.finto.fi SPARQL endpoint as default endpoint, to match vo…
osma Aug 24, 2018
4871c9b
Merge branch 'master' of https://github.com/NatLibFi/Skosmos
osma Aug 24, 2018
d7f3c02
Disable Travis tests for Fuseki snapshot. There is no longer a Fuseki…
osma Aug 27, 2018
8a12612
updated German translations. Credit: Jonas Waeber
osma Aug 27, 2018
a7a0f65
updated French translations. Credit: Thomas Francart
osma Aug 27, 2018
c326789
updated Polish translations. Credit: Łukasz Szeremeta
osma Aug 27, 2018
be91606
update translation files to match latest template; no actual changes …
osma Aug 27, 2018
a355721
Add translations for Farsi, by Omid Ghiasvand and Reza Ghiasvand. Sti…
osma Aug 27, 2018
8c65f39
fixes #714
kouralex Aug 27, 2018
28edcb1
sorting concept property values with natural case sort when sortByNot…
henriyli Mar 20, 2018
67a466e
Fixed the variable name notsort for a clearer sort_by_notation
Aug 24, 2018
49f832f
Merge branch 'henriyli-henriyli-notsort-fix-737'
osma Aug 27, 2018
abfd08f
Avoid double encoding of search query string. Fixes #763
osma Aug 27, 2018
9d61b82
fix issue regarding updating the json-ld data
kouralex Aug 28, 2018
b9b9702
Specify skosmos:defaultEndpoint as a resource, not literal. Fixes #786
osma Aug 28, 2018
ee40900
updated German translations for 100% coverage. Credit: Jonas Waeber
osma Aug 28, 2018
fd65a22
Fix PHP syntax when calling a method
kinow Aug 27, 2018
720bea0
Set a value for variable when declaring it
kinow Aug 27, 2018
23a0df1
Avoid type coercion in JS when comparing values
kinow Aug 27, 2018
431de13
Avoid declaring a variable twice
kinow Aug 27, 2018
5b5702f
Remove unused variable
kinow Aug 27, 2018
28cb9ea
Remove duplicated semicolon
kinow Aug 27, 2018
afafd5f
Add Vagrantfile and Ansible Playbook setup for deploying and running …
mikipernu Aug 29, 2018
3963f9d
Add .vagrant and .DS_Store to .gitignore
mikipernu Aug 29, 2018
2805720
Remove unnecessary installation of Python 2.7 and configure to use py…
mikipernu Aug 29, 2018
212b318
Removed old config files and added references to eclipse project file…
Aug 29, 2018
4d7a85e
Remove Fuseki deployment
mikipernu Aug 29, 2018
3622a0b
Fix apt not installing php-mbstring by updating cache before apt install
mikipernu Aug 29, 2018
f62e7f4
Turn off verbose/debug mode for Ansible provisioner
mikipernu Aug 29, 2018
765eaad
Merge branch 'master' into vagrant-virtual-environment
mikipernu Aug 29, 2018
a22ba41
Delete .DS_Store
mikipernu Aug 29, 2018
a4f83ba
Delete second .DS_Store
mikipernu Aug 29, 2018
d6ba2b4
Remove unnecessary, duplicate configuration file
mikipernu Aug 29, 2018
d11c05c
Add Vagrantfile and Ansible Playbook setup for deploying and running …
mikipernu Aug 29, 2018
08edf76
Add .vagrant and .DS_Store to .gitignore
mikipernu Aug 29, 2018
1815d30
Remove unnecessary installation of Python 2.7 and configure to use py…
mikipernu Aug 29, 2018
4c302cb
Removed old config files and added references to eclipse project file…
Aug 29, 2018
4465362
Remove Fuseki deployment
mikipernu Aug 29, 2018
4c6e2cb
Fix apt not installing php-mbstring by updating cache before apt install
mikipernu Aug 29, 2018
b5c4f56
Turn off verbose/debug mode for Ansible provisioner
mikipernu Aug 29, 2018
cdc2da6
Delete .DS_Store
mikipernu Aug 29, 2018
22ff557
Delete second .DS_Store
mikipernu Aug 29, 2018
1f630a2
Remove unnecessary, duplicate configuration file
mikipernu Aug 29, 2018
a05a54f
Merge branch 'vagrant-virtual-environment' of github.com:mikipernu/Sk…
mikipernu Aug 29, 2018
29ce070
Merge branch 'mikipernu-vagrant-virtual-environment'
osma Aug 29, 2018
811afd7
reorder .gitignore
osma Aug 29, 2018
5b2dd63
Use correct value when retrieving settings
kinow Aug 31, 2018
c6fa757
Add tests for GlobalConfig
kinow Aug 31, 2018
65a7f5f
Add more tests for VoacabularyConfig
kinow Aug 31, 2018
269a200
Use array in the test for GlobalConfig::getGlobalPlugins
kinow Aug 31, 2018
14b681f
Fix parameter order for jena-text queries - MAX_N setting was being i…
osma Sep 3, 2018
9bda271
Loosen the check for port numbers in guessBaseHref. Fixes #796
osma Sep 7, 2018
a8ec734
removed references to old configuration files
kouralex Sep 7, 2018
714ddad
Choose feedback recipient based on selection on feedback form, not th…
osma Oct 5, 2018
0e8ed3e
Fix unit test that broke after the fix to #808
osma Oct 5, 2018
27e53ed
Fix fragile unit test (may break if /tmp/skosmos-template-cache exist…
osma Oct 5, 2018
2634666
Fix config migration of LOG_FILE_NAME=null
danmichaelo Oct 1, 2018
ef850a7
fixes #804
kouralex Oct 8, 2018
34a0cb5
fix some css; addresses issue #799
kouralex Nov 8, 2018
6fbca9e
#fixes #791; also update fuseki to 3.9.0
kouralex Nov 15, 2018
d99ef31
Reenable Fuseki snapshot builds on Travis; use Fuseki2 3.9.0 on Travi…
osma Nov 19, 2018
8ec66f2
Don't allow Travis builds with PHP 7.2 to fail; run Fuseki snapshot b…
osma Nov 19, 2018
f1a1626
check which locales are installed in Travis environment
osma Nov 20, 2018
d39361d
Try to break unit tests by setting LANGUAGE=fr. Part of #816
osma Nov 20, 2018
c1f9a28
Always set LANGUAGE environment variable when setting LC_ALL. Fixes #816
osma Nov 20, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
skos-xl labels should now work
  • Loading branch information
Henri Ylikotila committed Dec 19, 2017
commit 5978fd523ff89471b4556ecf219d10787cc816fd
14 changes: 7 additions & 7 deletions model/Concept.php
Original file line number Diff line number Diff line change
@@ -138,9 +138,9 @@ public function getLabel()
return "";
}

public function hasXlLabel()
public function hasXlLabel($prop = 'prefLabel')
{
if ($this->resource->hasProperty('skosxl:prefLabel')) {
if ($this->resource->hasProperty('skosxl:' . $prop)) {
return true;
}
return false;
@@ -155,7 +155,7 @@ public function getXlLabel()
return new LabelSkosXL($this->model, $labres);
}
}
return 'BING';
return null;
}

/**
@@ -371,7 +371,7 @@ public function getProperties()

// Iterating through every literal and adding these to the data object.
foreach ($this->resource->allLiterals($sprop) as $val) {
$literal = new ConceptPropertyValueLiteral($val, $prop);
$literal = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $val, $prop);
// only add literals when they match the content/hit language or have no language defined
if (isset($ret[$prop]) && ($literal->getLang() === $this->clang || $literal->getLang() === null)) {
$ret[$prop]->addValue($literal);
@@ -613,8 +613,8 @@ public function getForeignLabels()
foreach ($labels as $lit) {
// filtering away subsets of the current language eg. en vs en-GB
if ($lit->getLang() != $this->clang && strpos($lit->getLang(), $this->getEnvLang() . '-') !== 0) {
$prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel';
$ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($lit, $prop);
$prop = in_array($lit, $prefLabels) ? 'skos:prefLabel' : 'skos:altLabel';
$ret[$this->literalLanguageToString($lit)][] = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $lit, $prop);
}
}
ksort($ret);
@@ -631,7 +631,7 @@ public function getAllLabels($property)
// shortening property labels if possible, EasyRdf requires full URIs to be in angle brackets
$property = (EasyRdf\RdfNamespace::shorten($property) !== null) ? EasyRdf\RdfNamespace::shorten($property) : "<$property>";
foreach ($this->resource->allLiterals($property) as $lit) {
$labels[Punic\Language::getName($lit->getLang(), $this->getEnvLang())][] = new ConceptPropertyValueLiteral($lit, $property);
$labels[Punic\Language::getName($lit->getLang(), $this->getEnvLang())][] = new ConceptPropertyValueLiteral($this->model, $this->vocab, $this->resource, $lit, $property);
}
ksort($labels);
return $labels;
30 changes: 28 additions & 2 deletions model/ConceptPropertyValueLiteral.php
Original file line number Diff line number Diff line change
@@ -3,15 +3,16 @@
/**
* Class for handling concept property values.
*/
class ConceptPropertyValueLiteral
class ConceptPropertyValueLiteral extends VocabularyDataObject
{
/** the literal object for the property value */
private $literal;
/** property type */
private $type;

public function __construct($literal, $prop)
public function __construct($model, $vocab, $resource, $literal, $prop)
{
parent::__construct($model, $vocab, $resource);
$this->literal = $literal;
$this->type = $prop;
}
@@ -64,4 +65,29 @@ public function getNotation()
return null;
}

public function hasXlProperties()
{
$ret = array();
$graph = $this->resource->getGraph();
$resources = $graph->resourcesMatching('skosxl:literalForm', $this->literal);
return !empty($resources);
}

public function getXlProperties()
{
$ret = array();
$graph = $this->resource->getGraph();
$resources = $graph->resourcesMatching('skosxl:literalForm', $this->literal);
foreach ($resources as $xlres) {
foreach ($xlres->properties() as $prop) {
foreach($graph->allLiterals($xlres, $prop) as $val) {
if ($prop !== 'rdf:type') {
$ret[$prop] = $val;
}
}
}
}
return $ret;
}

}
20 changes: 20 additions & 0 deletions resource/css/styles.css
Original file line number Diff line number Diff line change
@@ -547,12 +547,25 @@ ul.dropdown-menu > li:last-child > input {
display: none;
margin-top: 5px;
width: 100%;

}

.reified-property-value {
float: left;
}

.reified-property-value > img {
width: 18px;
}

span.xl-label > img {
margin: -2px 2px 0 0;
}

span.xl-pref-label > img {
margin: 10px 2px;
}

/* front page stuff
***************************/
.welcome-box, .right-box, #vocabulary-list {
@@ -1203,6 +1216,13 @@ tr {
border-bottom: 0;
}

.other-languages > .col-xs-6.versal.replaced {
padding-right: 0;
}

.other-languages.first-of-language > .col-xs-6.versal-pref.replaced {
padding-right: 0;
}

.search-results-property-table tr.other-languages > td:last-child {
border-bottom: none;
8 changes: 3 additions & 5 deletions view/concept-shared.twig
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@
</div>
{% else %}
<div class="property-value-column">{% if concept.notation %}<span class="notation">{{ concept.notation }}</span>{% endif %}
{% if concept.hasXlLabel %}<span class="reified-property-value"><img src="resource/pics/about.png"></span><div class="reified-tooltip">{% for key, val in concept.xlLabel.properties %}{% if key != 'rdf:type' and key != 'skosxl:literalForm' %}<p>{{ key|trans }}: <span class="versal">{{ val }}</span></p>{% endif %}{% endfor %}</div><span class="prefLabel">{{ concept.xlLabel }}</span>{% else %}<span class="prefLabel conceptlabel">{{ concept.label }}</span>{% endif %}
{% if concept.hasXlLabel %}<span class="reified-property-value xl-pref-label"><img src="resource/pics/about.png"></span><div class="reified-tooltip">{% for key, val in concept.xlLabel.properties %}{% if key != 'rdf:type' and key != 'skosxl:literalForm' %}<p>{{ key|trans }}: <span class="versal">{{ val }}</span></p>{% endif %}{% endfor %}</div><span class="prefLabel">{{ concept.xlLabel }}</span>{% else %}<span class="prefLabel conceptlabel">{{ concept.label }}</span>{% endif %}
</div>
{% endif %}
<div class="col-md-12"><div class="preflabel-spacer"></div></div>
@@ -82,7 +82,6 @@
{% if propval.isReified %} {# e.g. skos:definition's with resource values #}
<span class="versal reified-property-value"><img src="resource/pics/about.png">{% if propval.notation %}<span class="versal">{{ propval.notation }} </span>{% endif %} {{ propval.label(request.contentLang) }}</span>
<div class="reified-tooltip">{% for key, val in propval.reifiedPropertyValues %}<p>{{ key }}: <a href="{{ val.uri | link_url(val.exvocab, request.lang, 'page', request.contentLang) }}">{{ val.label(request.contentLang) }}</a></p>{% endfor %}</div>

{% else %}
<a href="{{ propval.uri | link_url(propval.vocab, request.lang, 'page', request.contentLang) }}">{% if propval.notation %}<span class="versal">{{ propval.notation }} </span>{% endif %} {{ propval.label(request.contentLang) }}</a>
{% endif %}
@@ -99,8 +98,7 @@
{% endif %}
{% elseif property.type == 'rdf:type' %}<p>{{ propval.label|trans }}</p>
{% else %} {# Literals (no URI), eg. alternative labels as properties #}
{% if propval.lang == request.contentLang or propval.lang == null or not request.contentLang and propval.lang == request.lang %}
<p{% if property.type == 'skos:altLabel' %} class="replaced"{% endif %}>{% if propval.containsHtml %}{{ propval.label|raw }}{% else %}{{ propval.label }}{% endif %}{% if propval.lang and (request.contentLang and propval.lang != request.contentLang or explicit_langcodes) %} ({{ propval.lang }}){% endif %}</p>
{% if propval.lang == request.contentLang or propval.lang == null or not request.contentLang and propval.lang == request.lang %}{% if propval.hasXlProperties %}<span class="reified-property-value xl-label"><img src="resource/pics/about.png"></span><div class="reified-tooltip">{% for key, val in propval.getXlProperties %}{% if key != 'rdf:type' and key != 'skosxl:literalForm' and val != '' %}<p>{{ key|trans }}: <span class="versal">{{ val }}</span></p>{% endif %}{% endfor %}</div>{% endif %}<p{% if property.type == 'skos:altLabel' %} class="replaced"{% endif %}>{% if propval.containsHtml %}{{ propval.label|raw }}{% else %}{{ propval.label }}{% endif %}{% if propval.lang and (request.contentLang and propval.lang != request.contentLang or explicit_langcodes) %} ({{ propval.lang }}){% endif %}</p>
{% endif %}
{% endif %}
</li>
@@ -149,7 +147,7 @@
{% for language,labels in concept.foreignLabels %}
{% for value in labels %}
<div class="row other-languages{% if prevlang != language %} first-of-language{% endif %}">
<div class="col-xs-6 versal{% if value.type == "skos:altLabel" %} replaced{%else %} versal-pref{% endif %}">{{ value.label }}</div>
<div class="col-xs-6 versal{% if value.type == "skos:altLabel" %} replaced{%else %} versal-pref{% endif %}">{% if value.hasXlProperties %}<span class="reified-property-value xl-label"><img src="resource/pics/about.png"></span><div class="reified-tooltip">{% for key, val in value.getXlProperties %}{% if key != 'rdf:type' and key != 'skosxl:literalForm' and val != '' %}<p>{{ key|trans }}: <span class="versal">{{ val }}</span></p>{% endif %}{% endfor %}</div>{% endif %}{{ value.label }}</div>
<div class="col-xs-6 versal">{% if prevlang != language %}<p>{{ language }}</p>{% endif %}</div>
</div>
{% set prevlang = language %}