From 8545974e47016caa89ba5c3e2e8180ee54bb43dd Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Mon, 17 May 2021 13:28:59 -0400 Subject: [PATCH] Merge changelog.html into home.html --- netbox/templates/changelog.html | 47 ------------- netbox/templates/home.html | 120 ++++++++++++++++++++++---------- 2 files changed, 82 insertions(+), 85 deletions(-) delete mode 100644 netbox/templates/changelog.html diff --git a/netbox/templates/changelog.html b/netbox/templates/changelog.html deleted file mode 100644 index 9f6aae834..000000000 --- a/netbox/templates/changelog.html +++ /dev/null @@ -1,47 +0,0 @@ -{% load helpers %} {% load get_status %} -{% if changelog and perms.extras.view_objectchange %} - - - - - - - - - - - - - {% for change in changelog %} - - - - - - - - - - {% endfor %} - -
UserActionTypeObjectTime
{{ change.user|default:change.user_name }}{{ change.get_action_display|bettertitle }}{{ change.changed_object_type.name|bettertitle }} - {% if change.changed_object.get_absolute_url %} - {{ change.changed_object }} - {% else %} {{ change.changed_object|default:change.object_repr }} {% endif %} - {{ change.time|date:'SHORT_DATETIME_FORMAT' }} - - - -
- -{% elif perms.extras.view_objectchange %} - - -{% else %} - -{% endif %} diff --git a/netbox/templates/home.html b/netbox/templates/home.html index 4d7a11f99..a751d1918 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -1,56 +1,100 @@ {% extends 'layout.html' %} +{% load get_status %} {% load helpers %} {% block title_container %}{% endblock %} {% block title %}Home{% endblock %} {% block content %} -
-
- {% for section in stats %} -
-
-
{{ section.label }}
-
-
- {% for item in section.items %} - -
-
-
{{ item.label }}
- {% if item.description %} - {{ item.description }} - {% endif %} + + {# General stats #} +
+
+ {% for section in stats %} +
+
+
{{ section.label }}
+
+
+ {% for item in section.items %} + +
+
+
{{ item.label }}
+ {% if item.description %} + {{ item.description }} + {% endif %} +
+ + {% if item.count == None %} + + {% else %} + {{ item.count }} + {% endif %} +
- - {% if item.count == None %} - - {% else %} - {{ item.count }} - {% endif %} - -
- - {% endfor %} -
-
- {{ item.count }} + + {% endfor %} +
+
+ {{ item.count }} +
+ {% endfor %}
- {% endfor %}
-
-
-
-
-

Changelog

-
- {% include 'changelog.html' %} + {# Changelog #} +
+
+
+

Changelog

+
+ {% if changelog and perms.extras.view_objectchange %} + {# TODO: Replace this with a django-tables2 Table #} + + + + + + + + + + + + + {% for change in changelog %} + + + + + + + + + + {% endfor %} + +
UserActionTypeObjectTime
{{ change.user|default:change.user_name }}{{ change.get_action_display|bettertitle }}{{ change.changed_object_type.name|bettertitle }} + {% if change.changed_object.get_absolute_url %} + {{ change.changed_object }} + {% else %} {{ change.changed_object|default:change.object_repr }} {% endif %} + {{ change.time|date:'SHORT_DATETIME_FORMAT' }} + + + +
+ {% elif perms.extras.view_objectchange %} + + {% endif %} + +
-
{% endblock %}