diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html index 4cf6f5e824..ce78e445e1 100644 --- a/InvenTree/part/templates/part/detail.html +++ b/InvenTree/part/templates/part/detail.html @@ -11,113 +11,6 @@ {% block page_content %} -
-
-

{% trans "Part Details" %}

-
-
- - - - - - - - - - - - - - - {% if part.category %} - - - - - - {% endif %} - {% if part.IPN %} - - - - - - {% endif %} - {% if part.revision %} - - - - - - {% endif %} - {% if part.units %} - - - - - - {% endif %} - {% if part.minimum_stock %} - - - - - - {% endif %} - {% if part.keywords %} - - - - - - {% endif %} - {% if part.link %} - - - - - - {% endif %} - - - - - - {% if part.trackable and part.getLatestSerialNumber %} - - - - - - {% endif %} - {% if part.default_location %} - - - - - - {% endif %} - {% if part.default_supplier %} - - - - - - {% endif %} -
{% trans "Name" %}{{ part.name }}{% include "clip.html"%}
{% trans "Description" %}{{ part.description }}{% include "clip.html"%}
{% trans "Category" %} - {{ part.category.name }} -
{% trans "IPN" %}{{ part.IPN }}{% include "clip.html"%}
{% trans "Revision" %}{{ part.revision }}{% include "clip.html"%}
{% trans "Units" %}{{ part.units }}
{% trans "Minimum stock level" %}{{ part.minimum_stock }}
{% trans "Keywords" %}{{ part.keywords }}{% include "clip.html"%}
{% trans "External Link" %}{{ part.link }}{% include "clip.html"%}
{% trans "Creation Date" %} - {{ part.creation_date }} - {% if part.creation_user %} - {{ part.creation_user }} - {% endif %} -
{% trans "Latest Serial Number" %}{{ part.getLatestSerialNumber }}{% include "clip.html"%}
{% trans "Default Location" %} - {{ part.default_location }} -
{% trans "Default Supplier" %}{{ part.default_supplier }}
-
-
-
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index 4ca7c80d65..4e85853e69 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -99,54 +99,74 @@ {% block details %} - -

-
- {% if part.is_template %} -   - - {% endif %} - {% if part.assembly %} -   - - {% endif %} - {% if part.component %} -   - - {% endif %} - {% if part.trackable %} -   - - {% endif %} - {% if part.purchaseable %} -   - - {% endif %} - {% if part.salable %} -   - - {% endif %} - - {% if not part.active %} -   -
- - {% trans 'Inactive' %} +
+
+ {% if part.is_template %} +   + + {% endif %} + {% if part.assembly %} +   + + {% endif %} + {% if part.component %} +   + + {% endif %} + {% if part.trackable %} +   + + {% endif %} + {% if part.purchaseable %} +   + + {% endif %} + {% if part.salable %} +   + + {% endif %} + + {% if not part.active %} +   +
+ + {% trans 'Inactive' %} +
+ {% endif %} + + {% if part.virtual and part.active %} +   +
+ + {% trans 'Virtual' %} +
+ {% endif %}
- {% endif %} - - {% if part.virtual and part.active %} -   -
- - {% trans 'Virtual' %} -
- {% endif %} + + {% include "spacer.html" %} +

+ + + + + + + + + + + + +
{% trans "Part Name" %}{{ part.full_name }}{% include "clip.html"%}
{% trans "Description" %}{{ part.description }}{% include "clip.html"%}
+
{% if part.variant_of %} @@ -157,7 +177,7 @@ {% endif %}
-{% endblock %} +{% endblock details %} {% block details_right %} @@ -231,7 +251,111 @@ {% endif %} {% endif %}
-{% endblock %} +{% endblock details_right %} + +{% block details_below %} + +
+
+
+ + + + {% if part.category %} + + + + + + {% endif %} + {% if part.IPN %} + + + + + + {% endif %} + {% if part.revision %} + + + + + + {% endif %} + {% if part.units %} + + + + + + {% endif %} + {% if part.minimum_stock %} + + + + + + {% endif %} + {% if part.keywords %} + + + + + + {% endif %} +
{% trans "Category" %} + {{ part.category.name }} +
{% trans "IPN" %}{{ part.IPN }}{% include "clip.html"%}
{% trans "Revision" %}{{ part.revision }}{% include "clip.html"%}
{% trans "Units" %}{{ part.units }}
{% trans "Minimum stock level" %}{{ part.minimum_stock }}
{% trans "Keywords" %}{{ part.keywords }}{% include "clip.html"%}
+
+
+ + + + + + + + {% if part.trackable and part.getLatestSerialNumber %} + + + + + + {% endif %} + {% if part.default_location %} + + + + + + {% endif %} + {% if part.default_supplier %} + + + + + + {% endif %} + {% if part.link %} + + + + + + {% endif %} +
{% trans "Creation Date" %} + {{ part.creation_date }} + {% if part.creation_user %} + {{ part.creation_user }} + {% endif %} +
{% trans "Latest Serial Number" %}{{ part.getLatestSerialNumber }}{% include "clip.html"%}
{% trans "Default Location" %} + {{ part.default_location }} +
{% trans "Default Supplier" %}{{ part.default_supplier }}
{% trans "External Link" %}{{ part.link }}{% include "clip.html"%}
+
+
+
+ +{% endblock details_below %} {% block js_ready %} {{ block.super }} diff --git a/InvenTree/part/templates/part/part_sidebar.html b/InvenTree/part/templates/part/part_sidebar.html index c590c51c37..f4e59af865 100644 --- a/InvenTree/part/templates/part/part_sidebar.html +++ b/InvenTree/part/templates/part/part_sidebar.html @@ -5,8 +5,6 @@ {% settings_value "PART_INTERNAL_PRICE" as show_internal_price %} {% settings_value 'PART_SHOW_RELATED' as show_related %} -{% trans "Details" as text %} -{% include "sidebar_item.html" with label="part-details" text=text icon="fa-shapes" %} {% trans "Parameters" as text %} {% include "sidebar_item.html" with label="part-parameters" text=text icon="fa-th-list" %} {% if part.is_template %} diff --git a/InvenTree/templates/page_base.html b/InvenTree/templates/page_base.html index 506120972a..4e805142d2 100644 --- a/InvenTree/templates/page_base.html +++ b/InvenTree/templates/page_base.html @@ -24,6 +24,8 @@ {% block page_info %}
+ {% block details_above %} + {% endblock details_above %}
@@ -31,23 +33,25 @@
{% block thumbnail %} - {% endblock %} + {% endblock thumbnail %}
{% block details %} - {% endblock %} + {% endblock details %}
- {% endblock %} + {% endblock details_left %}
{% block details_right %} block details_right - {% endblock %} + {% endblock details_right %}
+ {% block details_below %} + {% endblock details_below %}
{% endblock %}