From 5cb668fd7a85a55711907761d69244bc91a8f363 Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Wed, 2 Oct 2019 17:38:32 +0100
Subject: [PATCH] Fix delete confirmation modal styling

---
 assets/templates/asset_update.html            | 10 +++++-----
 assets/templates/confirm_delete.html          | 16 ---------------
 .../{helpers => partials}/asset_buttons.html  |  4 ++--
 assets/templates/partials/confirm_delete.html | 20 +++++++++++++++++++
 .../{helpers => partials}/render_field.html   |  0
 5 files changed, 27 insertions(+), 23 deletions(-)
 delete mode 100644 assets/templates/confirm_delete.html
 rename assets/templates/{helpers => partials}/asset_buttons.html (80%)
 create mode 100644 assets/templates/partials/confirm_delete.html
 rename assets/templates/{helpers => partials}/render_field.html (100%)

diff --git a/assets/templates/asset_update.html b/assets/templates/asset_update.html
index 166ae497..1fec1402 100644
--- a/assets/templates/asset_update.html
+++ b/assets/templates/asset_update.html
@@ -9,20 +9,20 @@
 <div class="page-header">
   <h1>
             {% if edit and object %}
-                Edit Asset: {{ object.asset_id }}
+                Edit Asset: {{ object.asset_id }} {{ object.description }}
             {% elif duplicate %}
                 Duplication of Asset: {{ previous_asset_id }}
             {% elif not object %}
                 Create Asset
             {% else %}
-                Asset: {{ object.asset_id }}
+                Asset: {{ object.asset_id }} {{ object.description }}
             {% endif %}
 
         </h1>
 </div>
 
 <div class="pull-right" style="margin-bottom: 100px">
-  {% include 'helpers/asset_buttons.html' %}
+  {% include 'partials/asset_buttons.html' %}
 </div>
 
 <form method="post" id="asset_update_form">
@@ -260,9 +260,9 @@
     </div>
 </form>
 
-{% include 'helpers/asset_buttons.html' %}
+{% include 'partials/asset_buttons.html' %}
 
-{% include 'confirm_delete.html' with object=object %}
+{% include 'partials/confirm_delete.html' with object=object %}
 
 {% endblock %}
 
diff --git a/assets/templates/confirm_delete.html b/assets/templates/confirm_delete.html
deleted file mode 100644
index 39b19b35..00000000
--- a/assets/templates/confirm_delete.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="confirm_delete_modal" class="modal">
-    <form method="post" id="confirm_delete_form">
-        {% csrf_token %}
-        <div class="modal-content">
-            <h4>Confirm Delete</h4>
-            <p>Are you sure you want to delete asset:
-                <strong>{{ object }}</strong>
-            </p>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="modal-close btn-flat" onclick="deleteAsset({{ object.id }})">Delete</button>
-            {#        <a href="#" class="modal-close btn-flat green">Close</a>#}
-            <a href="#" class="modal-close btn-flat red">Cancel</a>
-        </div>
-    </form>
-</div>
\ No newline at end of file
diff --git a/assets/templates/helpers/asset_buttons.html b/assets/templates/partials/asset_buttons.html
similarity index 80%
rename from assets/templates/helpers/asset_buttons.html
rename to assets/templates/partials/asset_buttons.html
index b421b3b0..d752e254 100644
--- a/assets/templates/helpers/asset_buttons.html
+++ b/assets/templates/partials/asset_buttons.html
@@ -3,7 +3,7 @@
   <!--edit-->
   <button type="button" class="btn btn-success" onclick="updateAsset()"><i class="glyphicon glyphicon-floppy-disk"></i> Save</button>
   <a class="btn btn-default" href="{% url 'asset_update' object.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-  <a class="btn btn-danger" href="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
+  <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
   {% elif duplicate %}
   <!--duplicate-->
   <button type="button" class="btn btn-default" onclick="updateAsset()"><i class="glyphicon glyphicon-ok-sign"></i> Create Duplicate</button>
@@ -15,6 +15,6 @@
   <!--detail view-->
   <a href="{% url 'asset_update' object.pk %}" class="btn btn-default"><i class="glyphicon glyphicon-edit"></i> Edit</a>
   <a class="btn btn-default" href="{% url 'asset_update' object.pk %}?duplicate=true"><i class="glyphicon glyphicon-duplicate"></i> Duplicate</a>
-  <a class="btn btn-danger" href="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
+  <a class="btn btn-danger" data-toggle="modal" data-target="#confirm_delete_modal"><i class="glyphicon glyphicon-trash"></i> Delete</a>
   {% endif %}
 </div>
diff --git a/assets/templates/partials/confirm_delete.html b/assets/templates/partials/confirm_delete.html
new file mode 100644
index 00000000..c0cb011d
--- /dev/null
+++ b/assets/templates/partials/confirm_delete.html
@@ -0,0 +1,20 @@
+<div id="confirm_delete_modal" class="modal fade" tabindex="-1" role="dialog">
+  <div class="modal-dialog modal-sm" role="document">
+    <form method="post" id="confirm_delete_form">
+      {% csrf_token %}
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">Confirm Delete</h4>
+        </div>
+        <div class="modal-body">
+        <p>Are you sure you want to delete asset:</p>
+        <p><strong>{{ object }}</strong></p>
+      </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-danger" onclick="deleteAsset({{ object.id }})" data-dismiss="modal"><i class="glyphicon glyphicon-trash"></i> Delete</button>
+          <button class="btn btn-success" data-dismiss="modal">Cancel</button>
+        </div>
+      </div>
+    </form>
+  </div>
+</div>
diff --git a/assets/templates/helpers/render_field.html b/assets/templates/partials/render_field.html
similarity index 100%
rename from assets/templates/helpers/render_field.html
rename to assets/templates/partials/render_field.html