From 9bc686b76f6af18b70fdcab3fa10d3e413a52354 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Thu, 10 Mar 2022 12:44:57 +1100
Subject: [PATCH 1/2] Refactor "delete stock location" dialog

- Simplify dialog
- Make text translatable
---
 .../templates/stock/location_delete.html      | 49 ++++++++-----------
 1 file changed, 20 insertions(+), 29 deletions(-)

diff --git a/InvenTree/stock/templates/stock/location_delete.html b/InvenTree/stock/templates/stock/location_delete.html
index 9c560e58c5..c86ab4bc05 100644
--- a/InvenTree/stock/templates/stock/location_delete.html
+++ b/InvenTree/stock/templates/stock/location_delete.html
@@ -4,40 +4,31 @@
 {% load inventree_extras %}
 
 {% block pre_form_content %}
-{% trans "Are you sure you want to delete this stock location?" %}
-
-<br>
-
+<div class='alert alert-block alert-danger'>
+    {% trans "Are you sure you want to delete this stock location?" %}
+</div>
+    
 {% if location.children.all|length > 0 %}
-<p>This location contains {{ location.children.all|length }} child locations.<br>
-If this location is deleted, these child locations will be moved to
-{% if location.parent %}
-the '{{ location.parent.name }}' location.
-{% else %}
-the top level 'Stock' location.
+<div class='alert alert-block alert-warning'>
+    {% blocktrans with n=location.children.all|length %}This location contains {{ n }} child locations{% endblocktrans %}.<br>
+    {% if location.parent %}
+    {% blocktrans with location=location.parent.name %}If this location is deleted, these child locations will be moved to {{ location }}{% endblocktrans %}.
+    {% else %}
+    {% trans "If this location is deleted, these child locations will be moved to the top level stock location" %}.
+    {% endif %}
+</div>
 {% endif %}
-</p>
 
-<ul class='list-group'>
-    {% for loc in location.children.all %}
-    <li class='list-group-item'><strong>{{ loc.name }}</strong> - <em>{{ loc.description}}</em></li>
-    {% endfor %}
-</ul>
-{% endif %}
 
 {% if location.stock_items.all|length > 0 %}
-<p>This location contains {{ location.stock_items.all|length }} stock items.<br>
-{% if location.parent %}
-If this location is deleted, these items will be moved to the '{{ location.parent.name }}' location.
-{% else %}
-If this location is deleted, these items will be moved to the top level 'Stock' location.
+<div class='alert alert-block alert-warning'>
+    {% blocktrans with n=location.stock_items.all|length %}This location contains {{ n }} stock items{% endblocktrans %}.<br>
+    {% if location.parent %}
+    {% blocktrans with location=location.parent.name %}If this location is deleted, these stock items will be moved to {{ location }}{% endblocktrans %}.
+    {% else %}
+    {% trans "If this location is deleted, these stock items will be moved to the top level stock location" %}.
+    {% endif %}
+</div>
 {% endif %}
-</p>
 
-<ul class='list-group'>
-    {% for item in location.stock_items.all %}
-    <li class='list-group-item'><strong>{{ item.part.full_name }}</strong> - <em>{{ item.part.description }}</em><span class='badge badge-right rounded-pill bg-dark'>{% decimal item.quantity %}</span></li>
-    {% endfor %}
-</ul>
-{% endif %}
 {% endblock %}
\ No newline at end of file

From d5fe62262d13a6586b82badd34051add3479d797 Mon Sep 17 00:00:00 2001
From: Oliver <oliver.henry.walters@gmail.com>
Date: Thu, 10 Mar 2022 12:51:49 +1100
Subject: [PATCH 2/2] Refactor "delete part category" dialog

- Translations
- Simplification
---
 .../part/templates/part/category_delete.html  | 41 ++++++++-----------
 1 file changed, 17 insertions(+), 24 deletions(-)

diff --git a/InvenTree/part/templates/part/category_delete.html b/InvenTree/part/templates/part/category_delete.html
index 1faf104ed1..d93519058e 100644
--- a/InvenTree/part/templates/part/category_delete.html
+++ b/InvenTree/part/templates/part/category_delete.html
@@ -2,38 +2,31 @@
 {% load i18n %}
 
 {% block pre_form_content %}
-{% trans 'Are you sure you want to delete category' %} <strong>{{ category.name }}</strong>?
+
+<div class='alert alert-block alert-danger'>
+    {% trans "Are you sure you want to delete this part category?" %}
+</div>
 
 {% if category.children.all|length > 0 %}
-<p>{% blocktrans with count=category.children.all|length%}This category contains {{count}} child categories{% endblocktrans %}.<br>
-{% trans 'If this category is deleted, these child categories will be moved to the' %}
-{% if category.parent %}
- <strong>{{ category.parent.name }}</strong> {% trans 'category' %}.
-{% else %}
- {% trans 'top level Parts category' %}.
-{% endif %}
-</p>
-
-<ul class='list-group'>
-{% for cat in category.children.all %}
-    <li class='list-group-item'><strong>{{ cat.name }}</strong> - <em>{{ cat.description }}</em></li>
-{% endfor %}
-</ul>
+<div class='alert alert-block alert-warning'>
+    {% blocktrans with n=category.children.all|length %}This category contains {{ n }} child categories{% endblocktrans %}.<br>
+    {% if category.parent %}
+    {% blocktrans with category=category.parent.name %}If this category is deleted, these child categories will be moved to {{ category }}{% endblocktrans %}.
+    {% else %}
+    {% trans "If this category is deleted, these child categories will be moved to the top level part category" %}.
+    {% endif %}
+</div>
 {% endif %}
 
 {% if category.parts.all|length > 0 %}
-<p>{% blocktrans with count=category.parts.all|length %}This category contains {{count}} parts{% endblocktrans %}.<br>
+<div class='alert alert-block alert-warning'>
+    {% blocktrans with n=category.parts.all|length %}This category contains {{ n }} parts{% endblocktrans %}.<br>
     {% if category.parent %}
-    {% blocktrans with path=category.parent.pathstring %}If this category is deleted, these parts will be moved to the parent category {{path}}{% endblocktrans %}
+    {% blocktrans with category=category.parent.name %}If this category is deleted, these parts will be moved to {{ category }}{% endblocktrans %}.
     {% else %}
-    {% trans 'If this category is deleted, these parts will be moved to the top-level category Teile' %}
+    {% trans "If this category is deleted, these parts will be moved to the top level part category" %}.
     {% endif %}
-</p>
-<ul class='list-group'>
-{% for part in category.parts.all %}
-    <li class='list-group-item'><strong>{{ part.full_name }}</strong> - <em>{{ part.description }}</em></li>
-{% endfor %}
-</ul>
+</div>
 {% endif %}
 
 {% endblock %}
\ No newline at end of file