From c328b8a2bd6d07f6352868dfaa7c9c49d8a1983a Mon Sep 17 00:00:00 2001
From: Manuel Cilurzo <manuel.cilurzo@sbb.ch>
Date: Thu, 31 Aug 2023 08:12:19 +0200
Subject: [PATCH] fixed tooltip placement

---
 src/_includes/icons/index.njk         |  9 +++---
 src/_includes/icons/item.njk          | 18 +++--------
 src/_includes/icons/list-icons.njk    |  8 ++---
 src/_includes/icons/list-tooltips.njk | 46 ++++++++++++++-------------
 4 files changed, 35 insertions(+), 46 deletions(-)

diff --git a/src/_includes/icons/index.njk b/src/_includes/icons/index.njk
index 098f9943b..ba556f34e 100644
--- a/src/_includes/icons/index.njk
+++ b/src/_includes/icons/index.njk
@@ -10,6 +10,7 @@
   {% endif %}
 {% endfor %}
 
+
 <sbb-card color="milk" size="xxl">
   <div id="icons">
     <div class="icons-header">
@@ -22,12 +23,12 @@
     <div class="list icons">
         {% include "./list-icons.njk" %}
     </div>
-    <div class="tooltips">
-      {% include "./list-tooltips.njk" %}
-    </div>
   </div>
   {% include "./not-found.njk" %}
-</sbb-card>
+ </sbb-card>
+<div class="tooltips">
+  {% include "./list-tooltips.njk" %}
+</div>
 
 {% if mode == "KOM" %}
 <script src="/assets/js/icons-kom.js"></script>
diff --git a/src/_includes/icons/item.njk b/src/_includes/icons/item.njk
index 2de98e08c..8c338ba45 100644
--- a/src/_includes/icons/item.njk
+++ b/src/_includes/icons/item.njk
@@ -1,15 +1,5 @@
+{% if (icon.type == mode) %}
 <sbb-tooltip-trigger class="icon {{ icon.mode }}" data-category="{{icon.category}}" data-id="{{icon.name}}" data-name="{{icon.name}}" data-size="{{icon.size}}" id="{{ icon.name }}" aria-describedby="{{ icon.name }}-content">
-    <sbb-icon name="{% if mode == "Pictograms" %}picto:{% endif %}{{icon.name}}" alt="{{ icon.name }}"></sbb-icon>
-    <div class="only-for-search">
-        {{ icon.name }}<br>
-        {% if mode == "KOM" %}{{ icon.group }}<br>{% endif %}
-        {{ icon.category }}<br>
-        {% if mode == "Pictograms" %}{{ icon.subcategory }}<br>{% endif %}
-        {{ icon.tags }}<br>
-        {% if mode == "KOM" %}
-            {% for size in icon.sizes %}
-                {{size.size}}
-            {% endfor %}
-        {% endif %}
-    </div>
-</sbb-tooltip-trigger>
\ No newline at end of file
+    <sbb-icon name="{% if mode == "Pictograms" %}picto:{% endif %}{{icon.name}}" alt="{{ icon.name }}"></sbb-icon><div class="only-for-search">{{ icon.name }}<br>{% if mode == "KOM" %}{{ icon.group }}<br>{% endif %}{{ icon.category }}<br>{% if mode == "Pictograms" %}{{ icon.subcategory }}<br>{% endif %}{{ icon.tags }}<br>{% if mode == "KOM" %}{% for size in icon.sizes %}{{size.size}}{% endfor %}{% endif %}</div>
+</sbb-tooltip-trigger>
+{% endif %}
\ No newline at end of file
diff --git a/src/_includes/icons/list-icons.njk b/src/_includes/icons/list-icons.njk
index 3e0e4f548..e39cf0a57 100644
--- a/src/_includes/icons/list-icons.njk
+++ b/src/_includes/icons/list-icons.njk
@@ -1,9 +1,5 @@
 {% for category in categories %}
-    <sbb-title level="4"  id="{{category}}" data-category="{{category}}" data-id="id-{{category}}" data-name="{{category}}" data-size="small, medium, large">{{category}}</sbb-title>
-    {% for icon in icons %}
-        {% if category == icon.category %}
-            {% include "./item.njk" %}
-        {% endif %}
-    {% endfor %}
+<sbb-title level="4"  id="{{category}}" data-category="{{category}}" data-id="id-{{category}}" data-name="{{category}}" data-size="small, medium, large">{{category}}</sbb-title>
+{% for icon in icons %}{% if category == icon.category %}{% include "./item.njk" %}{% endif %}{% endfor %}
 {% endfor %}
 
diff --git a/src/_includes/icons/list-tooltips.njk b/src/_includes/icons/list-tooltips.njk
index 6234729eb..ec9dd67f5 100644
--- a/src/_includes/icons/list-tooltips.njk
+++ b/src/_includes/icons/list-tooltips.njk
@@ -1,26 +1,28 @@
 {% for icon in icons %}
-    <sbb-tooltip id="{{ icon.name }}" trigger="{{ icon.name }}" hover-trigger="true">
-        <div class="icon-content" id="{{ icon.name }}-content">
-            <sbb-title level="5">{{ icon.name }}</sbb-title>
-            <p class="sbb-text-s tooltip-max-width">
-                {{ translations[page.lang].iconcategory }}: {{ icon.category }}<br>
-                {% if mode == "Pictograms" %}
-                {% else %}
-                {{ translations[page.lang].icontags }}: {{ icon.tags }}
-                {% endif %}
-            </p>
-            {% if mode == "KOM" %}
-                <div class="icon-items">
-                    {% for size in icon.sizes %}
-                    <div class="icon-item">
-                        <div class="icon-preview">
-                        <sbb-icon name="{{icon.group}}-{{size}}" alt="{{image.group}}-{{size}}"></sbb-icon>
-                        </div>
-                        <p class="sbb-text-s">{{size}}</p>
+{% if (icon.type == mode) %}
+<sbb-tooltip id="{{ icon.name }}-trigger" trigger="{{ icon.name }}" hover-trigger="true">
+    <div class="icon-content" id="{{ icon.name }}-content">
+        <sbb-title level="5">{{ icon.name }}</sbb-title>
+        <p class="sbb-text-s tooltip-max-width">
+            {{ translations[page.lang].iconcategory }}: {{ icon.category }}<br>
+            {% if mode == "Pictograms" %}
+            {% else %}
+            {{ translations[page.lang].icontags }}: {{ icon.tags }}
+            {% endif %}
+        </p>
+        {% if mode == "KOM" %}
+            <div class="icon-items">
+                {% for size in icon.sizes %}
+                <div class="icon-item">
+                    <div class="icon-preview">
+                    <sbb-icon name="{{icon.group}}-{{size}}" alt="{{image.group}}-{{size}}"></sbb-icon>
                     </div>
-                    {% endfor %}
+                    <p class="sbb-text-s">{{size}}</p>
                 </div>
-            {% endif %}
-        </div>
-    </sbb-tooltip>
+                {% endfor %}
+            </div>
+        {% endif %}
+    </div>
+</sbb-tooltip>
+{% endif %}
 {% endfor %}
\ No newline at end of file