From a31ec388f40f5607413121a5f9e71e006bd856df Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 14 Apr 2018 18:22:31 +1000 Subject: [PATCH] Added static files directory - Improved display of part image --- InvenTree/InvenTree/settings.py | 4 ++ InvenTree/part/static/css/part.css | 23 ---------- InvenTree/part/templates/base.html | 5 +- InvenTree/part/templates/part/cat_link.html | 2 +- InvenTree/part/templates/part/part_base.html | 6 ++- InvenTree/static/css/inventree.css | 43 ++++++++++++++++++ InvenTree/static/img/blank_image.png | Bin 0 -> 3592 bytes InvenTree/{part => }/static/img/inventree.png | Bin 8 files changed, 56 insertions(+), 27 deletions(-) delete mode 100644 InvenTree/part/static/css/part.css create mode 100644 InvenTree/static/css/inventree.css create mode 100644 InvenTree/static/img/blank_image.png rename InvenTree/{part => }/static/img/inventree.png (100%) diff --git a/InvenTree/InvenTree/settings.py b/InvenTree/InvenTree/settings.py index f348cdfe04..ccdca1389a 100644 --- a/InvenTree/InvenTree/settings.py +++ b/InvenTree/InvenTree/settings.py @@ -136,6 +136,10 @@ USE_TZ = True STATIC_URL = '/static/' +STATICFILES_DIRS = [ + os.path.join(BASE_DIR, 'static'), +] + MEDIA_URL = '/media/' MEDIA_ROOT = os.path.join(BASE_DIR, 'media') diff --git a/InvenTree/part/static/css/part.css b/InvenTree/part/static/css/part.css deleted file mode 100644 index 4a84b3c210..0000000000 --- a/InvenTree/part/static/css/part.css +++ /dev/null @@ -1,23 +0,0 @@ -body { - padding-left: 15px; -} - -table, th, td { - border: 1px solid black; - border-collapse: collapse; -} - -th, td { - padding: 10px; -} - -th { - text-align: left; -} - -table tr:nth-child(even) { - background-color: #eee; -} -table tr:nth-child(odd) { - background-color: #fff; -} \ No newline at end of file diff --git a/InvenTree/part/templates/base.html b/InvenTree/part/templates/base.html index 326a683758..5e60cc0659 100644 --- a/InvenTree/part/templates/base.html +++ b/InvenTree/part/templates/base.html @@ -10,7 +10,7 @@ - + {% block title %} @@ -20,11 +20,14 @@ InvenTree </head> <body> + {% include "navbar.html" %} +<div class="inventree-content"> {% block content %} <!-- Each view fills in here.. --> {% endblock %} +</div> </body> </html> \ No newline at end of file diff --git a/InvenTree/part/templates/part/cat_link.html b/InvenTree/part/templates/part/cat_link.html index 4ac0471217..96e560ca20 100644 --- a/InvenTree/part/templates/part/cat_link.html +++ b/InvenTree/part/templates/part/cat_link.html @@ -1,4 +1,4 @@ -<div class="container"> +<div class='navigation'> <a href="/part/list/">Parts</a> > {% if category %} {% for path_item in category.parentpath %} diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index 128c4e19f2..daccb26837 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -1,15 +1,17 @@ {% extends "base.html" %} +{% load static %} + {% block content %} {% include "part/cat_link.html" with category=part.category %} <div class="media"> - <img class="mr-3" + <img class="mr-3 part-thumb" {% if part.image %} src="{{ part.image.url }}" {% else %} - src="/media/part_images/missing.png" + src="{% static 'img/blank_image.png' %}" {% endif %}/> <div class="media-body"> <h5>{{ part.name }}</h5> diff --git a/InvenTree/static/css/inventree.css b/InvenTree/static/css/inventree.css new file mode 100644 index 0000000000..8976b0f10e --- /dev/null +++ b/InvenTree/static/css/inventree.css @@ -0,0 +1,43 @@ +table, th, td { + border: 1px solid black; + border-collapse: collapse; +} + +th, td { + padding: 10px; +} + +th { + text-align: left; +} + +table tr:nth-child(even) { + background-color: #eee; +} +table tr:nth-child(odd) { + background-color: #fff; +} + +.part-thumb { + width: 250px; + height: 250px; + border: 1px black solid; + margin: 5px; + padding: 5px; + object-fit: contain; +} + +.media-body { + padding-top: 10px; +} + +.navigation { + padding: 5px; + padding-left: 15px; + background-color: #EEE; +} + +.inventree-content { + padding-left: 15px; + padding-right: 15px; +} \ No newline at end of file diff --git a/InvenTree/static/img/blank_image.png b/InvenTree/static/img/blank_image.png new file mode 100644 index 0000000000000000000000000000000000000000..b2b4ba215d943a76fe3daf07aacb7e47e6354ed1 GIT binary patch literal 3592 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 S4gjqk$jZX*WSRMeJO2h)Fq3xx literal 0 HcmV?d00001 diff --git a/InvenTree/part/static/img/inventree.png b/InvenTree/static/img/inventree.png similarity index 100% rename from InvenTree/part/static/img/inventree.png rename to InvenTree/static/img/inventree.png