2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-17 04:25:42 +00:00

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
This commit is contained in:
Matthias Mair
2023-05-02 12:03:52 +02:00
committed by GitHub
parent 09fabff551
commit 10c3d101e8
145 changed files with 510 additions and 2589 deletions

View File

@ -7,7 +7,7 @@
{% block page_title %}
{% inventree_title %} | {% trans "Build Order" %} - {{ build }}
{% endblock %}
{% endblock page_title %}
{% block breadcrumbs %}
<li class='breadcrumb-item'><a href='{% url "build-index" %}'>{% trans "Build Orders" %}</a></li>
@ -25,7 +25,7 @@ src="{% static 'img/blank_image.png' %}"
{% block heading %}
{% trans "Build Order" %} {{ build }}
{% endblock %}
{% endblock heading %}
{% block actions %}
<!-- Admin Display -->
@ -147,7 +147,7 @@ src="{% static 'img/blank_image.png' %}"
{% endif %}
{% endif %}
</div>
{% endblock %}
{% endblock details %}
{% block details_right %}
<table class='table table-striped table-condensed'>
@ -219,7 +219,7 @@ src="{% static 'img/blank_image.png' %}"
</tr>
{% endif %}
</table>
{% endblock %}
{% endblock details_right %}
{% block page_data %}
<h3>
@ -231,8 +231,7 @@ src="{% static 'img/blank_image.png' %}"
<hr>
<p>{{ build.title }}</p>
{% endblock %}
{% endblock page_data %}
{% block js_ready %}
@ -288,7 +287,7 @@ src="{% static 'img/blank_image.png' %}"
$('#show-qr-code').click(function() {
showQRDialog(
'{% trans "Build Order QR Code" %}',
'{"build": {{ build.pk }}}'
'{"build": {{ build.pk }} }'
);
});
@ -312,4 +311,4 @@ src="{% static 'img/blank_image.png' %}"
{% endif %}
{% endif %}
{% endblock %}
{% endblock js_ready %}

View File

@ -6,7 +6,7 @@
{% block sidebar %}
{% include "build/sidebar.html" %}
{% endblock %}
{% endblock sidebar %}
{% block page_content %}
@ -22,12 +22,12 @@
<tr>
<td><span class='fas fa-info'></span></td>
<td>{% trans "Description" %}</td>
<td>{{ build.title }}{% include "clip.html"%}</td>
<td>{{ build.title }}{% include "clip.html" %}</td>
</tr>
<tr>
<td><span class='fas fa-shapes'></span></td>
<td>{% trans "Part" %}</td>
<td><a href="{% url 'part-detail' build.part.id %}?display=build-orders">{{ build.part.full_name }}</a>{% include "clip.html"%}</td>
<td><a href="{% url 'part-detail' build.part.id %}?display=build-orders">{{ build.part.full_name }}</a>{% include "clip.html" %}</td>
</tr>
<tr>
<td></td>
@ -38,7 +38,7 @@
<td>{% trans "Stock Source" %}</td>
<td>
{% if build.take_from %}
<a href="{% url 'stock-location-detail' build.take_from.id %}">{{ build.take_from }}</a>{% include "clip.html"%}
<a href="{% url 'stock-location-detail' build.take_from.id %}">{{ build.take_from }}</a>{% include "clip.html" %}
{% else %}
<em>{% trans "Stock can be taken from any available location." %}</em>
{% endif %}
@ -51,7 +51,7 @@
{% if build.destination %}
<a href="{% url 'stock-location-detail' build.destination.id %}">
{{ build.destination }}
</a>{% include "clip.html"%}
</a>{% include "clip.html" %}
{% else %}
<em>{% trans "Destination location not specified" %}</em>
{% endif %}
@ -78,14 +78,14 @@
<tr>
<td><span class='fas fa-layer-group'></span></td>
<td>{% trans "Batch" %}</td>
<td>{{ build.batch }}{% include "clip.html"%}</td>
<td>{{ build.batch }}{% include "clip.html" %}</td>
</tr>
{% endif %}
{% if build.parent %}
<tr>
<td><span class='fas fa-sitemap'></span></td>
<td>{% trans "Parent Build" %}</td>
<td><a href="{% url 'build-detail' build.parent.id %}">{{ build.parent }}</a>{% include "clip.html"%}</td>
<td><a href="{% url 'build-detail' build.parent.id %}">{{ build.parent }}</a>{% include "clip.html" %}</td>
</tr>
{% endif %}
{% if build.priority != 0 %}
@ -99,7 +99,7 @@
<tr>
<td><span class='fas fa-dolly'></span></td>
<td>{% trans "Sales Order" %}</td>
<td><a href="{% url 'so-detail' build.sales_order.id %}">{{ build.sales_order }}</a>{% include "clip.html"%}</td>
<td><a href="{% url 'so-detail' build.sales_order.id %}">{{ build.sales_order }}</a>{% include "clip.html" %}</td>
</tr>
{% endif %}
{% if build.link %}
@ -319,8 +319,7 @@
</div>
</div>
{% endblock %}
{% endblock page_content %}
{% block js_ready %}
{{ block.super }}
@ -519,4 +518,4 @@ $('#allocate-selected-items').click(function() {
enableSidebar('buildorder');
{% endblock %}
{% endblock js_ready %}

View File

@ -6,11 +6,11 @@
{% block page_title %}
{% inventree_title %} | {% trans "Build Orders" %}
{% endblock %}
{% endblock page_title %}
{% block heading %}
{% trans "Build Orders" %}
{% endblock %}
{% endblock heading %}
{% block actions %}
{% if roles.build.add %}
@ -18,7 +18,7 @@
<span class='fas fa-tools'></span> {% trans "New Build Order" %}
</button>
{% endif %}
{% endblock %}
{% endblock actions %}
{% block page_info %}
@ -35,7 +35,7 @@
</table>
</div>
{% endblock %}
{% endblock page_info %}
{% block js_ready %}
{{ block.super }}
@ -48,4 +48,4 @@ loadBuildTable($("#build-table"), {
locale: '{{ request.LANGUAGE_CODE }}',
});
{% endblock %}
{% endblock js_ready %}