Merge pull request #1371 from kinow/make-tooltips-conditional

Tooltips are now conditional on the hierarchy
NatLibFi · Oct 4, 2022 · ac64a05 · ac64a05
2 parents 77eb4a2 + 6dc902d
commit ac64a05
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/view/changes.twig b/view/changes.twig
@@ -12,7 +12,10 @@
     {% endif %}
     <h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
     {% if active_tab == 'hierarchy' %}{% set css_class = css_class|merge(['active']) %}{% endif %}
-    <li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}" class="nav-item"><a class="{{ css_class|join(' ') }} skosmos-tooltip-wrapper skosmos-tooltip t-bottom" href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} data-title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
+    {% if not vocab.config.showHierarchy %}
+      {% set css_class = css_class|merge(['skosmos-tooltip-wrapper', 'skosmos-tooltip', 't-bottom']) %}
+    {%  endif %}
+    <li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}" class="nav-item"><a class="{{ css_class|join(' ') }}" href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} data-title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
     {% if vocab.config.groupClassURI %}
     {% set css_class = ['nav-link'] %}
     <h3 class="sr-only">{% trans "List vocabulary concepts and groupings hierarchically" %}</h3>

diff --git a/view/group-contents.twig b/view/group-contents.twig
@@ -13,7 +13,10 @@
     <li id="alpha" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/index{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% if vocab.config.showChangeList and vocab.config.groupClassURI %}{% trans 'A-Z' %}{% else %}{% trans "Alpha-nav" %}{% endif %}</a></li>
     {% endif %}
     <h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
-    <li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}" class="nav-item"><a class="{{ css_class|join(' ') }} skosmos-tooltip-wrapper skosmos-tooltip t-bottom" href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} data-title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
+    {% if not vocab.config.showHierarchy %}
+      {% set css_class = css_class|merge(['skosmos-tooltip-wrapper', 'skosmos-tooltip', 't-bottom']) %}
+    {%  endif %}
+    <li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}" class="nav-item"><a class="{{ css_class|join(' ') }}" href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} data-title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
     {% if vocab.config.groupClassURI %}
     <h3 class="sr-only">{% trans "List vocabulary concepts and groupings hierarchically" %}</h3>
     {% if search_results|first.isGroup %}{% set css_class = css_class|merge(['active']) %}{% endif %}

diff --git a/view/group-index.twig b/view/group-index.twig
@@ -12,7 +12,10 @@
     <li id="alpha" class="nav-item"><a class="{{ css_class|join(' ') }}" href="{{ request.vocabid }}/{{ request.lang }}/index{% if request.contentLang != request.lang %}?clang={{ request.contentLang }}{% endif %}">{% if vocab.config.showChangeList and vocab.config.groupClassURI %}{% trans 'A-Z' %}{% else %}{% trans "Alpha-nav" %}{% endif %}</a></li>
     {% endif %}
     <h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
-    <li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}" class="nav-item"><a class="{{ css_class|join(' ') }} skosmos-tooltip-wrapper skosmos-tooltip t-bottom" href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} data-title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
+    {% if not vocab.config.showHierarchy %}
+      {% set css_class = css_class|merge(['skosmos-tooltip-wrapper', 'skosmos-tooltip', 't-bottom']) %}
+    {%  endif %}
+    <li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}" class="nav-item"><a class="{{ css_class|join(' ') }}" href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} data-title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
     {% if vocab.config.groupClassURI %}
     <h3 class="sr-only">{% trans "List vocabulary concepts and groupings hierarchically" %}</h3>
     {% set css_class = css_class|merge(['active']) %}

diff --git a/view/light.twig b/view/light.twig
@@ -51,10 +51,13 @@
           {% endif %}
           {% set css_class = ['nav-link'] %}
           {% set disabledHierarchy = not vocab.config.showHierarchy and not search_results|length == 1 %}
+          {%  if disabledHierarchy %}
+            {% set css_class = css_class|merge(['skosmos-tooltip-wrapper', 'skosmos-tooltip', 't-bottom']) %}
+          {%  endif %}
           <h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
           {% if search_results|length == 1 and not term %}{% set css_class = css_class|merge(['active']) %}{% endif %}
           <li id="hierarchy{%- if disabledHierarchy %}-disabled{% endif -%}" class="nav-item">
-            <a class="{{ css_class|join(' ') }} skosmos-tooltip-wrapper skosmos-tooltip t-bottom" href="#" id="hier-trigger"
+            <a class="{{ css_class|join(' ') }}" href="#" id="hier-trigger"
             {% if disabledHierarchy%} data-title="{% trans 'hierarchy-disabled-help' %}"{% endif %}
             >{% trans "Hier-nav" %}
             </a>

diff --git a/view/vocab.twig b/view/vocab.twig
@@ -15,7 +15,10 @@
     <h3 class="sr-only">{% trans "List vocabulary concepts hierarchically" %}</h3>
     {% set css_class = ['nav-link'] %}
     {% if active_tab == 'hierarchy' %}{% set css_class = css_class|merge(['active']) %}{% endif %}
-    <li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}" class="nav-item"><a class="{{ css_class|join(' ') }} skosmos-tooltip-wrapper skosmos-tooltip t-bottom" href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} data-title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
+    {% if not vocab.config.showHierarchy %}
+      {% set css_class = css_class|merge(['skosmos-tooltip-wrapper', 'skosmos-tooltip', 't-bottom']) %}
+    {%  endif %}
+    <li id="hierarchy{% if not vocab.config.showHierarchy %}-disabled{% endif %}" class="nav-item"><a class="{{ css_class|join(' ') }}" href="#" id="hier-trigger"{% if not vocab.config.showHierarchy %} data-title="{% trans 'hierarchy-disabled-help' %}"{% endif %}>{% trans "Hier-nav" %}</a></li>
     {% if vocab.config.groupClassURI %}
     <h3 class="sr-only">{% trans "List vocabulary concepts and groupings hierarchically" %}</h3>
     <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>