diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css index 7267d385b7..7c6afebf33 100644 --- a/InvenTree/InvenTree/static/css/inventree.css +++ b/InvenTree/InvenTree/static/css/inventree.css @@ -511,14 +511,8 @@ .table-price-three tr td:last-child { width: 30%; } -/* !pricing table widths */ -.btn-glyph { - padding-left: 6px; - padding-right: 6px; - padding-top: 3px; - padding-bottom: 2px; -} +/* !pricing table widths */ .action-button { font-size: 125%; diff --git a/InvenTree/build/templates/build/build_base.html b/InvenTree/build/templates/build/build_base.html index 845481ece1..0b6fa5f587 100644 --- a/InvenTree/build/templates/build/build_base.html +++ b/InvenTree/build/templates/build/build_base.html @@ -14,59 +14,56 @@
  • {{ build }}
    • {% endblock %} -{% block details_left %} -
    -
    - -
    -
    -

    - {% trans "Build Order" %} {{ build }} - {% if user.is_staff and roles.build.change %} - - {% endif %} -

    -
    - -
    - - -
    - - {% if roles.build.change %} -
    - - -
    - {% if build.active %} - - {% endif %} - {% endif %} -
    -
    -
    +{% block thumbnail %} + +{% endblock %} +{% block details %} +

    + {% trans "Build Order" %} {{ build }} + {% if user.is_staff and roles.build.change %} + + {% endif %} +

    +

    {{ build.title }}

    +
    + +
    + + +
    + + {% if roles.build.change %} +
    + + +
    + {% if build.active %} + + {% endif %} + {% endif %} +
    {% endblock %} {% block details_right %} diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html index 11d99c8f61..708fd97290 100644 --- a/InvenTree/company/templates/company/company_base.html +++ b/InvenTree/company/templates/company/company_base.html @@ -20,10 +20,10 @@ {% endif %}/>
    - + {% settings_value "INVENTREE_DOWNLOAD_FROM_URL" as allow_download %} {% if allow_download %} - + {% endif %}
    diff --git a/InvenTree/company/templates/company/manufacturer_part.html b/InvenTree/company/templates/company/manufacturer_part.html index 6c8421352c..43c1cebefe 100644 --- a/InvenTree/company/templates/company/manufacturer_part.html +++ b/InvenTree/company/templates/company/manufacturer_part.html @@ -1,4 +1,4 @@ -{% extends "two_column.html" %} +{% extends "page_base.html" %} {% load static %} {% load i18n %} @@ -10,6 +10,14 @@ InvenTree | {% trans "Manufacturer Part" %} {% include "company/manufacturer_part_navbar.html" %} {% endblock %} +{% block breadcrumbs %} +
  • {% trans "Manufacturers" %}
    • +{% if part.manufacturer %} +
  • {{ part.manufacturer.name }}
    • +{% endif %} +
  • {{ part.MPN }}
    • +{% endblock %} + {% block thumbnail %} {% endblock %} -{% block page_data %} -

    {% trans "Manufacturer Part" %}

    -
    +{% block details %}

    - {{ part.part.full_name }} + {% trans "Manufacturer Part" %}: {{ part.part.full_name }} {% if user.is_staff and perms.company.change_company %} {% endif %}

    -

    {{ part.manufacturer.name }} - {{ part.MPN }}

    {% if roles.purchase_order.change %} -
    -
    - {% comment "for later" %} - {% if roles.purchase_order.add %} - - {% endif %} - {% endcomment %} - - {% if roles.purchase_order.delete %} - - {% endif %} -
    +
    + {% comment "for later" %} + {% if roles.purchase_order.add %} + + {% endif %} + {% endcomment %} + + {% if roles.purchase_order.delete %} + + {% endif %}
    {% endif %} {% endblock %} -{% block page_details %} +{% block details_right %} -

    {% trans "Manufacturer Part Details" %}

    diff --git a/InvenTree/company/templates/company/supplier_part.html b/InvenTree/company/templates/company/supplier_part.html index 472fa62c91..e32bef4e8f 100644 --- a/InvenTree/company/templates/company/supplier_part.html +++ b/InvenTree/company/templates/company/supplier_part.html @@ -37,15 +37,15 @@ src="{% static 'img/blank_image.png' %}"
    {% if roles.purchase_order.add %} - {% endif %} - {% if roles.purchase_order.delete %} - {% endif %} diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html index 3075598b29..d55b2511b2 100644 --- a/InvenTree/part/templates/part/detail.html +++ b/InvenTree/part/templates/part/detail.html @@ -211,7 +211,7 @@ {{ part }}
    {% if roles.part.change %} - + {% endif %}
    diff --git a/InvenTree/part/templates/part/part_thumb.html b/InvenTree/part/templates/part/part_thumb.html index dd192843dc..ff5ef3e0de 100644 --- a/InvenTree/part/templates/part/part_thumb.html +++ b/InvenTree/part/templates/part/part_thumb.html @@ -17,10 +17,10 @@ {% if roles.part.change %}
    - - + + {% if allow_download %} - + {% endif %}
    diff --git a/InvenTree/templates/InvenTree/settings/setting.html b/InvenTree/templates/InvenTree/settings/setting.html index 77d86d86e8..6b62c4c92c 100644 --- a/InvenTree/templates/InvenTree/settings/setting.html +++ b/InvenTree/templates/InvenTree/settings/setting.html @@ -38,7 +38,7 @@
    -
    diff --git a/InvenTree/templates/InvenTree/settings/settings.html b/InvenTree/templates/InvenTree/settings/settings.html index 590e40f392..9d6f85d163 100644 --- a/InvenTree/templates/InvenTree/settings/settings.html +++ b/InvenTree/templates/InvenTree/settings/settings.html @@ -174,8 +174,8 @@ $('#cat-param-table').inventreeTable({ title: '{% trans "Default Value" %}', sortable: 'true', formatter: function(value, row, index, field) { - var bEdit = ""; - var bDel = ""; + var bEdit = ""; + var bDel = ""; var html = value html += "
    " + bEdit + bDel + "
    "; @@ -273,8 +273,8 @@ $("#param-table").inventreeTable({ }, { formatter: function(value, row, index, field) { - var bEdit = ""; - var bDel = ""; + var bEdit = ""; + var bDel = ""; var html = "
    " + bEdit + bDel + "
    "; diff --git a/InvenTree/templates/js/translated/helpers.js b/InvenTree/templates/js/translated/helpers.js index 1bc15ea402..9e1898eee8 100644 --- a/InvenTree/templates/js/translated/helpers.js +++ b/InvenTree/templates/js/translated/helpers.js @@ -103,7 +103,7 @@ function makeIconBadge(icon, title) { */ function makeIconButton(icon, cls, pk, title, options={}) { - var classes = `btn btn-default btn-glyph ${cls}`; + var classes = `btn btn-default ${cls}`; var id = `${cls}-${pk}`; diff --git a/InvenTree/templates/js/translated/stock.js b/InvenTree/templates/js/translated/stock.js index 67c50bffef..f021d1dc1f 100644 --- a/InvenTree/templates/js/translated/stock.js +++ b/InvenTree/templates/js/translated/stock.js @@ -1684,8 +1684,8 @@ function loadStockTrackingTable(table, options) { formatter: function(value, row, index, field) { // Manually created entries can be edited or deleted if (false && !row.system) { - var bEdit = ""; - var bDel = ""; + var bEdit = ""; + var bDel = ""; return "
    " + bEdit + bDel + "
    "; } else { diff --git a/InvenTree/templates/page_base.html b/InvenTree/templates/page_base.html index de28935295..6104946589 100644 --- a/InvenTree/templates/page_base.html +++ b/InvenTree/templates/page_base.html @@ -11,7 +11,16 @@
    {% block details_left %} - block details_left +
    +
    + {% block thumbnail %} + {% endblock %} +
    +
    + {% block details %} + {% endblock %} +
    +
    {% endblock %}