From 9442e92b31c6558e60854750252a4ba535b9c2fd Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Wed, 3 Aug 2022 07:20:30 +0100
Subject: [PATCH] Improve search forms

---
 core/lib/opensearch.py                        |  2 +-
 .../manage/threshold/irc/network/actions.html |  6 +-
 .../threshold/irc/overview/actions.html       |  6 +-
 .../manage/threshold/irc/overview/alerts.html | 58 ++++++++++---------
 core/templates/ui/drilldown/drilldown.html    | 47 +++++++--------
 core/templates/ui/drilldown/results.html      | 27 ++++-----
 core/templates/ui/insights/info.html          |  4 ++
 core/templates/ui/insights/insights.html      | 19 ++----
 8 files changed, 85 insertions(+), 84 deletions(-)

diff --git a/core/lib/opensearch.py b/core/lib/opensearch.py
index 26b88fd..657fd7e 100644
--- a/core/lib/opensearch.py
+++ b/core/lib/opensearch.py
@@ -123,7 +123,7 @@ def run_main_query(client, user, query, custom_query=False, index=None, size=Non
         search_query = construct_query(query, size)
     try:
         response = client.search(body=search_query, index=index)
-    except RequestError as err:
+    except RequestError:
         return False
     filter_blacklisted(user, response)
     return response
diff --git a/core/templates/manage/threshold/irc/network/actions.html b/core/templates/manage/threshold/irc/network/actions.html
index accd20e..9e63e5a 100644
--- a/core/templates/manage/threshold/irc/network/actions.html
+++ b/core/templates/manage/threshold/irc/network/actions.html
@@ -7,7 +7,7 @@
       hx-trigger="click"
       hx-target="#actions"
       hx-swap="outerHTML"
-      class="button is-success">
+      class="button is-primary">
       <span class="icon-text">
         <span class="icon">
           <i class="fa-solid fa-plus"></i>
@@ -21,7 +21,7 @@
       hx-trigger="click"
       hx-target="#actions"
       hx-swap="outerHTML"
-      class="button is-success">
+      class="button is-primary">
       <span class="icon-text">
         <span class="icon">
           <i class="fa-solid fa-wrench"></i>
@@ -35,7 +35,7 @@
       hx-trigger="click"
       hx-target="#actions"
       hx-swap="outerHTML"
-      class="button is-success">
+      class="button is-primary">
       <span class="icon-text">
         <span class="icon">
           <i class="fa-solid fa-list"></i>
diff --git a/core/templates/manage/threshold/irc/overview/actions.html b/core/templates/manage/threshold/irc/overview/actions.html
index b71b875..9795750 100644
--- a/core/templates/manage/threshold/irc/overview/actions.html
+++ b/core/templates/manage/threshold/irc/overview/actions.html
@@ -6,7 +6,7 @@
       hx-get="{% url 'threshold_irc_actions_add-network' %}"
       hx-trigger="click"
       hx-target="#modals-here-actions"
-      class="button is-success">
+      class="button is-primary">
       <span class="icon-text">
         <span class="icon">
           <i class="fa-solid fa-plus"></i>
@@ -20,7 +20,7 @@
       hx-trigger="click"
       hx-target="#actions"
       hx-swap="outerHTML"
-      class="button is-success">
+      class="button is-primary">
       <span class="icon-text">
         <span class="icon">
           <i class="fa-solid fa-wrench"></i>
@@ -30,7 +30,7 @@
     </button>
     <button
       hx-headers='{"X-CSRFToken": "{{ csrf_token }}"}'
-      class="button is-success">
+      class="button is-primary">
       <span class="icon-text">
         <span class="icon">
           <i class="fa-solid fa-list"></i>
diff --git a/core/templates/manage/threshold/irc/overview/alerts.html b/core/templates/manage/threshold/irc/overview/alerts.html
index 9f68ca6..4ca4e70 100644
--- a/core/templates/manage/threshold/irc/overview/alerts.html
+++ b/core/templates/manage/threshold/irc/overview/alerts.html
@@ -29,8 +29,7 @@
         </span>
       </button>
 
-      <button
-        class="button is-small">
+      <button class="button is-small">
         <span class="icon" data-tooltip="Self">
           <i class="fa-solid fa-message-bot"></i>
         </span>
@@ -56,32 +55,35 @@
                 </td>
                 <td>
                   {{ alert.net }}/{{ alert.num }}
-                  <td>
-                    {% if alert.type == 'conn' %}
-                      <span class="icon" data-tooltip="Conn">
-                        <i class="fa-solid fa-cloud-exclamation"></i>
-                      </span>
-                    {% elif alert.type == 'highlight' %}
-                      <span class="icon" data-tooltip="Highlight">
-                        <i class="fa-solid fa-square-quote"></i>
-                      </span>
-                    {% elif alert.type == 'znc' %}
-                      <span class="icon" data-tooltip="ZNC">
-                        <i class="fa-brands fa-unity"></i>
-                      </span>
-                    {% elif alert.type == 'query' %}
-                      <span class="icon" data-tooltip="Query">
-                        <i class="fa-solid fa-inbox"></i>
-                      </span>
-                    {% elif alert.type == 'self' %}
-                      <span class="icon" data-tooltip="Self">
-                        <i class="fa-solid fa-message-bot"></i>
-                      </span>
-                    {% else %}
-                      {{ alert.type }}
-                    {% endif %}
-                  </td>
-                <td style="max-width: 10em" class="wrap">{{ alert.msg }}</td>
+                </td>
+                <td>
+                  {% if alert.type == 'conn' %}
+                    <span class="icon" data-tooltip="Conn">
+                      <i class="fa-solid fa-cloud-exclamation"></i>
+                    </span>
+                  {% elif alert.type == 'highlight' %}
+                    <span class="icon" data-tooltip="Highlight">
+                      <i class="fa-solid fa-square-quote"></i>
+                    </span>
+                  {% elif alert.type == 'znc' %}
+                    <span class="icon" data-tooltip="ZNC">
+                      <i class="fa-brands fa-unity"></i>
+                    </span>
+                  {% elif alert.type == 'query' %}
+                    <span class="icon" data-tooltip="Query">
+                      <i class="fa-solid fa-inbox"></i>
+                    </span>
+                  {% elif alert.type == 'self' %}
+                    <span class="icon" data-tooltip="Self">
+                      <i class="fa-solid fa-message-bot"></i>
+                    </span>
+                  {% else %}
+                    {{ alert.type }}
+                  {% endif %}
+                </td>
+                <td class="wrap" style="max-width: 10em">
+                  {{ alert.msg }}
+                </td>
               </tr>
             {% endfor %}
           </tbody>
diff --git a/core/templates/ui/drilldown/drilldown.html b/core/templates/ui/drilldown/drilldown.html
index 745e60d..fd9d722 100644
--- a/core/templates/ui/drilldown/drilldown.html
+++ b/core/templates/ui/drilldown/drilldown.html
@@ -5,26 +5,35 @@
   <div class="box">
     <form method="POST">
       {% csrf_token %}
-      <div class="field">
-        <label class="label">Search</label>
-        <div class="field-body">
-          <div class="field">
+
+      <div class="columns">
+        <div class="column">
+          <div class="field has-addons">
             <div class="control is-expanded has-icons-left">
               <input name="query" class="input" type="text" placeholder="msg: science AND nick: BillNye AND channel: #science">
               <span class="icon is-small is-left">
                 <i class="fas fa-magnifying-glass"></i>
               </span>
             </div>
+            <div class="control">
+              <div class="field">
+                <button
+                  class="button is-primary is-fullwidth"
+                  hx-post="{% url 'search_drilldown' %}"
+                  hx-trigger="click"
+                  hx-target="#results"
+                  hx-swap="innerHTML">
+                  Search
+                </button>
+              </div>
+            </div>
           </div>
         </div>
-      </div>
 
-      <div class="columns">
         <div class="column">
-          <label class="label">Results</label>
-          <div class="field">
+          <div class="field has-addons">
             <div class="control is-expanded has-icons-left">
-              <div class="select is-fullwidth">
+              <span class="select is-fullwidth">
                 <select name="size">
                   {% for size in sizes %}
                     <option value="{{ size }}">{{ size }}</option>
@@ -33,25 +42,17 @@
                 <span class="icon is-small is-left">
                   <i class="fas fa-magnifying-glass"></i>
                 </span>
-              </div>
+              </span>
             </div>
+            <p class="control">
+              <a class="button is-static">
+                results
+              </a>
+            </p>
           </div>
         </div>
       </div>
 
-      <div class="field">
-        <div class="control">
-          <button
-            class="button is-primary is-fullwidth"
-            hx-post="{% url 'search_drilldown' %}"
-            hx-trigger="click"
-            hx-target="#results"
-            hx-swap="innerHTML">
-            Search
-          </button>
-        </div>
-      </div>
-
     </form>
   </div>
   
diff --git a/core/templates/ui/drilldown/results.html b/core/templates/ui/drilldown/results.html
index eb1fc27..3c2bc2b 100644
--- a/core/templates/ui/drilldown/results.html
+++ b/core/templates/ui/drilldown/results.html
@@ -28,19 +28,20 @@
         </thead>
         <tbody>
           {% for item in results %}
-          {% if item.type == 'join' %}
-            <tr class="has-background-success-light">
-          {% elif item.type == 'quit' %}
-            <tr class="has-background-danger-light">
-          {% elif item.type == 'kick' %}
-            <tr class="has-background-danger-light">
-          {% elif item.type == 'part' %}
-            <tr class="has-background-warning-light">
-          {% elif item.type == 'mode' %}
-            <tr class="has-background-info-light">
-          {% else %}
-            <tr>
-          {% endif %}
+          <tr>
+            {% if item.type == 'join' %}
+              <tr class="has-background-success-light">
+            {% elif item.type == 'quit' %}
+              <tr class="has-background-danger-light">
+            {% elif item.type == 'kick' %}
+              <tr class="has-background-danger-light">
+            {% elif item.type == 'part' %}
+              <tr class="has-background-warning-light">
+            {% elif item.type == 'mode' %}
+              <tr class="has-background-info-light">
+            {% else %}
+              <tr>
+            {% endif %}
               <td>
                 {% if item.src == 'irc' %}
                   <span class="icon" data-tooltip="IRC">
diff --git a/core/templates/ui/insights/info.html b/core/templates/ui/insights/info.html
index 535b515..2b3cdf6 100644
--- a/core/templates/ui/insights/info.html
+++ b/core/templates/ui/insights/info.html
@@ -23,6 +23,10 @@
     <div class="content" style="max-height: 30em; overflow: auto;">
       <div class="table-container">
         <table class="table is-fullwidth is-hoverable">
+          <thead>
+            <th>attribute</th>
+            <th>value</th>
+          </thead>
           <tbody>
             <tr>
               <th>src</th>
diff --git a/core/templates/ui/insights/insights.html b/core/templates/ui/insights/insights.html
index 2645bbf..7970d87 100644
--- a/core/templates/ui/insights/insights.html
+++ b/core/templates/ui/insights/insights.html
@@ -44,20 +44,13 @@
           <article class="tile is-child box">
             <form method="POST">
               {% csrf_token %}
-              <div class="field">
-                <label class="label">Search</label>
-                <div class="field-body">
-                  <div class="field">
-                    <div class="control is-expanded has-icons-left">
-                      <input id="query" name="query" class="input" type="text" placeholder="nickname">
-                      <span class="icon is-small is-left">
-                        <i class="fas fa-magnifying-glass"></i>
-                      </span>
-                    </div>
-                  </div>
+              <div class="field has-addons">
+                <div class="control is-expanded has-icons-left">
+                  <input id="query" name="query" class="input" type="text" placeholder="nickname">
+                  <span class="icon is-small is-left">
+                    <i class="fas fa-magnifying-glass"></i>
+                  </span>
                 </div>
-              </div>
-              <div class="field">
                 <div class="control">
                   <button
                     class="button is-primary is-fullwidth"