diff --git a/inventory-app/inventory.py b/inventory-app/inventory.py index 21085bc..315ebee 100644 --- a/inventory-app/inventory.py +++ b/inventory-app/inventory.py @@ -129,7 +129,7 @@ class InventoryForm(Form): owner = FormField(MemberForm, label="Owner") user = FormField(MemberForm, label="Current User") usable = BooleanField("Usable") - visibility = SelectField("Visibility", choices=['public', 'unlisted', 'secret'], default='unlisted') + visibility = SelectField("Visibility", choices=['public', 'unlisted', 'secret', 'archived'], default='unlisted') class HardwareForm(Form): serial = StringField("Serial Number") @@ -143,7 +143,6 @@ class ShortenerForm(Form): class InventoryItemForm(CustomForm): type = SelectField("Type", choices=fetch_type_select()) name = StringField('Name') - external_link = StringField('External link') comment = StringField('Comment') inventory = FormField(InventoryForm) hardware = FormField(HardwareForm) diff --git a/inventory-app/templates/base.html b/inventory-app/templates/base.html index 369db3f..37198c8 100644 --- a/inventory-app/templates/base.html +++ b/inventory-app/templates/base.html @@ -27,9 +27,9 @@ body { .csstransforms & th.rotate { height: 140px; white-space: nowrap; - // Firefox needs the extra DIV for some reason, otherwise the text disappears if you rotate + // Firefox needs the extra DIV for some reason, otherwise the text disappears if you rotate > div { - transform: + transform: // Magic Numbers translate(25px, 51px) // 45 is really 360-45 @@ -68,8 +68,14 @@ span.tooltipped { text-decoration-line: underline; text-decoration-style: dotted; } - + .horizontalRow { + display: flex; + justify-content: flex-start; + gap: 20px; + padding: 10px; + } + - diff --git a/inventory-app/templates/inventory.html b/inventory-app/templates/inventory.html index adf242b..6b877da 100644 --- a/inventory-app/templates/inventory.html +++ b/inventory-app/templates/inventory.html @@ -40,10 +40,10 @@ {{ item.inventory.visibility }} {{ item.type }} - {{ item | format_name }} {{ item.comment }} + {{ item | format_name }} {{ item.comment }} {{ item.location }} - {{ item | owner_link}} - {{ item | user_link}} + {{ item | owner_link }} + {{ item | user_link }} {% if can_audit %}
@@ -63,20 +63,4 @@ {{ add_item_button() }} - {% endblock %} diff --git a/inventory-app/templates/inventory_edit.html b/inventory-app/templates/inventory_edit.html index 58f94b1..204d7bf 100644 --- a/inventory-app/templates/inventory_edit.html +++ b/inventory-app/templates/inventory_edit.html @@ -3,15 +3,14 @@
{{ form.csrf_token }} -

Inventory item.

{% for field, errors in form.errors.items() %}
- {{ form[field].label.text }} : + {{ form[field].label.text }} : {% if errors.items %} {% for error, msg in errors.items() %} - {{ form[field][error].label.text }} : + {{ form[field][error].label.text }} : {{ ", ".join(msg) }} {% endfor %} {% else %} @@ -33,15 +32,36 @@ + + Location + {{ form.location }} + + + + + + + + k6.ee/ + {{ form.shortener.slug }} + Type {{ form["type"] }} + + Visibility + {{ form.inventory.visibility }} Vendor {{ form.hardware.vendor }} + + Serial number + {{ form.hardware.serial }} @@ -49,11 +69,6 @@ {{ form.hardware.product }} - - Serial number - {{ form.hardware.serial }} - - Name {{ form.name }} @@ -75,33 +90,10 @@ {{ form.inventory.owner.username }} - - Current user {{ form.inventory.user.username }} - - - External link - {{ form.external_link }} - - - - URL slug - {{ form.shortener.slug }} - - - - Location - {{ form.location }} - - - - Visibility - {{ form.inventory.visibility }} - - @@ -196,4 +188,3 @@ $(function() { }); {% endblock %} - diff --git a/inventory-app/templates/inventory_view.html b/inventory-app/templates/inventory_view.html index b0e5ae7..346c152 100644 --- a/inventory-app/templates/inventory_view.html +++ b/inventory-app/templates/inventory_view.html @@ -1,25 +1,69 @@ {% extends 'base.html' %} + {% block content %}
-

Inventory item.

+{% if item.get("shortener").slug %}/{{ item.get("shortener").slug }}{% else %}k6{% endif %}: {{ item.name }} + +
+
Edit
+
Clone
+
+ + - + + + + + + + + + + + + + + + + + + + @@ -27,11 +71,6 @@ - - - - - {% if item.mac %} @@ -54,98 +93,27 @@ - + - - - - - - + + + + - {% macro auditLine(timestamp, user) -%} - {{ timestamp | timeago }} - by - {{ user | display_name }} - {%- endmacro %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +{% for tag in item.tags %} +
{{ tag }}
+{% endfor %} +
Key ValueKeyValue
Location{{ item.location }}Last audited
+ + + {% if item.inventory.get("audit") %} by {{ item.inventory.audit.username }}{% endif %} +
+
URL slug + {% if item.get("shortener").slug %} + {{ item.get("shortener", {}).get("slug") | qr_code }} + + k6.ee/{{ item.get("shortener").slug }} + + {% endif %} +
Type {{ item["type"] }}Visibility{{ item.inventory.visibility }}
Vendor {{ item.get("hardware").vendor }}Serial number{{ item.get("hardware").serial }}
{{ item.get("hardware").product }}
Serial number{{ item.get("hardware").serial }}
MAC addressComment {{ item.comment }}
Owner{{ item.inventory.get("owner").username | display_name }}
Current user{{ item.inventory.get("user").username | display_name }}{{ item | owner_link }}User{{ item | user_link }}
Last audited - {% if item.inventory.get("audit") %} - {% if item.inventory.get("audit", {}).get("log") %} -
- - {{ auditLine(item.inventory.audit.timestamp, item.inventory.audit.username) }} - -
    - {% for audit in item.inventory.audit.log | reverse %} -
  • {{ auditLine(audit.timestamp, audit.username) }}
    • - {% endfor %} -
-
- {% else %} - {{ auditLine(item.inventory.audit.timestamp, item.inventory.audit.username) }} - {% endif %} - {% else %} - Never - {% endif %} -
URL slug - {% if item.get("shortener").slug %} - - k6.ee/{{ item.get("shortener").slug }} - - {% endif %} -
QR Code (WIP) - {% if item.get("shortener").slug %} - {{ item.get("shortener", {}).get("slug") | qr_code }} - {% endif %} -
External linkExternal link
Location{{ item.location }}
Visibility{{ item.inventory.visibility }}
Usable{% if item.inventory.usable %}check_circle{% endif %}
Tags
-

Tags

-{% for tag in item.tags %} -
{{ tag }}
-{% endfor %} - +

Photo

-{% if item.has_photo %} - -{% endif %}
@@ -165,97 +133,13 @@
-

Actions

-{% if not item.inventory.user and item.inventory.usable %} -
-
-
- -
-
-
+{% if item.has_photo %} + {% endif %} - -{% if is_using %} -
-
-
- -
-
-
-{% endif %} - -
-
- - Edit - -
-
-
- Clone -
-
-
- -
-
- -
-
-
- -
-
-
- -{% if can_audit %} - -{% endif %} - -
{% endblock %} -