From c8d0c0d5d0842325ac4ddc99505bc5cd3b97b207 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Mon, 6 Apr 2020 15:17:14 +0100
Subject: [PATCH] Asset form fixes

---
 assets/templates/asset_detail.html            | 13 ++---
 assets/templates/asset_form.html              | 28 +++++------
 assets/templates/partials/asset_buttons.html  | 50 ++++++++++---------
 .../templates/partials/asset_list_table.html  |  6 +--
 .../partials/purchasedetails_form.html        |  4 +-
 5 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/assets/templates/asset_detail.html b/assets/templates/asset_detail.html
index 0ab8a8fe..73e9b340 100644
--- a/assets/templates/asset_detail.html
+++ b/assets/templates/asset_detail.html
@@ -15,20 +15,21 @@
 </div>
 <div class="row">
     {% if perms.assets.asset_finance %}
-    <div class="col-md-6">
+    <div class="col-md-6 py-3">
       {% include 'partials/purchasedetails_form.html' %}
     </div>
     {% endif %}
-    <div class="col-md-6" {% if not object.is_cable %}hidden="true"{% endif %} id="cable-table">
+    <div class="col-md-6 py-3" {% if not object.is_cable %}hidden="true"{% endif %} id="cable-table">
       {% include 'partials/cable_form.html' %}
     </div>
-    <div class="col-md-4">
+    <div class="col-md-4 py-3">
       {% include 'partials/parent_form.html' %}
     </div>
 </div>
-<div class="row">
-<div class="col-md-12">
-  {% include 'partials/asset_buttons.html' %}
+<div class="row justify-content-end">
+{% include 'partials/asset_buttons.html' %}
 </div>
+<div class="row justify-content-end">
 {% include 'partials/last_edited.html' with target="asset_history" id=object.asset_id %}
+</div>
 {% endblock %}
diff --git a/assets/templates/asset_form.html b/assets/templates/asset_form.html
index 4797d327..afb7b5e1 100644
--- a/assets/templates/asset_form.html
+++ b/assets/templates/asset_form.html
@@ -26,31 +26,29 @@
 {% endblock %}
 
 {% block content %}
-<div class="page-header">
-  <h1>
-      {% if edit and object %}
-          Edit Asset: {{ object.asset_id }}
-      {% elif duplicate %}
-          Duplication of Asset: {{ previous_asset_id }}
-      {% else %}
-          Create Asset
-      {% endif %}
-  </h1>
-</div>
+<h1>
+  {% if edit and object %}
+      Edit Asset: {{ object.asset_id }}
+  {% elif duplicate %}
+      Duplication of Asset: {{ previous_asset_id }}
+  {% else %}
+      Create Asset
+  {% endif %}
+</h1>
 {% if duplicate %}
-    <form method="post" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id %}">
+    <form method="POST" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id %}">
 {% else %}
-    <form method="post" id="asset_update_form" action="{% url 'asset_create' %}">
+    <form method="POST" id="asset_update_form" action="{% url 'asset_create' %}">
 {% endif %}
         {% include 'form_errors.html' %}
         {% csrf_token %}
         <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
-        <div class="row">
+        <div class="row pt-4">
           <div class="col-sm-12">
             {% include 'partials/asset_detail_form.html' %}
           </div>
         </div>
-        <div class="row">
+        <div class="row pt-4">
           <div class="col-md-6">
             {% include 'partials/purchasedetails_form.html' %}
           </div>
diff --git a/assets/templates/partials/asset_buttons.html b/assets/templates/partials/asset_buttons.html
index 3c99225f..e42eeda1 100644
--- a/assets/templates/partials/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -1,25 +1,27 @@
-{% if edit and object %}
-<!--edit-->
-<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-<a class="btn btn-default" href="{% url 'asset_duplicate' object.pk %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-{% elif duplicate %}
-<!--duplicate-->
-<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
-{% elif create %}
-<!--create-->
-<button type="submit" class="btn btn-success"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
-{% else %}
-<!--detail view-->
-<div class="btn-group">
-    <a href="{% url 'asset_update' object.asset_id %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
-    <a class="btn btn-default" href="{% url 'asset_duplicate' object.asset_id %}"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
+<div class="py-2">
+    {% if edit and object %}
+    <!--edit-->
+    <button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Save</button>
+    {% elif duplicate %}
+    <!--duplicate-->
+    <button type="submit" class="btn btn-success"><i class="fas fa-tick"></i> Create Duplicate</button>
+    {% elif create %}
+    <!--create-->
+    <button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Save</button>
+    {% else %}
+    <!--detail view-->
+    <div class="btn-group">
+        <a href="{% url 'asset_update' object.asset_id %}" class="btn btn-warning"><i class="fas fa-edit"></i> Edit</a>
+        <a class="btn btn-info" href="{% url 'asset_duplicate' object.asset_id %}"><i class="fas fa-clone"></i> Duplicate</a>
+    </div>
+    {% endif %}
+    {% if create or edit or duplicate %}
+    <br>
+    <button type="reset" class="btn btn-link" onclick="
+    {% if duplicate %}
+        {% url 'asset_detail' previous_asset_id %}
+    {% else %}
+        history.back()
+    {% endif %}">Cancel</button>
+    {% endif %}
 </div>
-{% endif %}
-{% if create or edit or duplicate %}
-<br>
-<button type="reset" class="btn btn-link" onclick="
-{%if duplicate%}
-{% url 'asset_detail' previous_asset_id %}
-{%else%}
-history.back(){%endif%}">Cancel</button>
-{% endif %}
diff --git a/assets/templates/partials/asset_list_table.html b/assets/templates/partials/asset_list_table.html
index 27f31df4..81eb6a8a 100644
--- a/assets/templates/partials/asset_list_table.html
+++ b/assets/templates/partials/asset_list_table.html
@@ -18,10 +18,10 @@
                 <td class="assetStatus">{{ item.status }}</td>
                 <td class="d-none d-sm-table-cell">
                     <div class="btn-group" role="group">
-                        <a type="button" class="btn btn-primary btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="fas fa-eye fa-fw"></i><span class="d-none d-sm-inline"> View</span></a>
+                        <a type="button" class="btn btn-primary btn-sm" href="{% url 'asset_detail' item.asset_id %}"><i class="fas fa-eye"></i><span class="d-none d-sm-inline"> View</span></a>
                         {% if perms.assets.change_asset %}
-                        <a type="button" class="btn btn-warning btn-sm" href="{% url 'asset_update' item.asset_id %}"><i class="fas fa-edit fa-fw"></i><span class="d-none d-sm-inline"> Edit</span></a>
-                        <a type="button" class="btn btn-secondary btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="fas fa-clone fa-fw"></i><span class="d-none d-sm-inline"> Duplicate</span></a>
+                        <a type="button" class="btn btn-warning btn-sm" href="{% url 'asset_update' item.asset_id %}"><i class="fas fa-edit"></i><span class="d-none d-sm-inline"> Edit</span></a>
+                        <a type="button" class="btn btn-info btn-sm" href="{% url 'asset_duplicate' item.asset_id %}"><i class="fas fa-clone"></i><span class="d-none d-sm-inline"> Duplicate</span></a>
                         {% endif %}
                     </div>
                 </td>
diff --git a/assets/templates/partials/purchasedetails_form.html b/assets/templates/partials/purchasedetails_form.html
index 9cbe9a60..b2cca199 100644
--- a/assets/templates/partials/purchasedetails_form.html
+++ b/assets/templates/partials/purchasedetails_form.html
@@ -17,7 +17,7 @@
     <div class="form-group">
       <label for="{{ form.purchase_price.id_for_label }}">Purchase Price</label>
       <div class="input-group">
-        <span class="input-group-addon">£</span>
+        <div class="input-group-prepend"><span class="input-group-text">£</span></div>
         {% render_field form.purchase_price|add_class:'form-control' value=object.purchase_price %}
       </div>
     </div>
@@ -25,7 +25,7 @@
     <div class="form-group">
       <label for="{{ form.salvage_value.id_for_label }}">Salvage Value</label>
       <div class="input-group">
-        <span class="input-group-addon">£</span>
+        <div class="input-group-prepend"><span class="input-group-text">£</span></div>
         {% render_field form.salvage_value|add_class:'form-control' value=object.salvage_value %}
       </div>
     </div>