From e0e4f238f6871c54a640116539aac82d4d0c654f Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario@mayan-edms.com>
Date: Sat, 5 Oct 2019 02:45:33 -0400
Subject: [PATCH] Keep tooltip icon together with label

Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
---
 .../appearance/generic_list_subtemplate.html  | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
index 09bd4afccd..5d2ea6b952 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
@@ -30,20 +30,22 @@
                                         {% navigation_get_source_columns source=object_list only_identifier=True as source_column %}
                                         {% if source_column %}
                                             <th>
-                                                {% if source_column.is_sortable %}
-                                                    <a href="{% navigation_get_sort_field_querystring column=source_column %}">{{ source_column.label }}</a>
-                                                    {% if source_column.get_sort_field == sort_field %}
-                                                        {% if icon_sort %}{{ icon_sort.render }}{% endif %}
+                                                <span style="white-space: nowrap">
+                                                    {% if source_column.is_sortable %}
+                                                        <a href="{% navigation_get_sort_field_querystring column=source_column %}">{{ source_column.label }}</a>
+                                                        {% if source_column.get_sort_field == sort_field %}
+                                                            {% if icon_sort %}{{ icon_sort.render }}{% endif %}
+                                                        {% endif %}
+                                                    {% else %}
+                                                        {{ source_column.label }}
                                                     {% endif %}
-                                                {% else %}
-                                                    {{ source_column.label }}
-                                                {% endif %}
 
-                                                {% if source_column.help_text %}
-                                                    <span data-toggle="tooltip" data-placement="bottom" title="{{ source_column.help_text }}">
-                                                    {% get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
-                                                    </span>
-                                                {% endif %}
+                                                    {% if source_column.help_text %}
+                                                        <span data-toggle="tooltip" data-placement="bottom" title="{{ source_column.help_text }}">
+                                                        {% get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
+                                                        </span>
+                                                    {% endif %}
+                                                </span>
                                             </th>
                                         {% endif %}
                                     {% endif %}
@@ -52,20 +54,22 @@
                                         {% navigation_get_source_columns source=object_list exclude_identifier=True as source_columns %}
                                         {% for source_column in source_columns %}
                                             <th>
-                                                {% if source_column.is_sortable %}
-                                                    <a href="{% navigation_get_sort_field_querystring column=source_column %}">{{ source_column.label }}</a>
-                                                    {% if source_column.get_sort_field == sort_field %}
-                                                        {% if icon_sort %}{{ icon_sort.render }}{% endif %}
+                                                <span style="white-space: nowrap">
+                                                    {% if source_column.is_sortable %}
+                                                        <a href="{% navigation_get_sort_field_querystring column=source_column %}">{{ source_column.label }}</a>
+                                                        {% if source_column.get_sort_field == sort_field %}
+                                                            {% if icon_sort %}{{ icon_sort.render }}{% endif %}
+                                                        {% endif %}
+                                                    {% else %}
+                                                        {{ source_column.label }}
                                                     {% endif %}
-                                                {% else %}
-                                                    {{ source_column.label }}
-                                                {% endif %}
 
-                                                {% if source_column.help_text %}
-                                                    <span data-toggle="tooltip" data-placement="bottom" title="{{ source_column.help_text }}">
-                                                    {% get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
-                                                    </span>
-                                                {% endif %}
+                                                    {% if source_column.help_text %}
+                                                        <span data-toggle="tooltip" data-placement="bottom" title="{{ source_column.help_text }}">
+                                                        {% get_icon icon_path='mayan.apps.navigation.icons.icon_source_column_help_text' %}
+                                                        </span>
+                                                    {% endif %}
+                                                </span>
                                             </th>
                                         {% endfor %}
                                     {% endif %}