From 1dad8d2ba5a065efd24c7f68958d8926c1e1561a Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Mon, 28 Sep 2020 10:32:00 +0100
Subject: [PATCH] Tweak asset list markup

---
 assets/templates/asset_list.html | 44 +++++++++++++++-----------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/assets/templates/asset_list.html b/assets/templates/asset_list.html
index 266eae6c..3dbaddf4 100644
--- a/assets/templates/asset_list.html
+++ b/assets/templates/asset_list.html
@@ -16,30 +16,26 @@
 
 {% block content %}
 <h1>Asset List</h1>
-<form id="asset-search-form" method="GET" class="form">
-  <div class="row py-2">
-      <div class="input-group">
-        {% render_field form.q|add_class:'form-control' placeholder='Search by Asset ID/Desc/Serial' style="width: 250px"%}
-        <label for="q" class="sr-only">Asset ID/Description/Serial Number:</label>
-        <span class="input-group-append"><button type="submit" class="btn btn-primary" id="id_search" style="width: 6em">Search</button></span>
-      </div>
-  </div>
-  <div class="row justify-content-end">
-      <div id="category-group" class="form-group px-2" style="margin-bottom: 0;">
-        <label for="category" class="sr-only">Category</label>
-        {% render_field form.category|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
-      </div>
-      <div id="status-group" class="form-group px-2" style="margin-bottom: 0;">
-        <label for="status" class="sr-only">Status</label>
-        {% render_field form.status|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
-      </div>
-      <button id="filter-submit" type="submit" class="btn btn-secondary" style="width: 6em">Filter</button>
-  </div>
-</form>
-<div class="row">
-    <div class="col px-0">
-        <a href="{% url 'asset_create' %}" class="btn btn-success float-right my-2" style="width: 6em">New <span class="fas fa-plus"></span></a>
-    </div>
+<div class="row justify-content-end">
+    <form id="asset-search-form" method="GET" class="form-inline">
+          <div class="input-group px-1">
+            {% render_field form.q|add_class:'form-control' placeholder='Search by Asset ID/Desc/Serial' %}
+            <label for="q" class="sr-only">Asset ID/Description/Serial Number:</label>
+            <span class="input-group-append"><button type="submit" class="btn btn-info" id="id_search" style="width: 6em">Search</button></span>
+          </div>
+          <div id="category-group" class="form-group px-1" style="margin-bottom: 0;">
+            <label for="category" class="sr-only">Category</label>
+            {% render_field form.category|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Categories" data-header="Categories" data-actions-box="true" %}
+          </div>
+          <div id="status-group" class="form-group px-1" style="margin-bottom: 0;">
+            <label for="status" class="sr-only">Status</label>
+            {% render_field form.status|attr:'multiple'|add_class:'form-control custom-select selectpicker col-sm' data-none-selected-text="Statuses" data-header="Statuses" data-actions-box="true" %}
+          </div>
+          <button id="filter-submit" type="submit" class="btn btn-secondary" style="width: 6em">Filter</button>
+    </form>
+</div>
+<div class="row justify-content-end">
+    <a href="{% url 'asset_create' %}" class="btn btn-primary my-2" style="width: 6em">New <span class="fas fa-plus"></span></a>
 </div>
 <div class="row">
     {% include 'partials/asset_list_table.html' %}