From 7971ff66c0474d58596ad9a885be4e80a634a4b2 Mon Sep 17 00:00:00 2001
From: Osma Suominen <osma.suominen@helsinki.fi>
Date: Thu, 2 Jun 2022 12:16:03 +0300
Subject: [PATCH] Fix highlighting of the New tab after Bootstrap 5 upgrade

---
 view/changes.twig        | 2 +-
 view/group-contents.twig | 2 +-
 view/group-index.twig    | 2 +-
 view/light.twig          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/view/changes.twig b/view/changes.twig
index 94a47fd3a..55bf1aa4a 100644
--- 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
index 8ca52d2b5..91aa4f3fb 100644
--- 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
index 877e850d7..3ed708de6 100644
--- 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
index 99528bb0b..f38c53211 100644
--- 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 %}