Merge pull request #1328 from NatLibFi/fix-tabs-after-bootstrap-5

Fix highlighting of the New tab after Bootstrap 5 upgrade
NatLibFi · Jun 2, 2022 · 1c4fd32 · 1c4fd32
2 parents 290296c + 7971ff6
commit 1c4fd32
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/view/changes.twig b/view/changes.twig
@@ -19,9 +19,9 @@
     <li id="groups" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/groups{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Group-nav" %}</a></li>
     {% endif %}
     {% if vocab.config.showChangeList %}
-    {% if vocab.config.showDeprecatedChanges %}
     {% set css_class = ['nav-link'] %}
     {% set css_class = css_class|merge(['active']) %}
+    {% if vocab.config.showDeprecatedChanges %}
     <h3 class="sr-only">{% trans "List vocabulary concepts by newest additions including removed" %}</h3>
     <li id="changes" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-and-deprecations-nav" %}</a></li>
     {% else %}

diff --git a/view/group-contents.twig b/view/group-contents.twig
@@ -20,11 +20,11 @@
     <li id="groups" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/groups{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Group-nav" %}</a></li>
     {% endif %}
     {% if vocab.config.showChangeList %}
+    {% set css_class = ['nav-link'] %}
     {% if vocab.config.showDeprecatedChanges %}
     <h3 class="sr-only">{% trans "List vocabulary concepts by newest additions including removed" %}</h3>
     <li id="changes"><a href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-and-deprecations-nav" %}</a></li>
     {% else %}
-    {% set css_class = ['nav-link'] %}
     <h3 class="sr-only">{% trans "List vocabulary concepts by newest additions" %}</h3>
     <li id="changes" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-nav" %}</a></li>
     {% endif %}

diff --git a/view/group-index.twig b/view/group-index.twig
@@ -19,11 +19,11 @@
     <li id="groups" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/groups{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Group-nav" %}</a></li>
     {% endif %}
     {% if vocab.config.showChangeList %}
+    {% set css_class = ['nav-link'] %}
     {% if vocab.config.showDeprecatedChanges %}
     <h3 class="sr-only">{% trans "List vocabulary concepts by newest additions including removed" %}</h3>
     <li id="changes"><a href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-and-deprecations-nav" %}</a></li>
     {% else %}
-    {% set css_class = ['nav-link'] %}
     <h3 class="sr-only">{% trans "List vocabulary concepts by newest additions" %}</h3>
     <li id="changes" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-nav" %}</a></li>
     {% endif %}

diff --git a/view/light.twig b/view/light.twig
@@ -68,8 +68,8 @@
           <li id="groups" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/groups{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Group-nav" %}</a></li>
           {% endif %}
           {% if vocab.config.showChangeList %}
-          {% if vocab.config.showDeprecatedChanges %}
           {% if active_tab == 'new' %}{% set css_class = css_class|merge(['active']) %}{%  endif %}
+          {% if vocab.config.showDeprecatedChanges %}
           <h3 class="sr-only">{% trans "List vocabulary concepts by newest additions including removed" %}</h3>
           <li id="changes" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/new{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% trans "Changes-and-deprecations-nav" %}</a></li>
           {% else %}