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.

Sign up for GitHub

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

Move allcaps in property-labels (and vocabulary-category) from twig to css #1223

Merged
merged 2 commits into from
Nov 3, 2021
Merged

Move allcaps in property-labels (and vocabulary-category) from twig to css #1223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7664ce6
Remove label uppercasing via twig, related to #1222
schlawiner Oct 15, 2021
092a5cb
Re-add label uppercasing via CSS, related to #1222
schlawiner Oct 15, 2021
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
4 changes: 4 additions & 0 deletions resource/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,10 @@ span.xl-pref-label > img {
padding: 15px 0 15px 10px;
}

.property-label, .vocab-category > h3 {
text-transform: uppercase;
}

.vocab-category {
display: inline-block;
width: 100%;
Expand Down
8 changes: 4 additions & 4 deletions view/concept-shared.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
{% spaceless %}
<div class="row{% if concept.type == 'skosext:DeprecatedConcept' %} deprecated{% endif %} property prop-preflabel">
<div class="property-label property-label-pref">
<h3 class="versal">{% set subPrefLabelTranslation = concept.preferredSubpropertyLabelTranslation(request.lang) %}{% if subPrefLabelTranslation %}{{ subPrefLabelTranslation|upper }}{% else %}{{ 'skos:prefLabel'|trans|upper }}{% endif %}</h3>
<h3 class="versal">{% set subPrefLabelTranslation = concept.preferredSubpropertyLabelTranslation(request.lang) %}{% if subPrefLabelTranslation %}{{ subPrefLabelTranslation }}{% else %}{{ 'skos:prefLabel'|trans }}{% endif %}</h3>
</div>
{% if concept.foundBy %} {# hit has been found through an alternative label #}
<span class="versal">{{ concept.foundBy }} ></span>
Expand Down Expand Up @@ -90,7 +90,7 @@
{% if property.getSubPropertyOf != 'skos:hiddenLabel' %}
<div class="row{% if property.type == 'dc:isReplacedBy' %} replaced-by{% endif%} property prop-{{property.ID}}">
<div class="property-label">
<h3 class="versal{% if property.type == 'rdf:type' %}-bold{% endif %}{% if property.description %} property-click" title="{{ property.description }}{% endif %}">{{ property.label|upper }}</h3>
<h3 class="versal{% if property.type == 'rdf:type' %}-bold{% endif %}{% if property.description %} property-click" title="{{ property.description }}{% endif %}">{{ property.label }}</h3>
</div>
<div class="property-value-column"><div class="property-value-wrapper">
{% if request.vocab.config.hasMultiLingualProperty(property.type) %}
Expand Down Expand Up @@ -141,7 +141,7 @@
{% set foreignLabels = concept.foreignLabels %}
{% if foreignLabels %}
<div class="row property prop-other-languages">
<div class="property-label"><h3 class="versal property-click" title="{% trans "foreign prefLabel help" %}" >{{ 'foreign prefLabels'|trans|upper }}</h3></div>
<div class="property-label"><h3 class="versal property-click" title="{% trans "foreign prefLabel help" %}" >{{ 'foreign prefLabels'|trans }}</h3></div>
<div class="property-value-column">
<div class="property-value-wrapper">
<ul>
Expand Down Expand Up @@ -207,7 +207,7 @@
<template id="property-mappings-template">
{{#each properties}}
<div class="row{{#ifDeprecated concept.type 'skosext:DeprecatedConcept'}} deprecated{{/ifDeprecated}} property prop-{{ id }}">
<div class="property-label"><h3 class="versal{{#ifNotInDescription type description}} property-click" title="{{ description }}{{/ifNotInDescription}}">{{toUpperCase label}}</h3></div>
<div class="property-label"><h3 class="versal{{#ifNotInDescription type description}} property-click" title="{{ description }}{{/ifNotInDescription}}">{{label}}</h3></div>
<div class="property-value-column">
{{#each values }} {{! loop through ConceptPropertyValue objects }}
{{#if prefLabel }}
Expand Down
2 changes: 1 addition & 1 deletion view/vocab-shared.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
{% for key, values in vocabInfo %}
{% set keytrans = key %}
<div class="row">
<div class="property-label versal"><h3>{{ keytrans|trans|upper }}</h3><div class="property-divider"></div></div>
<div class="property-label versal"><h3>{{ keytrans|trans }}</h3><div class="property-divider"></div></div>
<div class="property-value-column versal">
{% for val in values %}
<div class="property-value-wrapper">
Expand Down
2 changes: 1 addition & 1 deletion view/vocabularylist.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="vocabularies">
{% for vocabClassName,vocabArray in request.vocabList %}
<div class="vocab-category">
<h3>{{ vocabClassName|upper }}</h3>
<h3>{{ vocabClassName }}</h3>
<ul>
{% for vocab in vocabArray %}
<li><a class="navigation-font" href="{{ vocab.id }}/{{ request.lang }}/{% if request.contentLang != request.lang and request.contentLang != '' and request.contentLang in vocab.config.languages %}?clang={{ request.contentLang }}{% endif %}">{{ vocab.title }}</a></li>
Expand Down