From 9d125de99990be994f4bf38a2b2bc798562c075b Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Thu, 18 Aug 2022 07:20:30 +0100
Subject: [PATCH] Make relays table more compact with two rows per entry

---
 core/templates/base.html                      |   3 +
 .../manage/threshold/irc/network/relays.html  | 167 +++++++++++-------
 2 files changed, 105 insertions(+), 65 deletions(-)

diff --git a/core/templates/base.html b/core/templates/base.html
index e953ae4..1c6841c 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -90,6 +90,9 @@
         height: 20em;
         overflow: auto;
       }
+      table.relays-table tr:nth-of-type(2n) td {
+        border-bottom: 3px solid grey;
+      }
 
       /* @media screen and (min-width: 500px) {
         .datetimepicker-wrapper {
diff --git a/core/templates/manage/threshold/irc/network/relays.html b/core/templates/manage/threshold/irc/network/relays.html
index 84d3d88..db906eb 100644
--- a/core/templates/manage/threshold/irc/network/relays.html
+++ b/core/templates/manage/threshold/irc/network/relays.html
@@ -4,7 +4,7 @@
   {% if relays is not None %}
     <div class="content" style="max-height: 30em; overflow: auto;">
       <div class="table-container">
-        <table class="table is-fullwidth is-hoverable">
+        <table class="table is-fullwidth is-hoverable relays-table">
           <thead>
             <th>id</th>
             <th>
@@ -40,7 +40,7 @@
             <th>nick</th>
             <th>
               <span class="icon has-tooltip-bottom" data-tooltip="Actions">
-                <i class="fa-solid fa-wrench" aria-hidden="true"></i>
+                <i class="fa-solid fa-wrench"></i>
               </span>
             </th>
           </thead>
@@ -100,69 +100,106 @@
                   {{ relay.nick }}
                 </td>
                 <td>
-                  <div class="nowrap-parent">
-                    <div class="nowrap-child">
-                      {% if relay.enabled %}
-                        <a
-                          hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                          hx-get="{% url 'threshold_irc_network_relay_status' relay|index:'net' relay|index:'id' 0 %}"
-                          hx-target="#relays"
-                          hx-swap="outerHTML"
-                          class="button has-background-warning">
-                          <span class="icon" data-tooltip="Disable">
-                            <i class="fa-solid fa-wifi-slash" aria-hidden="true"></i>
-                          </span>
-                        </a>
-                      {% else %}
-                        <a
-                          hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                          hx-get="{% url 'threshold_irc_network_relay_status' relay|index:'net' relay|index:'id' 1 %}"
-                          hx-target="#relays"
-                          hx-swap="outerHTML"
-                          class="button has-background-success has-text-white">
-                          <span class="icon" data-tooltip="Enable">
-                            <i class="fa-solid fa-wifi" aria-hidden="true"></i>
-                          </span>
-                        </a>
-                      {% endif %}
-                      <a
-                        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                        hx-delete="{% url 'threshold_irc_network_relay_del' relay|index:'net' relay|index:'id' %}"
-                        hx-target="#relays"
-                        hx-swap="outerHTML"
-                        class="button has-background-danger has-text-white">
-                        <span class="icon" data-tooltip="Delete">
-                          <i class="fa-solid fa-xmark" aria-hidden="true"></i>
-                        </span>
-                      </a>
-                    </div>
-                  </div>
-                  <div class="nowrap-parent">
-                    <div class="nowrap-child">
-                      <a
-                        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                        hx-post="{% url 'threshold_irc_network_relay_provision' relay|index:'net' relay|index:'id' %}"
-                        hx-target="#relays"
-                        hx-swap="outerHTML"
-                        class="button has-background-info has-text-white">
-                        <span class="icon" data-tooltip="Provision">
-                          <i class="fa-solid fa-wrench" aria-hidden="true"></i>
-                        </span>
-                      </a>
-                      <a
-                        hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-                        hx-post="{% url 'threshold_irc_network_relay_auth' relay|index:'net' relay|index:'id' %}"
-                        hx-target="#relays"
-                        hx-swap="outerHTML"
-                        class="button has-background-info has-text-white">
-                        <span class="icon" data-tooltip="Enable authentication">
-                          <i class="fa-solid fa-passport" aria-hidden="true"></i>
-                        </span>
-                      </a>
-                    </div>
-                  </div>
-
-                </td>
+                  <a
+                    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                    hx-post="{% url 'modal_context' %}"
+                    hx-vals='{"net": "{{ net }}",
+                            "num": "{{ relay.id }}",
+                            "src": "irc",
+                            "channel": "None",
+                            "time": "None",
+                            "date": "None",
+                            "index": "int",
+                            "type": "znc",
+                            "mtype": "None",
+                            "nick": "None"}'
+                    hx-target="#modals-here" 
+                    hx-trigger="click"
+                    class="button is-small has-background-info has-text-white">
+                    <span class="icon has-tooltip-left" data-tooltip="ZNC context">
+                      <i class="fa-brands fa-unity" aria-hidden="true"></i>
+                    </span>
+                  </a>
+                </td> {# actions-top #}
+              </tr>
+              <tr>
+                <td>
+                  <a
+                    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                    hx-delete="{% url 'threshold_irc_network_relay_del' relay|index:'net' relay|index:'id' %}"
+                    hx-target="#relays"
+                    hx-swap="outerHTML"
+                    class="button is-small has-background-danger has-text-white">
+                    <span class="icon" data-tooltip="Delete">
+                      <i class="fa-solid fa-xmark" aria-hidden="true"></i>
+                    </span>
+                  </a>
+                </td> {# id #}
+                <td>
+                  <a
+                    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                    hx-post="{% url 'threshold_irc_network_relay_provision' relay|index:'net' relay|index:'id' %}"
+                    hx-target="#relays"
+                    hx-swap="outerHTML"
+                    class="button is-small has-background-info has-text-white">
+                    <span class="icon" data-tooltip="Provision">
+                      <i class="fa-solid fa-wrench" aria-hidden="true"></i>
+                    </span>
+                  </a>
+                </td> {# reg #}
+                <td>
+                  <a
+                    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                    hx-post="{% url 'threshold_irc_network_relay_auth' relay|index:'net' relay|index:'id' %}"
+                    hx-target="#relays"
+                    hx-swap="outerHTML"
+                    class="button is-small has-background-info has-text-white">
+                    <span class="icon" data-tooltip="Enable authentication">
+                      <i class="fa-solid fa-passport" aria-hidden="true"></i>
+                    </span>
+                  </a>
+                </td> {# auth #}
+                <td></td> {# conn #}
+                <td>
+                  {% if relay.enabled %}
+                    <a
+                      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                      hx-get="{% url 'threshold_irc_network_relay_status' relay|index:'net' relay|index:'id' 0 %}"
+                      hx-target="#relays"
+                      hx-swap="outerHTML"
+                      class="button is-small has-background-warning">
+                      <span class="icon" data-tooltip="Disable">
+                        <i class="fa-solid fa-wifi-slash" aria-hidden="true"></i>
+                      </span>
+                    </a>
+                  {% else %}
+                    <a
+                      hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                      hx-get="{% url 'threshold_irc_network_relay_status' relay|index:'net' relay|index:'id' 1 %}"
+                      hx-target="#relays"
+                      hx-swap="outerHTML"
+                      class="button is-small has-background-success has-text-white">
+                      <span class="icon" data-tooltip="Enable">
+                        <i class="fa-solid fa-wifi" aria-hidden="true"></i>
+                      </span>
+                    </a>
+                  {% endif %}
+                </td> {# on #}
+                <td></td>
+                <td></td>
+                <td></td>
+                <td>
+                  <a
+                    hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
+                    hx-post="{% url 'threshold_irc_network_relay_auth' relay|index:'net' relay|index:'id' %}"
+                    hx-target="#relays"
+                    hx-swap="outerHTML"
+                    class="button is-small has-background-info has-text-white">
+                    <span class="icon has-tooltip-left" data-tooltip="Auth entity context">
+                      <i class="fa-solid fa-signature" aria-hidden="true"></i>
+                    </span>
+                  </a>
+                </td> {# actions-bottom #}
               </tr>
             {% endfor %}
           </tbody>