diff --git a/inventory/static/inventory/css/main.css b/inventory/static/inventory/css/main.css
index 185762c..d28e233 100644
--- a/inventory/static/inventory/css/main.css
+++ b/inventory/static/inventory/css/main.css
@@ -1,5 +1,7 @@
-body {
+body, html {
font-family: sans-serif;
+ margin: 0;
+ padding: 0;
}
table.attribute-list {
@@ -50,6 +52,27 @@ table.box th {
border-style: solid;
}
+nav {
+ display: flex;
+ justify-content: space-between;
+ background-color: #292981;
+ color: #ffffff;
+ padding: 20px;
+ margin-bottom: 20px;
+}
+
+nav form {
+ display: inline-block;
+ margin: 0;
+}
+
+nav button {
+ border: 1px solid #e0e0e0;
+ background-color: #333381;
+ color: #ffffff;
+ padding: 8px 10px 8px 10px;
+}
+
h1 {
margin-top: 20px;
}
@@ -63,7 +86,21 @@ h1 .small {
h2 .small {
font-size: 12pt;
font-weight: normal;
- color: #808080;
+}
+
+nav h2 {
+ margin-top: 0;
+ margin-bottom: 0;
+ display: inline-block;
+ width: auto;
+}
+
+nav h2 .small {
+ color: #c0c0c0;
+}
+
+nav .icon {
+ filter: invert();
}
main {
@@ -71,7 +108,7 @@ main {
}
@media (min-width: 1025px) {
- h1 {
+ h1, h2 {
width: 80%;
}
@@ -81,7 +118,7 @@ main {
}
@media (max-width: 1024px) {
- h1 {
+ h1, h2 {
width: 95%;
}
diff --git a/inventory/static/inventory/img/logout.svg b/inventory/static/inventory/img/logout.svg
new file mode 100644
index 0000000..fdc3f4e
--- /dev/null
+++ b/inventory/static/inventory/img/logout.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/inventory/templates/base.html b/inventory/templates/base.html
index 1ce1fc9..66c3f92 100644
--- a/inventory/templates/base.html
+++ b/inventory/templates/base.html
@@ -8,6 +8,19 @@
{% block head %}{% endblock %}
+
+
{% block content %}
{% endblock %}
diff --git a/inventory/templates/inventory/area_detail.html b/inventory/templates/inventory/area_detail.html
index 49a3385..f7ab7e0 100644
--- a/inventory/templates/inventory/area_detail.html
+++ b/inventory/templates/inventory/area_detail.html
@@ -3,8 +3,13 @@
{% block title %}{{ area.container.display_name }} - {{ area.name }}{% endblock %}
+{% block header_bar %}
+ 
+ {{ area.container.display_name }} - {{ area.name }}
+ {{ area.description}}
+{% endblock %}
+
{% block content %}
- {{ area.container.display_name }} - {{ area.name }} {{ area.description}}
Areas
diff --git a/inventory/templates/inventory/box-generic.html b/inventory/templates/inventory/box-generic.html
index 88d1408..f3eb8e7 100644
--- a/inventory/templates/inventory/box-generic.html
+++ b/inventory/templates/inventory/box-generic.html
@@ -2,9 +2,14 @@
{% block title %}{{ box.container.display_name }} - {{ box.name }}{% endblock %}
+{% block header_bar %}
+
+ {{ box.container.display_name }} - {{ box.name }}
+ {{ box.description}}
+{% endblock %}
+
{% block content %}
- {{ box.container.display_name }} - {{ box.name }}
-
+
{% if box.box_related.exists %}
Boxes
diff --git a/inventory/templates/inventory/box-ikea-samla.html b/inventory/templates/inventory/box-ikea-samla.html
index abed5d0..5169cd1 100644
--- a/inventory/templates/inventory/box-ikea-samla.html
+++ b/inventory/templates/inventory/box-ikea-samla.html
@@ -8,9 +8,13 @@
{% block title %}{{ object.name }}{% endblock %}
-{% block content %}
- {{ object.name }} {{ object.description}}
+{% block header_bar %}
+
+ {{ object.name }}
+ {{ object.description}}{% endblock %}
+{% endblock %}
+{% block content %}
@@ -25,5 +29,4 @@
{% endfor %}
-
{% endblock %}
diff --git a/inventory/templates/inventory/box-raaco-even.html b/inventory/templates/inventory/box-raaco-even.html
index f49123a..09d3ee3 100644
--- a/inventory/templates/inventory/box-raaco-even.html
+++ b/inventory/templates/inventory/box-raaco-even.html
@@ -8,9 +8,13 @@
{% block title %}{{ object.name }}{% endblock %}
-{% block content %}
- {{ object.name }} {{ object.description}}
+{% block header_bar %}
+
+ {{ object.name }}
+ {{ object.description}}
+{% endblock %}
+{% block content %}
{% for line in layouted %}
@@ -28,5 +32,4 @@
{% endfor %}
-
{% endblock %}
diff --git a/inventory/templates/inventory/box-raaco-simple.html b/inventory/templates/inventory/box-raaco-simple.html
index 8ddc7ea..d347e4e 100644
--- a/inventory/templates/inventory/box-raaco-simple.html
+++ b/inventory/templates/inventory/box-raaco-simple.html
@@ -8,9 +8,13 @@
{% block title %}{{ object.name }}{% endblock %}
-{% block content %}
- {{ object.name }} {{ object.description}}
+{% block header_bar %}
+
+ {{ object.name }}
+ {{ object.description}}
+{% endblock %}
+{% block content %}
{% for item in layouted.0 %}
@@ -26,5 +30,4 @@
{% endfor %}
-
{% endblock %}
diff --git a/inventory/templates/inventory/box-smd-box-all.html b/inventory/templates/inventory/box-smd-box-all.html
index 54b6764..e4f05ae 100644
--- a/inventory/templates/inventory/box-smd-box-all.html
+++ b/inventory/templates/inventory/box-smd-box-all.html
@@ -8,9 +8,13 @@
{% block title %}{{ object.name }}{% endblock %}
-{% block content %}
- {{ object.name }} {{ object.description}}
+{% block header_bar %}
+
+ {{ object.name }}
+ {{ object.description}}
+{% endblock %}
+{% block content %}
{% for part in layouted %}
-{% endfor %}
-
+ {% endfor %}
{% endblock %}
diff --git a/inventory/templates/inventory/item_detail.html b/inventory/templates/inventory/item_detail.html
index 953776e..73aa77a 100644
--- a/inventory/templates/inventory/item_detail.html
+++ b/inventory/templates/inventory/item_detail.html
@@ -4,9 +4,13 @@
{% block title %}{{ item.name }}{% endblock %}
-{% block content %}
- {{ item.name }}
+{% block header_bar %}
+
+ {{ item.name }}
+ {{ item.description}}
+{% endblock %}
+{% block content %}
@@ -98,6 +102,4 @@
{% endif %}
-
-
{% endblock %}
\ No newline at end of file
diff --git a/inventory/templates/inventory/workshop_detail.html b/inventory/templates/inventory/workshop_detail.html
index 9c161d1..42ae5d8 100644
--- a/inventory/templates/inventory/workshop_detail.html
+++ b/inventory/templates/inventory/workshop_detail.html
@@ -3,9 +3,13 @@
{% block title %}Workshop {{ workshop.name }}{% endblock %}
-{% block content %}
- {{ workshop.name }} {{ workshop.description}}
+{% block header_bar %}
+
+ {{ workshop.name }}
+ {{ workshop.description}}
+{% endblock %}
+{% block content %}
Areas
{% for area in workshop.area_related.all %}
diff --git a/inventory/templates/inventory/workshop_list.html b/inventory/templates/inventory/workshop_list.html
index 5b394e6..639b1e7 100644
--- a/inventory/templates/inventory/workshop_list.html
+++ b/inventory/templates/inventory/workshop_list.html
@@ -3,8 +3,11 @@
{% block title %}Workshops{% endblock %}
+{% block header_bar %}
+ Inventory management - Workshops
+{% endblock %}
+
{% block content %}
- Workshops
{% for workshop in object_list %}
-
diff --git a/inventory/templates/registration/login.html b/inventory/templates/registration/login.html
index 1d89636..c24efde 100644
--- a/inventory/templates/registration/login.html
+++ b/inventory/templates/registration/login.html
@@ -1,5 +1,9 @@
{% extends "base.html" %}
+{% block header_bar %}
+ Inventory management - Login
+{% endblock %}
+
{% block content %}
{% if form.errors %}