Replace mklint with djlint (#4746)

* remove markuplint

* remove dedicated html step - will be done by pre-commit

* add djlint for django template linting

* Fix T003: Endblock should have name

* Fix H013: Img tag should have an alt attribute

* Fix H014: Found extra blank lines

* Fix T003: Endblock should have name

* Fix H013: Img tag should have an alt attribute

* small fixes

* Fix T001: Variables should be wrapped in a single whitespace

* Fix T003: Endblock should have name

* small fixes

* fix form method

* add entry to contributing

* fix template changes

* another fix

* use current version

InvenTree/order/templates/order/order_base.html

@@ -108,7 +108,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Order Reference" %}</td>
-        <td>{{ order.reference }}{% include "clip.html"%}</td>
+        <td>{{ order.reference }}{% include "clip.html" %}</td>
     </tr>
     <tr>
         <td><span class='fas fa-info-circle'></span></td>
@@ -140,7 +140,7 @@ src="{% static 'img/blank_image.png' %}"
         <td>{% trans "Supplier" %}</td>
         <td>
             {% if order.supplier %}
-            <a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier.name }}</a>{% include "clip.html"%}
+            <a href="{% url 'company-detail' order.supplier.id %}">{{ order.supplier.name }}</a>{% include "clip.html" %}
             {% else %}
             <em>{% trans "No suppplier information available" %}</em>
             {% endif %}
@@ -150,7 +150,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Supplier Reference" %}</td>
-        <td>{{ order.supplier_reference }}{% include "clip.html"%}</td>
+        <td>{{ order.supplier_reference }}{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     <tr>
@@ -329,7 +329,7 @@ $("#export-order").click(function() {
 $('#show-qr-code').click(function() {
     showQRDialog(
         '{% trans "Purchase Order QR Code" %}',
-        '{"purchaseorder": {{ order.pk }}}'
+        '{"purchaseorder": {{ order.pk }} }'
     );
 });
 

InvenTree/order/templates/order/order_wizard/match_fields.html

@@ -96,4 +96,4 @@ $('.fieldselect').select2({
     matcher: partialMatcher,
 });
 
-{% endblock %}
+{% endblock js_ready %}

InvenTree/order/templates/order/order_wizard/match_parts.html

@@ -44,7 +44,7 @@
             </tr>
         </thead>
         <tbody>
-             <tr></tr> {% comment %} Dummy row for javascript del_row method {% endcomment %}
+             <tr>{% comment %} Dummy row for javascript del_row method {% endcomment %}</tr>
             {% for row in rows %}
             <tr {% if row.errors %} style='background: #ffeaea;'{% endif %} part-select='#select_part_{{ row.index }}'>
                 <td>
@@ -123,4 +123,4 @@ $('.currencyselect').select2({
     dropdownAutoWidth: true,
 });
 
-{% endblock %}
+{% endblock js_ready %}

InvenTree/order/templates/order/order_wizard/po_upload.html

@@ -7,7 +7,7 @@
 {% url "po-detail" order.id as url %}
 {% trans "Return to Orders" as text %}
 {% include "sidebar_item.html" with url=url text=text icon="fa-undo" %}
-{% endblock %}
+{% endblock sidebar %}
 
 {% block page_content %}
     {% trans "Upload File for Purchase Order" as header_text %}
@@ -60,9 +60,9 @@
             </div>
         </div>
     {% endwith %}
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
 
-{% endblock %}
+{% endblock js_ready %}

InvenTree/order/templates/order/purchase_order_detail.html

@@ -5,7 +5,6 @@
 {% load i18n %}
 {% load static %}
 
-
 {% block sidebar %}
 {% include 'order/po_sidebar.html' %}
 {% endblock sidebar %}
@@ -264,4 +263,4 @@ loadOrderTotal(
 
 enableSidebar('purchaseorder');
 
-{% endblock %}
+{% endblock js_ready %}

InvenTree/order/templates/order/purchase_orders.html

@@ -6,11 +6,11 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Purchase Orders" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block heading %}
 {% trans "Purchase Orders" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if roles.purchase_order.add %}
@@ -18,7 +18,7 @@
     <span class='fas fa-plus-circle'></span> {% trans "New Purchase Order" %}
 </button>
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block page_info %}
 
@@ -38,12 +38,12 @@
 
 </div>
 
-{% endblock %}
+{% endblock page_info %}
 
 {% block js_load %}
 {{ block.super }}
 
-{% endblock %}
+{% endblock js_load %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -56,4 +56,4 @@ loadPurchaseOrderTable("#purchase-order-table", {
     url: "{% url 'api-po-list' %}",
 });
 
-{% endblock %}
+{% endblock js_ready %}

InvenTree/order/templates/order/return_order_base.html

@@ -22,7 +22,7 @@ src="{{ order.customer.image.url }}"
 src="{% static 'img/blank_image.png' %}"
 {% endif %}
 />
-{% endblock thumbnail%}
+{% endblock thumbnail %}
 
 {% block heading %}
 {% trans "Return Order" %} {{ order.reference }}
@@ -100,7 +100,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Order Reference" %}</td>
-        <td>{{ order.reference }}{% include "clip.html"%}</td>
+        <td>{{ order.reference }}{% include "clip.html" %}</td>
     </tr>
     <tr>
         <td><span class='fas fa-info-circle'></span></td>
@@ -130,14 +130,14 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-building'></span></td>
         <td>{% trans "Customer" %}</td>
-        <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html"%}</td>
+        <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     {% if order.customer_reference %}
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Customer Reference" %}</td>
-        <td>{{ order.customer_reference }}{% include "clip.html"%}</td>
+        <td>{{ order.customer_reference }}{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     {% if order.link %}
@@ -255,7 +255,7 @@ $('#print-order-report').click(function() {
 $('#show-qr-code').click(function() {
     showQRDialog(
         '{% trans "Return Order QR Code" %}',
-        '{"returnorder": {{ order.pk }}}'
+        '{"returnorder": {{ order.pk }} }'
     );
 });
 

InvenTree/order/templates/order/return_order_detail.html

@@ -6,7 +6,7 @@
 {% load static %}
 
 {% block sidebar %}
-{% include "order/return_order_sidebar.html"  %}
+{% include "order/return_order_sidebar.html" %}
 {% endblock sidebar %}
 
 {% block page_content %}

InvenTree/order/templates/order/return_orders.html

@@ -6,15 +6,14 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Return Orders" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumb_list %}
-{% endblock %}
+{% endblock breadcrumb_list %}
 
 {% block heading %}
 {% trans "Return Orders" %}
-{% endblock %}
-
+{% endblock heading %}
 
 {% block actions %}
 {% if roles.return_order.add %}

InvenTree/order/templates/order/sales_order_base.html

@@ -7,12 +7,12 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Sales Order" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumbs %}
 <li class='breadcrumb-item'><a href='{% url "sales-order-index" %}'>{% trans "Sales Orders" %}</a></li>
 <li class="breadcrumb-item active" aria-current="page"><a href='{% url "so-detail" order.id %}'>{{ order }}</a></li>
-{% endblock %}
+{% endblock breadcrumbs %}
 
 {% block thumbnail %}
 <img class='part-thumb'
@@ -22,11 +22,11 @@ src="{{ order.customer.image.url }}"
 src="{% static 'img/blank_image.png' %}"
 {% endif %}
 />
-{% endblock %}
+{% endblock thumbnail %}
 
 {% block heading %}
 {% trans "Sales Order" %} {{ order.reference }}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if user.is_staff and roles.sales_order.change %}
@@ -105,7 +105,7 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Order Reference" %}</td>
-        <td>{{ order.reference }}{% include "clip.html"%}</td>
+        <td>{{ order.reference }}{% include "clip.html" %}</td>
     </tr>
     <tr>
         <td><span class='fas fa-info-circle'></span></td>
@@ -134,7 +134,7 @@ src="{% static 'img/blank_image.png' %}"
     {% endif %}
 </div>
 
-{% endblock %}
+{% endblock details %}
 
 {% block details_right %}
 <table class='table table-striped table-condensed'>
@@ -143,14 +143,14 @@ src="{% static 'img/blank_image.png' %}"
     <tr>
         <td><span class='fas fa-building'></span></td>
         <td>{% trans "Customer" %}</td>
-        <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html"%}</td>
+        <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     {% if order.customer_reference %}
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
         <td>{% trans "Customer Reference" %}</td>
-        <td>{{ order.customer_reference }}{% include "clip.html"%}</td>
+        <td>{{ order.customer_reference }}{% include "clip.html" %}</td>
     </tr>
     {% endif %}
     <tr>
@@ -238,7 +238,7 @@ src="{% static 'img/blank_image.png' %}"
         </td>
     </tr>
 </table>
-{% endblock %}
+{% endblock details_right %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -304,7 +304,7 @@ $('#print-order-report').click(function() {
 $('#show-qr-code').click(function() {
     showQRDialog(
         '{% trans "Sales Order QR Code" %}',
-        '{"salesorder": {{ order.pk }}}'
+        '{"salesorder": {{ order.pk }} }'
     );
 });
 
@@ -332,4 +332,4 @@ $('#export-order').click(function() {
     exportOrder('{% url "so-export" order.id %}');
 });
 
-{% endblock %}
+{% endblock js_ready %}

InvenTree/order/templates/order/sales_order_detail.html

@@ -6,8 +6,8 @@
 {% load static %}
 
 {% block sidebar %}
-{% include "order/so_sidebar.html"  %}
-{% endblock %}
+{% include "order/so_sidebar.html" %}
+{% endblock sidebar %}
 
 {% block page_content %}
 {% settings_value "SALESORDER_EDIT_COMPLETED_ORDERS" as allow_extra_editing %}
@@ -158,7 +158,7 @@
     </div>
 </div>
 
-{% endblock %}
+{% endblock page_content %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -297,7 +297,6 @@
         });
     });
 
-
     loadOrderTotal(
         '#soTotalPrice',
         {
@@ -307,4 +306,4 @@
 
     enableSidebar('salesorder');
 
-{% endblock %}
+{% endblock js_ready %}

InvenTree/order/templates/order/sales_orders.html

@@ -6,14 +6,14 @@
 
 {% block page_title %}
 {% inventree_title %} | {% trans "Sales Orders" %}
-{% endblock %}
+{% endblock page_title %}
 
 {% block breadcrumb_list %}
-{% endblock %}
+{% endblock breadcrumb_list %}
 
 {% block heading %}
 {% trans "Sales Orders" %}
-{% endblock %}
+{% endblock heading %}
 
 {% block actions %}
 {% if roles.sales_order.add %}
@@ -21,7 +21,7 @@
     <span class='fas fa-plus-circle'></span> {% trans "New Sales Order" %}
 </button>
 {% endif %}
-{% endblock %}
+{% endblock actions %}
 
 {% block page_info %}
 
@@ -40,7 +40,7 @@
     <div id='sales-order-calendar'></div>
 </div>
 
-{% endblock %}
+{% endblock page_info %}
 
 {% block js_ready %}
 {{ block.super }}
@@ -53,4 +53,4 @@ $("#so-create").click(function() {
     createSalesOrder();
 });
 
-{% endblock %}
+{% endblock js_ready %}