From 06b0e1efa6d35589ccb93acd151939c0325dba1e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 5 Jan 2024 10:56:13 -0500 Subject: [PATCH] Update background color classes --- netbox/netbox/tables/columns.py | 2 +- netbox/templates/dcim/device.html | 2 +- netbox/templates/dcim/frontport.html | 4 ++-- netbox/templates/dcim/inc/connection_endpoints.html | 4 ++-- netbox/templates/dcim/rearport.html | 4 ++-- netbox/templates/dcim/trace/cable.html | 2 +- netbox/templates/extras/customfield.html | 4 ++-- netbox/templates/extras/htmx/report_result.html | 10 +++++----- netbox/templates/extras/report_list.html | 10 +++++----- netbox/templates/extras/templatetags/log_level.html | 2 +- netbox/templates/inc/panels/related_objects.html | 4 ++-- .../utilities/templates/helpers/applied_filters.html | 6 +++--- netbox/utilities/templates/widgets/markdown_input.html | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 0813deb36..ecd25f9ee 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -322,7 +322,7 @@ class ChoiceFieldColumn(tables.Column): except AttributeError: bg_color = self.DEFAULT_BG_COLOR - return mark_safe(f'{value}') + return mark_safe(f'{value}') def value(self, value): return value diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 435fb4f0b..61dae9873 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -54,7 +54,7 @@ {% elif object.rack and object.position %} U{{ object.position|floatformat }} / {{ object.get_face_display }} {% elif object.rack and object.device_type.u_height %} - {% trans "Not racked" %} + {% trans "Not racked" %} {% else %} {{ ''|placeholder }} {% endif %} diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html index 0387f5206..88139c22a 100644 --- a/netbox/templates/dcim/frontport.html +++ b/netbox/templates/dcim/frontport.html @@ -93,9 +93,9 @@ {% trans "Connection Status" %} {% if object.cable.status %} - {{ object.cable.get_status_display }} + {{ object.cable.get_status_display }} {% else %} - {{ object.cable.get_status_display }} + {{ object.cable.get_status_display }} {% endif %} diff --git a/netbox/templates/dcim/inc/connection_endpoints.html b/netbox/templates/dcim/inc/connection_endpoints.html index 79d2cf5d1..4538b9f52 100644 --- a/netbox/templates/dcim/inc/connection_endpoints.html +++ b/netbox/templates/dcim/inc/connection_endpoints.html @@ -13,9 +13,9 @@ {% trans "Path Status" %} {% if object.path.is_complete and object.path.is_active %} - {% trans "Reachable" %} + {% trans "Reachable" %} {% else %} - {% trans "Not Reachable" %} + {% trans "Not Reachable" %} {% endif %} diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html index 5b4a7a7aa..e99eaa3a8 100644 --- a/netbox/templates/dcim/rearport.html +++ b/netbox/templates/dcim/rearport.html @@ -89,9 +89,9 @@ {% trans "Connection Status" %} {% if object.cable.status %} - {{ object.cable.get_status_display }} + {{ object.cable.get_status_display }} {% else %} - {{ object.cable.get_status_display }} + {{ object.cable.get_status_display }} {% endif %} diff --git a/netbox/templates/dcim/trace/cable.html b/netbox/templates/dcim/trace/cable.html index 88d2d6b28..a89e2cff7 100644 --- a/netbox/templates/dcim/trace/cable.html +++ b/netbox/templates/dcim/trace/cable.html @@ -8,7 +8,7 @@
{% if cable.type %} - {{ cable.get_type_display|default:"" }} + {{ cable.get_type_display|default:"" }} {% endif %} {% if cable.length %} ({{ cable.length|floatformat }} {{ cable.get_length_unit_display }})
diff --git a/netbox/templates/extras/customfield.html b/netbox/templates/extras/customfield.html index 95919b414..35b356ae6 100644 --- a/netbox/templates/extras/customfield.html +++ b/netbox/templates/extras/customfield.html @@ -137,9 +137,9 @@ {{ qs.model|meta:"verbose_name_plural"|bettertitle }} {% with count=qs.count %} {% if count %} - {{ count }} + {{ count }} {% else %} - + {% endif %} {% endwith %} diff --git a/netbox/templates/extras/htmx/report_result.html b/netbox/templates/extras/htmx/report_result.html index e6b6caf73..09592308d 100644 --- a/netbox/templates/extras/htmx/report_result.html +++ b/netbox/templates/extras/htmx/report_result.html @@ -24,10 +24,10 @@ {{ method }} - {{ data.success }} - {{ data.info }} - {{ data.warning }} - {{ data.failure }} + {{ data.success }} + {{ data.info }} + {{ data.warning }} + {{ data.failure }} {% endfor %} @@ -57,7 +57,7 @@ {{ time }} - + {% if obj and url %} diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html index 0a38ea75c..d8a4b7d2d 100644 --- a/netbox/templates/extras/report_list.html +++ b/netbox/templates/extras/report_list.html @@ -72,7 +72,7 @@ {% if report.is_valid %} {{ ''|placeholder }} {% else %} - + {% trans "Invalid" %} {% endif %} @@ -101,10 +101,10 @@ {{ method }} - {{ stats.success }} - {{ stats.info }} - {{ stats.warning }} - {{ stats.failure }} + {{ stats.success }} + {{ stats.info }} + {{ stats.warning }} + {{ stats.failure }} {% endfor %} diff --git a/netbox/templates/extras/templatetags/log_level.html b/netbox/templates/extras/templatetags/log_level.html index 5fa66dcd3..ea38139f0 100644 --- a/netbox/templates/extras/templatetags/log_level.html +++ b/netbox/templates/extras/templatetags/log_level.html @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/netbox/templates/inc/panels/related_objects.html b/netbox/templates/inc/panels/related_objects.html index e83072810..57605f110 100644 --- a/netbox/templates/inc/panels/related_objects.html +++ b/netbox/templates/inc/panels/related_objects.html @@ -10,9 +10,9 @@ {{ qs.model|meta:"verbose_name_plural"|bettertitle }} {% with count=qs.count %} {% if count %} - {{ count }} + {{ count }} {% else %} - + {% endif %} {% endwith %} diff --git a/netbox/utilities/templates/helpers/applied_filters.html b/netbox/utilities/templates/helpers/applied_filters.html index 2a8ebc706..6e2b10e11 100644 --- a/netbox/utilities/templates/helpers/applied_filters.html +++ b/netbox/utilities/templates/helpers/applied_filters.html @@ -2,17 +2,17 @@ {% if applied_filters %}
{% for filter in applied_filters %} - + {{ filter.link_text }} {% endfor %} {% if applied_filters|length > 1 %} - + {% trans "Clear all" %} {% endif %} {% if save_link %} - + {% trans "Save" %} {% endif %} diff --git a/netbox/utilities/templates/widgets/markdown_input.html b/netbox/utilities/templates/widgets/markdown_input.html index 1bdb55970..f6f4ff1ff 100644 --- a/netbox/utilities/templates/widgets/markdown_input.html +++ b/netbox/utilities/templates/widgets/markdown_input.html @@ -12,7 +12,7 @@ -
+
{% include "django/forms/widgets/textarea.html" %}