diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md index eb6b00638..16d1d773d 100644 --- a/docs/release-notes/version-3.0.md +++ b/docs/release-notes/version-3.0.md @@ -7,6 +7,7 @@ * [#6387](https://github.com/netbox-community/netbox/issues/6387) - Add xDSL interface type * [#6988](https://github.com/netbox-community/netbox/issues/6988) - Order tenants alphabetically without regard to group assignment * [#7032](https://github.com/netbox-community/netbox/issues/7032) - Add URM port types +* [#7208](https://github.com/netbox-community/netbox/issues/7208) - Add navigation breadcrumbs for custom scripts & reports * [#7239](https://github.com/netbox-community/netbox/issues/7239) - Redirect global search to filtered object list when an object type is selected ### Bug Fixes diff --git a/netbox/templates/extras/report.html b/netbox/templates/extras/report.html index e486f9255..2d65dc88e 100644 --- a/netbox/templates/extras/report.html +++ b/netbox/templates/extras/report.html @@ -1,4 +1,4 @@ -{% extends 'base/layout.html' %} +{% extends 'generic/object.html' %} {% load helpers %} {% block title %}{{ report.name }}{% endblock %} @@ -8,31 +8,39 @@ {% endblock %} -{% block content %} -{% if report.description %} -

{{ report.description|render_markdown }}

-{% endif %} -{% if perms.extras.run_report %} -
-
- {% csrf_token %} - -
-
-{% endif %} -
-
- {% if report.result %} - Last run: - {{ report.result.created|annotated_date }} - - {% endif %} +{% block subtitle %} + {% if report.description %} +
+
{{ report.description|render_markdown }}
-
+ {% endif %} +{% endblock %} + +{% block controls %}{% endblock %} +{% block tabs %}{% endblock %} + +{% block content-wrapper %} + {% if perms.extras.run_report %} +
+
+ {% csrf_token %} + +
+
+ {% endif %} +
+
+ {% if report.result %} + Last run: + {{ report.result.created|annotated_date }} + + {% endif %} +
+
{% endblock %} diff --git a/netbox/templates/extras/report_result.html b/netbox/templates/extras/report_result.html index a5ec2a04b..90726d287 100644 --- a/netbox/templates/extras/report_result.html +++ b/netbox/templates/extras/report_result.html @@ -2,15 +2,13 @@ {% load helpers %} {% load static %} -{% block title %}{{ report.name }} {% include 'extras/inc/job_label.html' with result=result %}{% endblock %} - {% block head %} {% endblock %} -{% block content %} -
+{% block content-wrapper %} +

Run: {{ result.created|annotated_date }} @@ -21,7 +19,7 @@ Loading...

{% endif %} - + {% include 'extras/inc/job_label.html' with result=result %}

{% if result.completed %}
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html index 38f82fe03..2c59afe6d 100644 --- a/netbox/templates/extras/script.html +++ b/netbox/templates/extras/script.html @@ -1,4 +1,4 @@ -{% extends 'base/layout.html' %} +{% extends 'generic/object.html' %} {% load helpers %} {% load form_helpers %} {% load log_levels %} @@ -16,6 +16,8 @@
{% endblock %} +{% block controls %}{% endblock %} + {% block tabs %}