From 7736a2d3cc554054a4d75c3eeedbc6b6f48f4ea0 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Sat, 17 Oct 2020 18:18:51 +0100
Subject: [PATCH] Fix horizontal-ness on some forms

---
 RIGS/templates/eventauthorisation_form.html | 13 +++++++++----
 assets/templates/asset_audit.html           |  2 +-
 assets/templates/asset_audit_list.html      | 18 ++++++++++--------
 assets/templates/asset_list.html            |  2 +-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/RIGS/templates/eventauthorisation_form.html b/RIGS/templates/eventauthorisation_form.html
index 479777c6..155cdeb7 100644
--- a/RIGS/templates/eventauthorisation_form.html
+++ b/RIGS/templates/eventauthorisation_form.html
@@ -26,7 +26,7 @@
                         </div>
 
                         <div class="col-sm-12 col-md-6">
-                            <div class="col-sm-12 form-group" data-toggle="tooltip"
+                            <div class="col-sm-12 form-group form-row" data-toggle="tooltip"
                                  title="Your name as the person authorising the event.">
                                 <label for="{{ form.name.id_for_label }}"
                                        class="col-sm-4 col-form-label">{{ form.name.label }}</label>
@@ -36,7 +36,7 @@
                                 </div>
                             </div>
 
-                            <div class="col-sm-12 form-group" data-toggle="tooltip"
+                            <div class="col-sm-12 form-group form-row" data-toggle="tooltip"
                                  title="Your Student ID or Staff username as the person authorising the event.">
                                 <label for="{{ form.uni_id.id_for_label }}"
                                        class="col-sm-4 col-form-label">{{ form.uni_id.label }}</label>
@@ -47,7 +47,7 @@
                         </div>
 
                         <div class="col-sm-12 col-md-6">
-                            <div class="col-sm-12 form-group" data-toggle="tooltip"
+                            <div class="col-sm-12 form-group form-row" data-toggle="tooltip"
                                  title="The Students' Union account code you wish this event to be charged to.">
                                 <label for="{{ form.account_code.id_for_label }}"
                                        class="col-sm-4 col-form-label">{{ form.account_code.label }}</label>
@@ -56,12 +56,17 @@
                                 </div>
                             </div>
 
-                            <div class="col-sm-12 form-group" data-toggle="tooltip"
+                            <div class="col-sm-12 form-group form-row" data-toggle="tooltip"
                                  title="The full amount chargable for this event as displayed above, including VAT.">
                                 <label for="{{ form.amount.id_for_label }}"
                                        class="col-sm-4 col-form-label">{{ form.amount.label }}</label>
                                 <div class="col-sm-8">
+                                    <div class="input-group mb-3">
+                                      <div class="input-group-prepend">
+                                        <span class="input-group-text">£</span>
+                                      </div>
                                     {% render_field form.amount class+="form-control" %}
+                                    </div>
                                 </div>
                             </div>
                         </div>
diff --git a/assets/templates/asset_audit.html b/assets/templates/asset_audit.html
index b4d6f293..cc77dbe9 100644
--- a/assets/templates/asset_audit.html
+++ b/assets/templates/asset_audit.html
@@ -23,7 +23,7 @@
   }
   checkIfCableHidden();
 </script>
-<form class="" method="POST" id="asset_audit_form" action="{{ form.action|default:request.path }}">
+<form method="POST" id="asset_audit_form" action="{{ form.action|default:request.path }}">
   {% include 'form_errors.html' %}
   {% csrf_token %}
   <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
diff --git a/assets/templates/asset_audit_list.html b/assets/templates/asset_audit_list.html
index 25ffd853..d3017596 100644
--- a/assets/templates/asset_audit_list.html
+++ b/assets/templates/asset_audit_list.html
@@ -49,14 +49,16 @@
 	<span>Asset with that ID does not exist!</span>
 </div>
 
-<h3>Audit Asset:</h3>
-<form id="asset-search-form" class=" mb-3" method="POST">
-  <div class="input-group input-group-lg" style="width=auto;">
-    {% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %}
-    <div class="input-group-append">
-        <label for="q" class="sr-only">Asset ID:</label>
-        <a id="searchButton" class="btn btn-primary" class="submit" type="submit">Search</a>
-    </div>
+<form id="asset-search-form" class="mb-3" method="POST">
+  <div class="form-group form-row">
+      <h3>Audit Asset:</h3>
+      <div class="input-group input-group-lg">
+        {% render_field form.q|add_class:'form-control' placeholder='Enter Asset ID' autofocus="true" %}
+        <div class="input-group-append">
+            <label for="q" class="sr-only">Asset ID:</label>
+            <a id="searchButton" class="btn btn-primary" class="submit" type="submit">Search</a>
+        </div>
+      </div>
   </div>
 </form>
 
diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 3a98e0b0..47137177 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -83,7 +83,7 @@
     </div>
 </div>
 <div class="row my-2">
-    <div class="col bg-dark rounded pt-3">
+    <div class="col bg-dark text-white rounded pt-3">
         {# TODO Gotta be a cleaner way to do this... #}
         <p><span class="ml-2">Active Filters: </span> {% for filter in category_filters %}<span class="badge badge-info mx-1 ">{{filter}}<button type="button" class="btn btn-link p-0 ml-1 align-baseline">
   <span aria-hidden="true" class="fas fa-times" onclick="removeQString('category', '{{filter.id}}')"></span>