From 888fd4116cce064d524e0ac43aba946365295670 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 24 Feb 2021 21:12:41 +1100 Subject: [PATCH] SupplierPart display now uses menubar display style --- .../templates/company/part_navbar.html | 32 +++++++++++++++++++ .../templates/company/supplier_part_base.html | 4 +++ .../company/supplier_part_detail.html | 14 +++++--- .../company/supplier_part_orders.html | 15 +++++---- .../company/supplier_part_pricing.html | 14 ++++---- .../company/supplier_part_stock.html | 15 +++++---- .../templates/company/supplier_part_tabs.html | 13 -------- 7 files changed, 69 insertions(+), 38 deletions(-) create mode 100644 InvenTree/company/templates/company/part_navbar.html delete mode 100644 InvenTree/company/templates/company/supplier_part_tabs.html diff --git a/InvenTree/company/templates/company/part_navbar.html b/InvenTree/company/templates/company/part_navbar.html new file mode 100644 index 0000000000..f1a3eb7bdf --- /dev/null +++ b/InvenTree/company/templates/company/part_navbar.html @@ -0,0 +1,32 @@ +{% load i18n %} + + \ No newline at end of file diff --git a/InvenTree/company/templates/company/supplier_part_base.html b/InvenTree/company/templates/company/supplier_part_base.html index b03a8944e8..f1bc3c1eb1 100644 --- a/InvenTree/company/templates/company/supplier_part_base.html +++ b/InvenTree/company/templates/company/supplier_part_base.html @@ -120,6 +120,10 @@ src="{% static 'img/blank_image.png' %}" {% block js_ready %} {{ block.super }} +enableRightNavbar({ + minWidth: '50px' +}); + $('#order-part, #order-part2').click(function() { launchModalForm( "{% url 'order-parts' %}", diff --git a/InvenTree/company/templates/company/supplier_part_detail.html b/InvenTree/company/templates/company/supplier_part_detail.html index 819b4964ba..d3b94f0ad5 100644 --- a/InvenTree/company/templates/company/supplier_part_detail.html +++ b/InvenTree/company/templates/company/supplier_part_detail.html @@ -2,13 +2,17 @@ {% load static %} {% load i18n %} +{% block menubar %} +{% include "company/part_navbar.html" with tab='details' %} +{% endblock %} + +{% block heading %} +{% trans "Supplier Part Details" %} +{% endblock %} + + {% block details %} -{% include "company/supplier_part_tabs.html" with tab='details' %} - -
- -

{% trans "Supplier Part Details" %}

diff --git a/InvenTree/company/templates/company/supplier_part_orders.html b/InvenTree/company/templates/company/supplier_part_orders.html index 88bc061bee..ae4b025b11 100644 --- a/InvenTree/company/templates/company/supplier_part_orders.html +++ b/InvenTree/company/templates/company/supplier_part_orders.html @@ -2,14 +2,15 @@ {% load static %} {% load i18n %} +{% block menubar %} +{% include "company/part_navbar.html" with tab='orders' %} +{% endblock %} + +{% block heading %} +{% trans "Supplier Part Orders" %} +{% endblock %} + {% block details %} - -{% include "company/supplier_part_tabs.html" with tab='orders' %} - -

{% trans "Supplier Part Orders" %}

- -
- {% if roles.purchase_order.add %}
diff --git a/InvenTree/company/templates/company/supplier_part_pricing.html b/InvenTree/company/templates/company/supplier_part_pricing.html index e665339968..2314b5cfcf 100644 --- a/InvenTree/company/templates/company/supplier_part_pricing.html +++ b/InvenTree/company/templates/company/supplier_part_pricing.html @@ -3,14 +3,16 @@ {% load i18n %} {% load inventree_extras %} +{% block menubar %} +{% include "company/part_navbar.html" with tab='pricing' %} +{% endblock %} + +{% block heading %} +{% trans "Pricing Information" %} +{% endblock %} + {% block details %} -{% include "company/supplier_part_tabs.html" with tab='pricing' %} - -

{% trans "Pricing Information" %}

- -
- {% if roles.purchase_order.add %}
{% trans "Internal Part" %}