From 788072f995fc6cd45a1352f989cc344766d5e6ab Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Tue, 9 Aug 2022 07:20:30 +0100
Subject: [PATCH] Render elements on one line

---
 core/templates/modals/drilldown.html          |  2 +-
 .../ui/drilldown/table_results_partial.html   | 84 +++++++++++--------
 2 files changed, 49 insertions(+), 37 deletions(-)

diff --git a/core/templates/modals/drilldown.html b/core/templates/modals/drilldown.html
index 9466a8c..9927e0d 100644
--- a/core/templates/modals/drilldown.html
+++ b/core/templates/modals/drilldown.html
@@ -104,6 +104,6 @@
       </div>
     </div>
     <button class="modal-close is-large" aria-label="close"></button>
-    <script>activateButtons();</script>
+    {# <script>activateButtons();</script> #}
   </div>
 </div>
diff --git a/core/templates/ui/drilldown/table_results_partial.html b/core/templates/ui/drilldown/table_results_partial.html
index 9c13551..bfe764e 100644
--- a/core/templates/ui/drilldown/table_results_partial.html
+++ b/core/templates/ui/drilldown/table_results_partial.html
@@ -16,30 +16,38 @@
                     {% if column.name in show and not column.name in hide %}
                       {% block table.thead.th %}
                         <th {% render_attrs column.attrs.th class="" %}>
-                          {% if column.orderable %}
-                            {% if column.is_ordered %}
-                              {% is_descending column.order_by as descending %}
-                              {% if descending %}
-                                <span class="icon" aria-hidden="true">{% block table.desc_icon %}<i class="fa-solid fa-sort-down"></i>{% endblock table.desc_icon %}</span>
-                              {% else %}
-                                <span class="icon" aria-hidden="true">{% block table.asc_icon %}<i class="fa-solid fa-sort-up"></i>{% endblock table.asc_icon %}</span>
-                              {% endif %}
+                          <div class="nowrap-parent">
+                            {% if column.orderable %}
+                              <div class="nowrap-child">
+                                {% if column.is_ordered %}
+                                  {% is_descending column.order_by as descending %}
+                                  {% if descending %}
+                                    <span class="icon" aria-hidden="true">{% block table.desc_icon %}<i class="fa-solid fa-sort-down"></i>{% endblock table.desc_icon %}</span>
+                                  {% else %}
+                                    <span class="icon" aria-hidden="true">{% block table.asc_icon %}<i class="fa-solid fa-sort-up"></i>{% endblock table.asc_icon %}</span>
+                                  {% endif %}
+                                {% else %}
+                                  <span class="icon" aria-hidden="true">{% block table.orderable_icon %}<i class="fa-solid fa-sort"></i>{% endblock table.orderable_icon %}</span>
+                                {% endif %}
+                              </div>
+                              <div class="nowrap-child">
+                                <a
+                                  hx-get="search/{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}&{{ uri }}"
+                                  hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                                  hx-trigger="click"
+                                  hx-target="#results"
+                                  hx-swap="innerHTML"
+                                  hx-indicator=".progress"
+                                  style="cursor: pointer;">
+                                  {{ column.header }}
+                                </a>
+                              </div>
                             {% else %}
-                              <span class="icon" aria-hidden="true">{% block table.orderable_icon %}<i class="fa-solid fa-sort"></i>{% endblock table.orderable_icon %}</span>
+                              <div class="nowrap-child">
+                                {{ column.header }}
+                              </div>
                             {% endif %}
-                            <a
-                              hx-get="search/{% querystring table.prefixed_order_by_field=column.order_by_alias.next %}&{{ uri }}"
-                              hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                              hx-trigger="click"
-                              hx-target="#results"
-                              hx-swap="innerHTML"
-                              hx-indicator=".progress"
-                              style="cursor: pointer;">
-                              {{ column.header }}
-                            </a>
-                          {% else %}
-                            {{ column.header }}
-                          {% endif %}
+                          </div>
                         </th>
                       {% endblock table.thead.th %}
                     {% endif %}
@@ -174,7 +182,7 @@
                                   </button>
                                 {% endif %}
                               </div>
-                              {% if row.cells.num_chans is not None %}
+                              {% if row.cells.num_chans != '—' %}
                                 <div class="nowrap-child">
                                   <span class="tag">
                                     {{ row.cells.num_chans }}
@@ -185,19 +193,23 @@
                           </td>
                         {% elif column.name == 'channel' %}
                           <td>
-                            <div class="nowrap-parent">
-                              <a class="nowrap-child has-text-link is-underlined"
-                                 onclick="populateSearch('channel', '{{ cell|escapejs }}')">
-                                {{ cell }}
-                              </a>
-                              {% if row.cells.num_users is not None %}
-                                <div class="nowrap-child">
-                                  <span class="tag">
-                                    {{ row.cells.num_users }}
-                                  </span>
-                                </div>
-                              {% endif %}
-                            </div>
+                            {% if cell != '—' %}
+                              <div class="nowrap-parent">
+                                <a class="nowrap-child has-text-link is-underlined"
+                                   onclick="populateSearch('channel', '{{ cell|escapejs }}')">
+                                  {{ cell }}
+                                </a>
+                                {% if row.cells.num_users != '—' %}
+                                  <div class="nowrap-child">
+                                    <span class="tag">
+                                      {{ row.cells.num_users }}
+                                    </span>
+                                  </div>
+                                {% endif %}
+                              </div>
+                            {% else %}
+                              {{ cell }}
+                            {% endif %}
                           </td>
                         {% elif column.name == 'net' %}
                           <td>