From b9b17f39d9754eedf02a0795b11ac5f91389367e Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 9 May 2019 18:11:13 +1000 Subject: [PATCH 1/5] Override page title for Stock app --- InvenTree/stock/templates/stock/stock_app_base.html | 10 ++++++++++ InvenTree/templates/base.html | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/InvenTree/stock/templates/stock/stock_app_base.html b/InvenTree/stock/templates/stock/stock_app_base.html index 6071499863..e651efb813 100644 --- a/InvenTree/stock/templates/stock/stock_app_base.html +++ b/InvenTree/stock/templates/stock/stock_app_base.html @@ -1,6 +1,16 @@ {% extends "base.html" %} {% load static %} +{% block page_title %} +{% if item %} +InvenTree Stock Item - {{ item }} +{% elif location %} +InvenTree Stock Location - {{ location }} +{% else %} +InvenTree Stock +{% endif %} +{% endblock %} + {% block sidenav %}
{% endblock %} diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html index 90925cfe7e..953dbb1272 100644 --- a/InvenTree/templates/base.html +++ b/InvenTree/templates/base.html @@ -40,7 +40,7 @@ {% endblock %} -{% block title %} +{% block page_title %} InvenTree {% endblock %} From a067d9f4cde0ad185d4b9d40ec8f1fe427412b85 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 9 May 2019 18:13:54 +1000 Subject: [PATCH 2/5] Add page title for Part app --- InvenTree/part/templates/part/part_app_base.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/InvenTree/part/templates/part/part_app_base.html b/InvenTree/part/templates/part/part_app_base.html index 8c034dfa6e..7fed480d59 100644 --- a/InvenTree/part/templates/part/part_app_base.html +++ b/InvenTree/part/templates/part/part_app_base.html @@ -2,6 +2,16 @@ {% load static %} +{% block page_title %} +{% if part %} +InvenTree Part - {{ part.name }} +{% elif category %} +InvenTree Part Category - {{ category }} +{% else %} +InvenTree Part List +{% endif %} +{% endblock %} + {% block sidenav %}
{% endblock %} From ca6bd0a999c61118a0cef5c06a448db9c3723dc5 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 9 May 2019 18:17:28 +1000 Subject: [PATCH 3/5] Add page title for company page --- InvenTree/company/templates/company/company_base.html | 4 ++++ InvenTree/company/templates/company/index.html | 4 ++++ InvenTree/company/templates/company/partdetail.html | 5 +++++ InvenTree/part/templates/part/part_app_base.html | 6 +++--- InvenTree/stock/templates/stock/stock_app_base.html | 6 +++--- 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/InvenTree/company/templates/company/company_base.html b/InvenTree/company/templates/company/company_base.html index 9944185e9e..56983784ee 100644 --- a/InvenTree/company/templates/company/company_base.html +++ b/InvenTree/company/templates/company/company_base.html @@ -2,6 +2,10 @@ {% load static %} +{% block page_title %} +InvenTree | Company - {{ company.name }} +{% endblock %} + {% block content %}
diff --git a/InvenTree/company/templates/company/index.html b/InvenTree/company/templates/company/index.html index 6b2dad3c81..3f0dc7c489 100644 --- a/InvenTree/company/templates/company/index.html +++ b/InvenTree/company/templates/company/index.html @@ -2,6 +2,10 @@ {% load static %} +{% block page_title %} +InvenTree | Company List +{% endblock %} + {% block content %}
diff --git a/InvenTree/company/templates/company/partdetail.html b/InvenTree/company/templates/company/partdetail.html index a67e0fbf2d..736b73256d 100644 --- a/InvenTree/company/templates/company/partdetail.html +++ b/InvenTree/company/templates/company/partdetail.html @@ -1,5 +1,10 @@ {% extends "base.html" %} {% load static %} + +{% block page_title %} +InvenTree | {{ company.name }} - Parts +{% endblock %} + {% block content %}
diff --git a/InvenTree/part/templates/part/part_app_base.html b/InvenTree/part/templates/part/part_app_base.html index 7fed480d59..43b12377f6 100644 --- a/InvenTree/part/templates/part/part_app_base.html +++ b/InvenTree/part/templates/part/part_app_base.html @@ -4,11 +4,11 @@ {% block page_title %} {% if part %} -InvenTree Part - {{ part.name }} +InvenTree | Part - {{ part.name }} {% elif category %} -InvenTree Part Category - {{ category }} +InvenTree | Part Category - {{ category }} {% else %} -InvenTree Part List +InvenTree | Part List {% endif %} {% endblock %} diff --git a/InvenTree/stock/templates/stock/stock_app_base.html b/InvenTree/stock/templates/stock/stock_app_base.html index e651efb813..26393626bb 100644 --- a/InvenTree/stock/templates/stock/stock_app_base.html +++ b/InvenTree/stock/templates/stock/stock_app_base.html @@ -3,11 +3,11 @@ {% block page_title %} {% if item %} -InvenTree Stock Item - {{ item }} +InvenTree | Stock Item - {{ item }} {% elif location %} -InvenTree Stock Location - {{ location }} +InvenTree | Stock Location - {{ location }} {% else %} -InvenTree Stock +InvenTree | Stock {% endif %} {% endblock %} From 40ca468b51a7ddacf96464b19dbf880c62c781ea Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 9 May 2019 18:27:16 +1000 Subject: [PATCH 4/5] Added title for 'Build' app --- InvenTree/build/templates/build/allocate.html | 4 ++++ InvenTree/build/templates/build/detail.html | 4 ++++ InvenTree/build/templates/build/index.html | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/InvenTree/build/templates/build/allocate.html b/InvenTree/build/templates/build/allocate.html index d6657ea196..1aa5338551 100644 --- a/InvenTree/build/templates/build/allocate.html +++ b/InvenTree/build/templates/build/allocate.html @@ -2,6 +2,10 @@ {% load static %} {% load inventree_extras %} +{% block page_title %} +InvenTree | Allocate Parts +{% endblock %} + {% block content %}

Allocate Parts for Build

diff --git a/InvenTree/build/templates/build/detail.html b/InvenTree/build/templates/build/detail.html index 9ca444f516..8beeb6ac08 100644 --- a/InvenTree/build/templates/build/detail.html +++ b/InvenTree/build/templates/build/detail.html @@ -1,6 +1,10 @@ {% extends "base.html" %} {% load static %} +{% block page_title %} +InvenTree | Build - {{ build }} +{% endblock %} + {% block content %}
diff --git a/InvenTree/build/templates/build/index.html b/InvenTree/build/templates/build/index.html index af24a6ca53..d52bcb4c4a 100644 --- a/InvenTree/build/templates/build/index.html +++ b/InvenTree/build/templates/build/index.html @@ -1,5 +1,10 @@ {% extends "base.html" %} {% load static %} + +{% block page_title %} +InvenTree | Build List +{% endblock %} + {% block content %} From 6724717346f2ffd06018dc1b764d8b3277952ec3 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Thu, 9 May 2019 18:28:19 +1000 Subject: [PATCH 5/5] Added title for Index and Search pages --- InvenTree/templates/InvenTree/index.html | 4 ++++ InvenTree/templates/InvenTree/search.html | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html index 89b412bdcc..a4c6b68ef4 100644 --- a/InvenTree/templates/InvenTree/index.html +++ b/InvenTree/templates/InvenTree/index.html @@ -1,5 +1,9 @@ {% extends "base.html" %} +{% block page_title %} +InvenTree | Index +{% endblock %} + {% block content %}

InvenTree


diff --git a/InvenTree/templates/InvenTree/search.html b/InvenTree/templates/InvenTree/search.html index cd700facc8..187cc1addb 100644 --- a/InvenTree/templates/InvenTree/search.html +++ b/InvenTree/templates/InvenTree/search.html @@ -1,5 +1,9 @@ {% extends "base.html" %} +{% block page_title %} +InvenTree | Search Results +{% endblock %} + {% block content %}

Search Results