diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 136c95583..1848ac492 100644 Binary files a/netbox/project-static/dist/netbox.css and b/netbox/project-static/dist/netbox.css differ diff --git a/netbox/project-static/styles/transitional/_cards.scss b/netbox/project-static/styles/transitional/_cards.scss index 661d4eb9c..6a7666524 100644 --- a/netbox/project-static/styles/transitional/_cards.scss +++ b/netbox/project-static/styles/transitional/_cards.scss @@ -21,5 +21,10 @@ padding: 0.5rem 0.75rem; } + // Remove bottom margin + .table { + margin-bottom: 0; + } + } } diff --git a/netbox/project-static/styles/transitional/_tables.scss b/netbox/project-static/styles/transitional/_tables.scss index 31bb69b13..1ddc81cf0 100644 --- a/netbox/project-static/styles/transitional/_tables.scss +++ b/netbox/project-static/styles/transitional/_tables.scss @@ -15,7 +15,6 @@ table.attr-table { th { color: $gray-700; font-weight: normal; - padding-left: 0; } // Restyle row border diff --git a/netbox/templates/account/profile.html b/netbox/templates/account/profile.html index cb699072c..07c701de2 100644 --- a/netbox/templates/account/profile.html +++ b/netbox/templates/account/profile.html @@ -10,40 +10,38 @@
{% trans "Account Details" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Username" %}{{ request.user.username }}
{% trans "Full Name" %} - {% if request.user.first_name or request.user.last_name %} - {{ request.user.first_name }} {{ request.user.last_name }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Email" %}{{ request.user.email|placeholder }}
{% trans "Account Created" %}{{ request.user.date_joined|annotated_date }}
{% trans "Superuser" %}{% checkmark request.user.is_superuser %}
{% trans "Admin Access" %}{% checkmark request.user.is_staff %}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Username" %}{{ request.user.username }}
{% trans "Full Name" %} + {% if request.user.first_name or request.user.last_name %} + {{ request.user.first_name }} {{ request.user.last_name }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Email" %}{{ request.user.email|placeholder }}
{% trans "Account Created" %}{{ request.user.date_joined|annotated_date }}
{% trans "Superuser" %}{% checkmark request.user.is_superuser %}
{% trans "Admin Access" %}{% checkmark request.user.is_staff %}
diff --git a/netbox/templates/account/token.html b/netbox/templates/account/token.html index 57d1de3f4..c65d80cb9 100644 --- a/netbox/templates/account/token.html +++ b/netbox/templates/account/token.html @@ -17,47 +17,45 @@
{% trans "Token" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Key" %} - {% if key %} -
- {% copy_content "token_id" %} -
-
{{ key }}
- {% else %} - {{ object.partial }} - {% endif %} -
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Write enabled" %}{% checkmark object.write_enabled %}
{% trans "Created" %}{{ object.created|annotated_date }}
{% trans "Expires" %}{{ object.expires|placeholder }}
{% trans "Last used" %}{{ object.last_used|placeholder }}
{% trans "Allowed IPs" %}{{ object.allowed_ips|join:", "|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Key" %} + {% if key %} +
+ {% copy_content "token_id" %} +
+
{{ key }}
+ {% else %} + {{ object.partial }} + {% endif %} +
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Write enabled" %}{% checkmark object.write_enabled %}
{% trans "Created" %}{{ object.created|annotated_date }}
{% trans "Expires" %}{{ object.expires|placeholder }}
{% trans "Last used" %}{{ object.last_used|placeholder }}
{% trans "Allowed IPs" %}{{ object.allowed_ips|join:", "|placeholder }}
diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 9bc5d4a6d..69284f9b4 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -13,55 +13,53 @@
{% trans "Circuit" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Provider" %}{{ object.provider|linkify }}
{% trans "Account" %}{{ object.provider_account|linkify|placeholder }}
{% trans "Circuit ID" %}{{ object.cid }}
{% trans "Type" %}{{ object.type|linkify }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Install Date" %}{{ object.install_date|annotated_date|placeholder }}
{% trans "Termination Date" %}{{ object.termination_date|annotated_date|placeholder }}
{% trans "Commit Rate" %}{{ object.commit_rate|humanize_speed|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Provider" %}{{ object.provider|linkify }}
{% trans "Account" %}{{ object.provider_account|linkify|placeholder }}
{% trans "Circuit ID" %}{{ object.cid }}
{% trans "Type" %}{{ object.type|linkify }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Install Date" %}{{ object.install_date|annotated_date|placeholder }}
{% trans "Termination Date" %}{{ object.termination_date|annotated_date|placeholder }}
{% trans "Commit Rate" %}{{ object.commit_rate|humanize_speed|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html index fe82bc4b9..2f63eaf8a 100644 --- a/netbox/templates/circuits/circuittype.html +++ b/netbox/templates/circuits/circuittype.html @@ -16,31 +16,27 @@
-
- {% trans "Circuit Type" %} -
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} - {% if object.color %} -   - {% else %} - {{ ''|placeholder }} - {% endif %} -
-
+
{% trans "Circuit Type" %}
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} + {% if object.color %} +   + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index 520e516c8..a0afebb02 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -25,7 +25,6 @@ {% endif %}
-
{% if termination %} {% if termination.site %} @@ -151,7 +150,8 @@ {% endfor %}
{% else %} +
{% trans "None" %} +
{% endif %} -
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index aa0d6f1d8..d72af1ccc 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -17,25 +17,23 @@
-
{% trans "Provider" %}
-
- - - - - - - - - -
{% trans "ASNs" %} - {% for asn in object.asns.all %} - {{ asn|linkify }}{% if not forloop.last %}, {% endif %} - {% empty %} - {{ ''|placeholder }} - {% endfor %} -
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Provider" %}
+ + + + + + + + + +
{% trans "ASNs" %} + {% for asn in object.asns.all %} + {{ asn|linkify }}{% if not forloop.last %}, {% endif %} + {% empty %} + {{ ''|placeholder }} + {% endfor %} +
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/comments.html' %} diff --git a/netbox/templates/circuits/provideraccount.html b/netbox/templates/circuits/provideraccount.html index b5ad37eba..caebd9975 100644 --- a/netbox/templates/circuits/provideraccount.html +++ b/netbox/templates/circuits/provideraccount.html @@ -15,22 +15,20 @@
{% trans "Provider Account" %}
-
- - - - - - - - - - - - - -
{% trans "Provider" %}{{ object.provider|linkify }}
{% trans "Account" %}{{ object.account }}
{% trans "Name" %}{{ object.name|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "Provider" %}{{ object.provider|linkify }}
{% trans "Account" %}{{ object.account }}
{% trans "Name" %}{{ object.name|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/circuits/providernetwork.html b/netbox/templates/circuits/providernetwork.html index cd12bd47f..6c45b81d8 100644 --- a/netbox/templates/circuits/providernetwork.html +++ b/netbox/templates/circuits/providernetwork.html @@ -11,53 +11,49 @@ {% endblock %} {% block content %} -
-
-
-
- {% trans "Provider Network" %} -
-
- - - - - - - - - - - - - - - - - -
{% trans "Provider" %}{{ object.provider|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Service ID" %}{{ object.service_id|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
-
-
- {% include 'inc/panels/tags.html' %} - {% plugin_left_page object %} +
+
+
+
{% trans "Provider Network" %}
+ + + + + + + + + + + + + + + + + +
{% trans "Provider" %}{{ object.provider|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Service ID" %}{{ object.service_id|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
+
+ {% include 'inc/panels/tags.html' %} + {% plugin_left_page object %}
- {% include 'inc/panels/related_objects.html' %} - {% include 'inc/panels/comments.html' %} - {% include 'inc/panels/custom_fields.html' %} - {% plugin_right_page object %} + {% include 'inc/panels/related_objects.html' %} + {% include 'inc/panels/comments.html' %} + {% include 'inc/panels/custom_fields.html' %} + {% plugin_right_page object %} +
+
+
+
+
+
{% trans "Circuits" %}
+
+
+ {% plugin_full_width_page object %}
-
-
-
-
-
{% trans "Circuits" %}
-
-
- {% plugin_full_width_page object %}
-
{% endblock %} diff --git a/netbox/templates/core/configrevision.html b/netbox/templates/core/configrevision.html index 7e7f49f2f..9c39f5031 100644 --- a/netbox/templates/core/configrevision.html +++ b/netbox/templates/core/configrevision.html @@ -41,180 +41,162 @@
{% trans "Rack Elevations" %}
-
- - - - - - - - - -
{% trans "Default unit height" %}{{ object.data.RACK_ELEVATION_DEFAULT_UNIT_HEIGHT }}
{% trans "Default unit width" %}{{ object.data.RACK_ELEVATION_DEFAULT_UNIT_WIDTH }}
-
+ + + + + + + + + +
{% trans "Default unit height" %}{{ object.data.RACK_ELEVATION_DEFAULT_UNIT_HEIGHT }}
{% trans "Default unit width" %}{{ object.data.RACK_ELEVATION_DEFAULT_UNIT_WIDTH }}
{% trans "Power Feeds" %}
-
- - - - - - - - - - - - - -
{% trans "Default voltage" %}{{ object.data.POWERFEED_DEFAULT_VOLTAGE }}
{% trans "Default amperage" %}{{ object.data.POWERFEED_DEFAULT_AMPERAGE }}
{% trans "Default max utilization" %}{{ object.data.POWERFEED_DEFAULT_MAX_UTILIZATION }}
-
+ + + + + + + + + + + + + +
{% trans "Default voltage" %}{{ object.data.POWERFEED_DEFAULT_VOLTAGE }}
{% trans "Default amperage" %}{{ object.data.POWERFEED_DEFAULT_AMPERAGE }}
{% trans "Default max utilization" %}{{ object.data.POWERFEED_DEFAULT_MAX_UTILIZATION }}
{% trans "IPAM" %}
-
- - - - - - - - - -
{% trans "Enforce global unique" %}{{ object.data.ENFORCE_GLOBAL_UNIQUE }}
{% trans "Prefer IPv4" %}{{ object.data.PREFER_IPV4 }}
-
+ + + + + + + + + +
{% trans "Enforce global unique" %}{{ object.data.ENFORCE_GLOBAL_UNIQUE }}
{% trans "Prefer IPv4" %}{{ object.data.PREFER_IPV4 }}
{% trans "Security" %}
-
- - - - - -
{% trans "Allowed URL schemes" %}{{ object.data.ALLOWED_URL_SCHEMES|join:", "|placeholder }}
-
+ + + + + +
{% trans "Allowed URL schemes" %}{{ object.data.ALLOWED_URL_SCHEMES|join:", "|placeholder }}
{% trans "Banners" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Login banner" %}{{ object.data.BANNER_LOGIN }}
{% trans "Maintenance banner" %}{{ object.data.BANNER_MAINTENANCE }}
{% trans "Top banner" %}{{ object.data.BANNER_TOP }}
{% trans "Bottom banner" %}{{ object.data.BANNER_BOTTOM }}
-
+ + + + + + + + + + + + + + + + + +
{% trans "Login banner" %}{{ object.data.BANNER_LOGIN }}
{% trans "Maintenance banner" %}{{ object.data.BANNER_MAINTENANCE }}
{% trans "Top banner" %}{{ object.data.BANNER_TOP }}
{% trans "Bottom banner" %}{{ object.data.BANNER_BOTTOM }}
{% trans "Pagination" %}
-
- - - - - - - - - -
{% trans "Paginate count" %}{{ object.data.PAGINATE_COUNT }}
{% trans "Max page size" %}{{ object.data.MAX_PAGE_SIZE }}
-
+ + + + + + + + + +
{% trans "Paginate count" %}{{ object.data.PAGINATE_COUNT }}
{% trans "Max page size" %}{{ object.data.MAX_PAGE_SIZE }}
{% trans "Validation" %}
-
- - - - {% if object.data.CUSTOM_VALIDATORS %} - - {% else %} - - {% endif %} - - - - {% if object.data.PROTECTION_RULES %} - - {% else %} - - {% endif %} - -
{% trans "Custom validators" %} - 
{{ object.data.CUSTOM_VALIDATORS|json }}
- 		{{ ''|placeholder }}
{% trans "Protection rules" %} - 
{{ object.data.PROTECTION_RULES|json }}
- 		{{ ''|placeholder }}
-
+ + + + {% if object.data.CUSTOM_VALIDATORS %} + + {% else %} + + {% endif %} + + + + {% if object.data.PROTECTION_RULES %} + + {% else %} + + {% endif %} + +
{% trans "Custom validators" %} + 
{{ object.data.CUSTOM_VALIDATORS|json }}
+ 		{{ ''|placeholder }}
{% trans "Protection rules" %} + 
{{ object.data.PROTECTION_RULES|json }}
+ 		{{ ''|placeholder }}
{% trans "User Preferences" %}
-
- - - - {% if object.data.DEFAULT_USER_PREFERENCES %} - - {% else %} - - {% endif %} - -
{% trans "Default user preferences" %} - 
{{ object.data.DEFAULT_USER_PREFERENCES|json }}
- 		{{ ''|placeholder }}
-
+ + + + {% if object.data.DEFAULT_USER_PREFERENCES %} + + {% else %} + + {% endif %} + +
{% trans "Default user preferences" %} + 
{{ object.data.DEFAULT_USER_PREFERENCES|json }}
+ 		{{ ''|placeholder }}
{% trans "Miscellaneous" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Maintenance mode" %}{{ object.data.MAINTENANCE_MODE }}
{% trans "GraphQL enabled" %}{{ object.data.GRAPHQL_ENABLED }}
{% trans "Changelog retention" %}{{ object.data.CHANGELOG_RETENTION }}
{% trans "Job retention" %}{{ object.data.JOB_RETENTION }}
{% trans "Maps URL" %}{{ object.data.MAPS_URL }}
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Maintenance mode" %}{{ object.data.MAINTENANCE_MODE }}
{% trans "GraphQL enabled" %}{{ object.data.GRAPHQL_ENABLED }}
{% trans "Changelog retention" %}{{ object.data.CHANGELOG_RETENTION }}
{% trans "Job retention" %}{{ object.data.JOB_RETENTION }}
{% trans "Maps URL" %}{{ object.data.MAPS_URL }}
diff --git a/netbox/templates/core/datafile.html b/netbox/templates/core/datafile.html index 19ac3ab14..c51ad3093 100644 --- a/netbox/templates/core/datafile.html +++ b/netbox/templates/core/datafile.html @@ -30,36 +30,34 @@
{% trans "Data File" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Source" %}{{ object.source|linkify }}
{% trans "Path" %} - {{ object.path }} - {% copy_content "datafile_path" %} -
{% trans "Last Updated" %}{{ object.last_updated }}
{% trans "Size" %}{{ object.size }} {% trans "bytes" %}
{% trans "SHA256 Hash" %} - {{ object.hash }} - {% copy_content "datafile_hash" %} -
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Source" %}{{ object.source|linkify }}
{% trans "Path" %} + {{ object.path }} + {% copy_content "datafile_path" %} +
{% trans "Last Updated" %}{{ object.last_updated }}
{% trans "Size" %}{{ object.size }} {% trans "bytes" %}
{% trans "SHA256 Hash" %} + {{ object.hash }} + {% copy_content "datafile_hash" %} +
{% trans "Content" %}
diff --git a/netbox/templates/core/datasource.html b/netbox/templates/core/datasource.html index 569e4889d..665ea3092 100644 --- a/netbox/templates/core/datasource.html +++ b/netbox/templates/core/datasource.html @@ -29,53 +29,51 @@
{% trans "Data Source" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Last synced" %}{{ object.last_synced|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "URL" %} - {% if not object.type.is_local %} - {{ object.source_url }} - {% else %} - {{ object.source_url }} - {% endif %} -
{% trans "Ignore rules" %} - {% if object.ignore_rules %} - 
{{ object.ignore_rules }}
- {% else %} - {{ ''|placeholder }} - {% endif %}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Last synced" %}{{ object.last_synced|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "URL" %} + {% if not object.type.is_local %} + {{ object.source_url }} + {% else %} + {{ object.source_url }} + {% endif %} +
{% trans "Ignore rules" %} + {% if object.ignore_rules %} + 
{{ object.ignore_rules }}
+ {% else %} + {{ ''|placeholder }} + {% endif %}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/comments.html' %} @@ -84,7 +82,6 @@
{% trans "Backend" %}
-
{% with backend=object.backend_class %} {% for name, field in backend.parameters.items %} @@ -104,8 +101,7 @@ {% endfor %}
- {% endwith %} -
+ {% endwith %}
{% include 'inc/panels/related_objects.html' %} {% include 'inc/panels/custom_fields.html' %} diff --git a/netbox/templates/core/job.html b/netbox/templates/core/job.html index deb651739..8539e43a2 100644 --- a/netbox/templates/core/job.html +++ b/netbox/templates/core/job.html @@ -19,64 +19,60 @@
{% trans "Job" %}
-
- +
+ + + + + + + + + + + + + {% if object.error %} - - + + - - - - - - - - - {% if object.error %} - - - - - {% endif %} - - - - -
{% trans "Object Type" %} + {{ object.object_type }} +
{% trans "Name" %}{{ object.name|placeholder }}
{% trans "Status" %}{% badge object.get_status_display object.get_status_color %}
{% trans "Object Type" %} - {{ object.object_type }} - {% trans "Error" %}{{ object.error }}
{% trans "Name" %}{{ object.name|placeholder }}
{% trans "Status" %}{% badge object.get_status_display object.get_status_color %}
{% trans "Error" %}{{ object.error }}
{% trans "Created By" %}{{ object.user|placeholder }}
-
+ {% endif %} + + {% trans "Created By" %} + {{ object.user|placeholder }} + +
{% trans "Scheduling" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Created" %}{{ object.created|annotated_date }}
{% trans "Scheduled" %} - {{ object.scheduled|annotated_date|placeholder }} - {% if object.interval %} - ({% blocktrans with interval=object.interval %}every {{ interval }} seconds{% endblocktrans %}) - {% endif %} -
{% trans "Started" %}{{ object.started|annotated_date|placeholder }}
{% trans "Completed" %}{{ object.completed|annotated_date|placeholder }}
-
+ + + + + + + + + + + + + + + + + +
{% trans "Created" %}{{ object.created|annotated_date }}
{% trans "Scheduled" %} + {{ object.scheduled|annotated_date|placeholder }} + {% if object.interval %} + ({% blocktrans with interval=object.interval %}every {{ interval }} seconds{% endblocktrans %}) + {% endif %} +
{% trans "Started" %}{{ object.started|annotated_date|placeholder }}
{% trans "Completed" %}{{ object.completed|annotated_date|placeholder }}
diff --git a/netbox/templates/dcim/cable.html b/netbox/templates/dcim/cable.html index caa1a9fe0..91ca10269 100644 --- a/netbox/templates/dcim/cable.html +++ b/netbox/templates/dcim/cable.html @@ -10,55 +10,53 @@
{% trans "Cable" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Type" %}{{ object.get_type_display|placeholder }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} - {% if object.color %} -   - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Length" %} - {% if object.length is not None %} - {{ object.length|floatformat }} {{ object.get_length_unit_display }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Type" %}{{ object.get_type_display|placeholder }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} + {% if object.color %} +   + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Length" %} + {% if object.length is not None %} + {{ object.length|floatformat }} {{ object.get_length_unit_display }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -68,15 +66,11 @@
{% trans "Termination" %} A
-
- {% include 'dcim/inc/cable_termination.html' with terminations=object.a_terminations %} -
+ {% include 'dcim/inc/cable_termination.html' with terminations=object.a_terminations %}
{% trans "Termination" %} B
-
- {% include 'dcim/inc/cable_termination.html' with terminations=object.b_terminations %} -
+ {% include 'dcim/inc/cable_termination.html' with terminations=object.b_terminations %}
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html index e925c79d8..4fe7ff024 100644 --- a/netbox/templates/dcim/cable_trace.html +++ b/netbox/templates/dcim/cable_trace.html @@ -79,43 +79,39 @@ {# Related paths #}
-
- {% trans "Related Paths" %} -
-
- - - - - - - - - - {% for cablepath in related_paths %} - - - - - - {% empty %} - + + + {% empty %} + + {% endfor %} + +
{% trans "Origin" %}{% trans "Destination" %}{% trans "Segments" %}
- {{ cablepath.origins|join:", " }} - - {% if cablepath.destinations %} - {{ cablepath.destinations|join:", " }} - {% else %} - {% trans "Incomplete" %} - {% endif %} - - {{ cablepath.segment_count }} -
- {% trans "None found" %} +
{% trans "Related Paths" %}
+ + + + + + + + + + {% for cablepath in related_paths %} + + - {% endfor %} - -
{% trans "Origin" %}{% trans "Destination" %}{% trans "Segments" %}
+ {{ cablepath.origins|join:", " }}
- + 		+ {% if cablepath.destinations %} + {{ cablepath.destinations|join:", " }} + {% else %} + {% trans "Incomplete" %} + {% endif %} + + {{ cablepath.segment_count }} +
+ {% trans "None found" %} +
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html index 52da72142..b26f21753 100644 --- a/netbox/templates/dcim/consoleport.html +++ b/netbox/templates/dcim/consoleport.html @@ -14,41 +14,37 @@
-
- {% trans "Console Port" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Speed" %}{{ object.get_speed_display }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Console Port" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Speed" %}{{ object.get_speed_display }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -57,35 +53,36 @@
{% trans "Connection" %}
-
- {% if object.mark_connected %} - {% trans "Marked as connected" %} - {% elif object.cable %} - {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:consoleport_trace' %} - {% else %} -
- {% trans "Not Connected" %} - {% if perms.dcim.add_cable %} -
- - -
- {% endif %} -
- {% endif %} -
+ {% if object.mark_connected %} +
+ + {% trans "Marked as connected" %} +
+ {% elif object.cable %} + {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:consoleport_trace' %} + {% else %} +
+ {% trans "Not Connected" %} + {% if perms.dcim.add_cable %} +
+ + +
+ {% endif %} +
+ {% endif %}
{% include 'dcim/inc/panels/inventory_items.html' %} {% plugin_right_page object %} diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html index 86fc705bd..269615f49 100644 --- a/netbox/templates/dcim/consoleserverport.html +++ b/netbox/templates/dcim/consoleserverport.html @@ -14,41 +14,37 @@
-
- {% trans "Console Server Port" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - +
{% trans "Console Server Port" %}
+
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display|placeholder }}
{% trans "Speed" %}{{ object.get_speed_display|placeholder }}
+ + + - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + {% trans "Module" %} + {{ object.module|linkify|placeholder }} + + + {% trans "Name" %} + {{ object.name }} + + + {% trans "Label" %} + {{ object.label|placeholder }} + + + {% trans "Type" %} + {{ object.get_type_display|placeholder }} + + + {% trans "Speed" %} + {{ object.get_speed_display|placeholder }} + + + {% trans "Description" %} + {{ object.description|placeholder }} + +
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -58,34 +54,36 @@
{% trans "Connection" %}
- {% if object.mark_connected %} - {% trans "Marked as connected" %} - {% elif object.cable %} - {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:consoleserverport_trace' %} - {% else %} -
- {% trans "Not Connected" %} - {% if perms.dcim.add_cable %} -
- - -
- {% endif %} -
- {% endif %} -
+ {% if object.mark_connected %} +
+ + {% trans "Marked as connected" %} +
+ {% elif object.cable %} + {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:consoleserverport_trace' %} + {% else %} +
+ {% trans "Not Connected" %} + {% if perms.dcim.add_cable %} +
+ + +
+ {% endif %} +
+ {% endif %}
{% include 'dcim/inc/panels/inventory_items.html' %} {% plugin_right_page object %} diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index ef7bb79e6..b725b69ec 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -12,142 +12,136 @@
{% trans "Device" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Region" %}{% nested_tree object.site.region %}
{% trans "Site" %}{{ object.site|linkify }}
{% trans "Location" %}{% nested_tree object.location %}
{% trans "Rack" %} - {% if object.rack %} - {{ object.rack|linkify }} -
- - - -
- {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Position" %} - {% if object.parent_bay %} - {% with object.parent_bay.device as parent %} - {{ parent|linkify }} / {{ object.parent_bay }} - {% if parent.position %} - (U{{ parent.position|floatformat }} / {{ parent.get_face_display }}) - {% endif %} - {% endwith %} - {% 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" %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "GPS Coordinates" %} - {% if object.latitude and object.longitude %} - {% if config.MAPS_URL %} + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Region" %}{% nested_tree object.site.region %}
{% trans "Site" %}{{ object.site|linkify }}
{% trans "Location" %}{% nested_tree object.location %}
{% trans "Rack" %} + {% if object.rack %} + {{ object.rack|linkify }}
- - {% trans "Map It" %} + +
- {% endif %} - {{ object.latitude }}, {{ object.longitude }} {% else %} - {{ ''|placeholder }} + {{ ''|placeholder }} {% endif %} -
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Device Type" %} - {{ object.device_type|linkify:"get_full_name" }} ({{ object.device_type.u_height|floatformat }}U) -
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Airflow" %} - {{ object.get_airflow_display|placeholder }} -
{% trans "Serial Number" %}{{ object.serial|placeholder }}
{% trans "Asset Tag" %}{{ object.asset_tag|placeholder }}
{% trans "Config Template" %}{{ object.config_template|linkify|placeholder }}
- +
{% trans "Position" %} + {% if object.parent_bay %} + {% with object.parent_bay.device as parent %} + {{ parent|linkify }} / {{ object.parent_bay }} + {% if parent.position %} + (U{{ parent.position|floatformat }} / {{ parent.get_face_display }}) + {% endif %} + {% endwith %} + {% 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" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "GPS Coordinates" %} + {% if object.latitude and object.longitude %} + {% if config.MAPS_URL %} +
+ + {% trans "Map It" %} + +
+ {% endif %} + {{ object.latitude }}, {{ object.longitude }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Device Type" %} + {{ object.device_type|linkify:"get_full_name" }} ({{ object.device_type.u_height|floatformat }}U) +
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Airflow" %} + {{ object.get_airflow_display|placeholder }} +
{% trans "Serial Number" %}{{ object.serial|placeholder }}
{% trans "Asset Tag" %}{{ object.asset_tag|placeholder }}
{% trans "Config Template" %}{{ object.config_template|linkify|placeholder }}
{% if vc_members %}
-
- {% trans "Virtual Chassis" %} -
-
- - - - - - +
{% trans "Virtual Chassis" %}
+
{% trans "Device" %}{% trans "Position" %}{% trans "Master" %}{% trans "Priority" %}
+ + + + + + + {% for vc_member in vc_members %} + + + + + - {% for vc_member in vc_members %} - - - - - - - {% endfor %} -
{% trans "Device" %}{% trans "Position" %}{% trans "Master" %}{% trans "Priority" %}
+ {{ vc_member|linkify }} + + {% badge vc_member.vc_position show_empty=True %} + + {% if object.virtual_chassis.master == vc_member %}{% endif %} + + {{ vc_member.vc_priority|placeholder }} +
- {{ vc_member|linkify }} - - {% badge vc_member.vc_position show_empty=True %} - - {% if object.virtual_chassis.master == vc_member %}{% endif %} - - {{ vc_member.vc_priority|placeholder }} -
-
+ {% endfor %} +
{% trans "View Virtual Chassis" %} @@ -177,127 +171,121 @@
{% trans "Management" %}
-
- +
+ + + + + + + + + + + + + + + + + + + + + + + + + {% if object.cluster %} - - - - - - - - - - - - - + - - - - - - - - - {% if object.cluster %} - - - - - {% endif %} -
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %}{{ object.role|linkify }}
{% trans "Platform" %}{{ object.platform|linkify|placeholder }}
{% trans "Primary IPv4" %} + {% if object.primary_ip4 %} + {{ object.primary_ip4.address.ip }} + {% if object.primary_ip4.nat_inside %} + ({% trans "NAT for" %} {{ object.primary_ip4.nat_inside.address.ip }}) + {% elif object.primary_ip4.nat_outside.exists %} + ({% trans "NAT" %}: {% for nat in object.primary_ip4.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %}) + {% endif %} + {% copy_content "primary_ip4" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Primary IPv6" %} + {% if object.primary_ip6 %} + {{ object.primary_ip6.address.ip }} + {% if object.primary_ip6.nat_inside %} + ({% trans "NAT for" %} {{ object.primary_ip6.nat_inside.address.ip }}) + {% elif object.primary_ip6.nat_outside.exists %} + ({% trans "NAT" %}: {% for nat in object.primary_ip6.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %}) + {% endif %} + {% copy_content "primary_ip6" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
Out-of-band IP + {% if object.oob_ip %} + {{ object.oob_ip.address.ip }} + {% copy_content "oob_ip" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %}{{ object.role|linkify }}
{% trans "Platform" %}{{ object.platform|linkify|placeholder }}
{% trans "Primary IPv4" %}{% trans "Cluster" %} - {% if object.primary_ip4 %} - {{ object.primary_ip4.address.ip }} - {% if object.primary_ip4.nat_inside %} - ({% trans "NAT for" %} {{ object.primary_ip4.nat_inside.address.ip }}) - {% elif object.primary_ip4.nat_outside.exists %} - ({% trans "NAT" %}: {% for nat in object.primary_ip4.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %}) + {% if object.cluster.group %} + {{ object.cluster.group|linkify }} / {% endif %} - {% copy_content "primary_ip4" %} - {% else %} - {{ ''|placeholder }} - {% endif %} + {{ object.cluster|linkify }}
{% trans "Primary IPv6" %} - {% if object.primary_ip6 %} - {{ object.primary_ip6.address.ip }} - {% if object.primary_ip6.nat_inside %} - ({% trans "NAT for" %} {{ object.primary_ip6.nat_inside.address.ip }}) - {% elif object.primary_ip6.nat_outside.exists %} - ({% trans "NAT" %}: {% for nat in object.primary_ip6.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %}) - {% endif %} - {% copy_content "primary_ip6" %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
Out-of-band IP - {% if object.oob_ip %} - {{ object.oob_ip.address.ip }} - {% copy_content "oob_ip" %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Cluster" %} - {% if object.cluster.group %} - {{ object.cluster.group|linkify }} / - {% endif %} - {{ object.cluster|linkify }} -
-
+ {% endif %} +
{% if object.powerports.exists and object.poweroutlets.exists %}
-
- {% trans "Power Utilization" %} -
-
- - - - - - - - - {% for powerport in object.powerports.all %} - {% with utilization=powerport.get_power_draw powerfeed=powerport.connected_endpoints.0 %} +
{% trans "Power Utilization" %}
+
{% trans "Input" %}{% trans "Outlets" %}{% trans "Allocated" %}{% trans "Available" %}{% trans "Utilization" %}
+ + + + + + + + {% for powerport in object.powerports.all %} + {% with utilization=powerport.get_power_draw powerfeed=powerport.connected_endpoints.0 %} + + + + + {% if powerfeed.available_power %} + + + {% else %} + + + {% endif %} + + {% for leg in utilization.legs %} - - - + + + {% if powerfeed.available_power %} - - + {% with phase_available=powerfeed.available_power|divide:3 %} + + + {% endwith %} {% else %} {% endif %} - {% for leg in utilization.legs %} - - - - - {% if powerfeed.available_power %} - {% with phase_available=powerfeed.available_power|divide:3 %} - - - {% endwith %} - {% else %} - - - {% endif %} - - {% endfor %} - {% endwith %} - {% endfor %} -
{% trans "Input" %}{% trans "Outlets" %}{% trans "Allocated" %}{% trans "Available" %}{% trans "Utilization" %}
{{ powerport }}{{ utilization.outlet_count }}{{ utilization.allocated }}{% trans "VA" %}{{ powerfeed.available_power }}{% trans "VA" %}{% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}——
{{ powerport }}{{ utilization.outlet_count }}{{ utilization.allocated }}{% trans "VA" %} + {% trans "Leg" context "Leg of a power feed" %} {{ leg.name }} + {{ leg.outlet_count }}{{ leg.allocated }}{{ powerfeed.available_power }}{% trans "VA" %}{% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}{{ phase_available }}{% trans "VA" %}{% utilization_graph leg.allocated|percentage:phase_available %}— —
- {% trans "Leg" context "Leg of a power feed" %} {{ leg.name }} - {{ leg.outlet_count }}{{ leg.allocated }}{{ phase_available }}{% trans "VA" %}{% utilization_graph leg.allocated|percentage:phase_available %}——
-
+ {% endfor %} + {% endwith %} + {% endfor %} +
{% endif %}
@@ -317,26 +305,24 @@ {% include 'inc/panels/image_attachments.html' %}
{% trans "Dimensions" %}
-
- - - - - - - - - -
{% trans "Height" %} - {{ object.device_type.u_height }}U -
{% trans "Weight" %} - {% if object.total_weight %} - {{ object.total_weight|floatformat }} {% trans "Kilograms" %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
-
+ + + + + + + + + +
{% trans "Height" %} + {{ object.device_type.u_height }}U +
{% trans "Weight" %} + {% if object.total_weight %} + {{ object.total_weight|floatformat }} {% trans "Kilograms" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% if object.rack and object.position %}
diff --git a/netbox/templates/dcim/device/render_config.html b/netbox/templates/dcim/device/render_config.html index 5b545c125..bf53fdefb 100644 --- a/netbox/templates/dcim/device/render_config.html +++ b/netbox/templates/dcim/device/render_config.html @@ -9,22 +9,20 @@
{% trans "Config Template" %}
-
- - - - - - - - - - - - - -
{% trans "Config Template" %}{{ config_template|linkify|placeholder }}
{% trans "Data Source" %}{{ config_template.data_file.source|linkify|placeholder }}
{% trans "Data File" %}{{ config_template.data_file|linkify|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "Config Template" %}{{ config_template|linkify|placeholder }}
{% trans "Data Source" %}{{ config_template.data_file.source|linkify|placeholder }}
{% trans "Data File" %}{{ config_template.data_file|linkify|placeholder }}
diff --git a/netbox/templates/dcim/devicebay.html b/netbox/templates/dcim/devicebay.html index 4cdc0b258..c2173c86c 100644 --- a/netbox/templates/dcim/devicebay.html +++ b/netbox/templates/dcim/devicebay.html @@ -14,29 +14,25 @@
-
- {% trans "Device Bay" %} -
-
- - - - - - - - - - - - - - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Device Bay" %}
+ + + + + + + + + + + + + + + + + +
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -44,10 +40,7 @@
-
- {% trans "Installed Device" %} -
-
+
{% trans "Installed Device" %}
{% if object.installed_device %} {% with device=object.installed_device %} @@ -62,11 +55,10 @@
{% endwith %} {% else %} -
+
{% trans "None" %}
{% endif %} -
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html index 72bd3845f..6bb16c894 100644 --- a/netbox/templates/dcim/devicerole.html +++ b/netbox/templates/dcim/devicerole.html @@ -20,35 +20,31 @@
-
- {% trans "Device Role" %} -
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} -   -
{% trans "VM Role" %}{% checkmark object.vm_role %}
{% trans "Config Template" %}{{ object.config_template|linkify|placeholder }}
-
+
{% trans "Device Role" %}
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} +   +
{% trans "VM Role" %}{% checkmark object.vm_role %}
{% trans "Config Template" %}{{ object.config_template|linkify|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index add5f232f..ec5299f9b 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -8,94 +8,90 @@
-
- {% trans "Chassis" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + +
{% trans "Manufacturer" %}{{ object.manufacturer|linkify }}
{% trans "Model Name" %} - {{ object.model }}
- {{ object.slug }} -
{% trans "Part Number" %}{{ object.part_number|placeholder }}
{% trans "Default Platform" %}{{ object.default_platform|linkify }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Height (U" %}){{ object.u_height|floatformat }}
{% trans "Exclude From Utilization" %}){% checkmark object.exclude_from_utilization %}
{% trans "Full Depth" %}{% checkmark object.is_full_depth %}
{% trans "Weight" %} - {% if object.weight %} - {{ object.weight|floatformat }} {{ object.get_weight_unit_display }} +
{% trans "Chassis" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - -
{% trans "Manufacturer" %}{{ object.manufacturer|linkify }}
{% trans "Model Name" %} + {{ object.model }}
+ {{ object.slug }} +
{% trans "Part Number" %}{{ object.part_number|placeholder }}
{% trans "Default Platform" %}{{ object.default_platform|linkify }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Height (U" %}){{ object.u_height|floatformat }}
{% trans "Exclude From Utilization" %}){% checkmark object.exclude_from_utilization %}
{% trans "Full Depth" %}{% checkmark object.is_full_depth %}
{% trans "Weight" %} + {% if object.weight %} + {{ object.weight|floatformat }} {{ object.get_weight_unit_display }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Parent/Child" %} + {{ object.get_subdevice_role_display|placeholder }} +
{% trans "Airflow" %} + {{ object.get_airflow_display|placeholder }} +
{% trans "Front Image" %} + {% if object.front_image %} + + {{ object.front_image.name }} + {% else %} - {{ ''|placeholder }} + {{ ''|placeholder }} {% endif %} -
{% trans "Parent/Child" %} - {{ object.get_subdevice_role_display|placeholder }} -
{% trans "Airflow" %} - {{ object.get_airflow_display|placeholder }} -
{% trans "Front Image" %} - {% if object.front_image %} - - {{ object.front_image.name }} - - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Rear Image" %} - {% if object.rear_image %} - - {{ object.rear_image.name }} - - {% else %} - {{ ''|placeholder }} - {% endif %} -
- +
{% trans "Rear Image" %} + {% if object.rear_image %} + + {{ object.rear_image.name }} + + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html index 88139c22a..6a3375d39 100644 --- a/netbox/templates/dcim/frontport.html +++ b/netbox/templates/dcim/frontport.html @@ -14,55 +14,51 @@
-
- {% trans "Front Port" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Color" %} - {% if object.color %} -   - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Rear Port" %}{{ object.rear_port|linkify }}
{% trans "Rear Port Position" %}{{ object.rear_port_position }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Front Port" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Color" %} + {% if object.color %} +   + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Rear Port" %}{{ object.rear_port|linkify }}
{% trans "Rear Port Position" %}{{ object.rear_port_position }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -70,12 +66,9 @@
-
- {% trans "Connection" %} -
-
+
{% trans "Connection" %}
{% if object.mark_connected %} -
+
{% trans "Marked as Connected" %}
{% elif object.cable %} @@ -101,7 +94,7 @@ {% else %} -
+
{% trans "Not Connected" %} {% if perms.dcim.add_cable %}
@@ -132,7 +125,6 @@ {% endif %}
{% endif %} -
{% include 'dcim/inc/panels/inventory_items.html' %} {% plugin_right_page object %} diff --git a/netbox/templates/dcim/inc/connection_endpoints.html b/netbox/templates/dcim/inc/connection_endpoints.html index 4538b9f52..bc1da5489 100644 --- a/netbox/templates/dcim/inc/connection_endpoints.html +++ b/netbox/templates/dcim/inc/connection_endpoints.html @@ -1,5 +1,5 @@ {% load i18n %} - +
+ + + {% endfor %} + +
{% trans "Cable" %} diff --git a/netbox/templates/dcim/inc/panels/inventory_items.html b/netbox/templates/dcim/inc/panels/inventory_items.html index c022f254a..b18591562 100644 --- a/netbox/templates/dcim/inc/panels/inventory_items.html +++ b/netbox/templates/dcim/inc/panels/inventory_items.html @@ -3,43 +3,41 @@
{% trans "Inventory Items" %}
-
- - +
+ + + + + + + + + + {% for item in object.inventory_items.all %} - - - - + + + + - - - {% for item in object.inventory_items.all %} - - - - - - - {% empty %} - - - - {% endfor %} - -
{% trans "Name" %}{% trans "Label" %}{% trans "Role" %}
{% trans "Name" %}{% trans "Label" %}{% trans "Role" %}{{ item|linkify:"name" }}{{ item.label|placeholder }}{{ item.role|linkify|placeholder }} + {% if perms.dcim.change_inventoryitem %} + + + + {% endif %} + {% if perms.ipam.delete_inventoryitem %} + + + + {% endif %} +
{{ item|linkify:"name" }}{{ item.label|placeholder }}{{ item.role|linkify|placeholder }} - {% if perms.dcim.change_inventoryitem %} - - - - {% endif %} - {% if perms.ipam.delete_inventoryitem %} - - - - {% endif %} -
{% trans "None" %}
-
+ {% empty %} +
{% trans "None" %}
{% if perms.dcim.add_inventoryitem %} diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 72604c12b..6b4ea5f0d 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -25,96 +25,92 @@
{% trans "Interface" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Speed/Duplex" %} - {{ object.speed|humanize_speed|placeholder }} / - {{ object.get_duplex_display|placeholder }} -
{% trans "MTU" %}{{ object.mtu|placeholder }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Management Only" %}{% checkmark object.mgmt_only %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "PoE Mode" %}{{ object.get_poe_mode_display|placeholder }}
{% trans "PoE Type" %}{{ object.get_poe_type_display|placeholder }}
{% trans "802.1Q Mode" %}{{ object.get_mode_display|placeholder }}
{% trans "Transmit power (dBm)" %}{{ object.tx_power|placeholder }}
{% trans "Tunnel" %}{{ object.tunnel_termination.tunnel|linkify|placeholder }}
{% trans "L2VPN" %}{{ object.l2vpn_termination.l2vpn|linkify|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Speed/Duplex" %} + {{ object.speed|humanize_speed|placeholder }} / + {{ object.get_duplex_display|placeholder }} +
{% trans "MTU" %}{{ object.mtu|placeholder }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Management Only" %}{% checkmark object.mgmt_only %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "PoE Mode" %}{{ object.get_poe_mode_display|placeholder }}
{% trans "PoE Type" %}{{ object.get_poe_type_display|placeholder }}
{% trans "802.1Q Mode" %}{{ object.get_mode_display|placeholder }}
{% trans "Transmit power (dBm)" %}{{ object.tx_power|placeholder }}
{% trans "Tunnel" %}{{ object.tunnel_termination.tunnel|linkify|placeholder }}
{% trans "L2VPN" %}{{ object.l2vpn_termination.l2vpn|linkify|placeholder }}
{% trans "Related Interfaces" %}
-
- - - - - - - - - - - - - -
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% trans "Bridge" %}{{ object.bridge|linkify|placeholder }}
{% trans "LAG" %}{{ object.lag|linkify|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% trans "Bridge" %}{{ object.bridge|linkify|placeholder }}
{% trans "LAG" %}{{ object.lag|linkify|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -124,220 +120,211 @@ {% include 'inc/panel_table.html' with table=vdc_table heading="Virtual Device Contexts" %}
{% trans "Addressing" %}
-
- - - - - - - - - - - - - -
{% trans "MAC Address" %}{{ object.mac_address|placeholder }}
{% trans "WWN" %}{{ object.wwn|placeholder }}
{% trans "VRF" %}{{ object.vrf|linkify|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "MAC Address" %}{{ object.mac_address|placeholder }}
{% trans "WWN" %}{{ object.wwn|placeholder }}
{% trans "VRF" %}{{ object.vrf|linkify|placeholder }}
{% if not object.is_virtual %}
{% trans "Connection" %}
-
- {% if object.mark_connected %} -
- {% trans "Marked as Connected" %} -
- {% elif object.cable %} - {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:interface_trace' %} - {% elif object.wireless_link %} - + {% if object.mark_connected %} +
+ + {% trans "Marked as Connected" %} +
+ {% elif object.cable %} + {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:interface_trace' %} + {% elif object.wireless_link %} +
+ + + + + {% with peer_interface=object.link_peers.0 %} - - + + - {% with peer_interface=object.link_peers.0 %} - - - - - - - - - - - - - {% endwith %} -
{% trans "Wireless Link" %} + {{ object.wireless_link|linkify }} + + + +
{% trans "Wireless Link" %} - {{ object.wireless_link|linkify }} - - - - {% trans "Device" %}{{ peer_interface.device|linkify }}
{% trans "Device" %}{{ peer_interface.device|linkify }}
{% trans "Name" %}{{ peer_interface|linkify }}
{% trans "Type" %}{{ peer_interface.get_type_display }}
- {% else %} -
- {% trans "Not Connected" %} - {% if object.is_wired and perms.dcim.add_cable %} -
- - -
- {% elif object.is_wireless and perms.wireless.add_wirelesslink %} -
- - {% trans "Connect" %} - -
- {% endif %} -
- {% endif %} -
+ + {% trans "Name" %} + {{ peer_interface|linkify }} + + + {% trans "Type" %} + {{ peer_interface.get_type_display }} + + {% endwith %} + + {% else %} +
+ {% trans "Not Connected" %} + {% if object.is_wired and perms.dcim.add_cable %} +
+ + +
+ {% elif object.is_wireless and perms.wireless.add_wirelesslink %} +
+ + {% trans "Connect" %} + +
+ {% endif %} +
+ {% endif %}
{% endif %} {% if object.is_wireless %}
{% trans "Wireless" %}
-
- {% with peer=object.connected_endpoints.0 %} - - - - - - {% if peer %} - - {% endif %} - - + {% with peer=object.connected_endpoints.0 %} +
{% trans "Local" %}{% trans "Peer" %}
+ - - + + {% if peer %} - + {% endif %} - - - - {% if peer %} - - {{ peer.get_rf_channel_display|placeholder }} - + + + + + {% if peer %} + + {% endif %} + + + + + {% if peer %} + + {{ peer.get_rf_channel_display|placeholder }} + + {% endif %} + + + + - - - + {% if peer %} + + {% if peer.rf_channel_frequency %} + {{ peer.rf_channel_frequency|floatformat:"-2" }} {% trans "MHz" %} {% else %} {{ ''|placeholder }} {% endif %} - {% if peer %} - - {% if peer.rf_channel_frequency %} - {{ peer.rf_channel_frequency|floatformat:"-2" }} {% trans "MHz" %} - {% else %} - {{ ''|placeholder }} - {% endif %} - + {% endif %} + + + + - - - + {% if peer %} + + {% if peer.rf_channel_width %} + {{ peer.rf_channel_width|floatformat:"-3" }} {% trans "MHz" %} {% else %} {{ ''|placeholder }} {% endif %} - {% if peer %} - - {% if peer.rf_channel_width %} - {{ peer.rf_channel_width|floatformat:"-3" }} {% trans "MHz" %} - {% else %} - {{ ''|placeholder }} - {% endif %} - - {% endif %} - -
{% trans "Role" %}{{ object.get_rf_role_display|placeholder }}{% trans "Local" %}{{ peer.get_rf_role_display|placeholder }}{% trans "Peer" %}
{% trans "Channel" %}{{ object.get_rf_channel_display|placeholder }}
{% trans "Role" %}{{ object.get_rf_role_display|placeholder }}{{ peer.get_rf_role_display|placeholder }}
{% trans "Channel" %}{{ object.get_rf_channel_display|placeholder }}
{% trans "Channel Frequency" %} + {% if object.rf_channel_frequency %} + {{ object.rf_channel_frequency|floatformat:"-2" }} {% trans "MHz" %} + {% else %} + {{ ''|placeholder }} {% endif %} -
{% trans "Channel Frequency" %} - {% if object.rf_channel_frequency %} - {{ object.rf_channel_frequency|floatformat:"-2" }} {% trans "MHz" %} +
{% trans "Channel Width" %} + {% if object.rf_channel_width %} + {{ object.rf_channel_width|floatformat:"-3" }} {% trans "MHz" %} + {% else %} + {{ ''|placeholder }} {% endif %} -
{% trans "Channel Width" %} - {% if object.rf_channel_width %} - {{ object.rf_channel_width|floatformat:"-3" }} {% trans "MHz" %} +
- {% endwith %} -
+ {% endif %} + + + {% endwith %}
{% trans "Wireless LANs" %}
-
- - +
+ + + + + + + + {% for wlan in object.wireless_lans.all %} - - + + - - - {% for wlan in object.wireless_lans.all %} - - - - - {% empty %} - - - - {% endfor %} - -
{% trans "Group" %}{% trans "SSID" %}
{% trans "Group" %}{% trans "SSID" %}{{ wlan.group|linkify|placeholder }}{{ wlan|linkify:"ssid" }}
{{ wlan.group|linkify|placeholder }}{{ wlan|linkify:"ssid" }}
{% trans "None" %}
-
+ {% empty %} + + {% trans "None" %} + + {% endfor %} + +
{% endif %} {% if object.is_lag %}
{% trans "LAG Members" %}
-
- - +
+ + + + + + + + + {% for member in object.member_interfaces.all %} - - - + + + - - - {% for member in object.member_interfaces.all %} - - - - - - {% empty %} - - - - {% endfor %} - -
{% trans "Parent" %}{% trans "Interface" %}{% trans "Type" %}
{% trans "Parent" %}{% trans "Interface" %}{% trans "Type" %}{{ member.device|linkify }}{{ member|linkify }}{{ member.get_type_display }}
{{ member.device|linkify }}{{ member|linkify }}{{ member.get_type_display }}
{% trans "No member interfaces" %}
-
+ {% empty %} + + {% trans "No member interfaces" %} + + {% endfor %} + +
{% endif %} {% include 'ipam/inc/panels/fhrp_groups.html' %} diff --git a/netbox/templates/dcim/inventoryitem.html b/netbox/templates/dcim/inventoryitem.html index 7250ad9f8..29d4c3ef5 100644 --- a/netbox/templates/dcim/inventoryitem.html +++ b/netbox/templates/dcim/inventoryitem.html @@ -15,54 +15,52 @@
{% trans "Inventory Item" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Parent Item" %}{{ object.parent|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Role" %}{{ object.role|linkify|placeholder }}
{% trans "Component" %}{{ object.component|linkify|placeholder }}
{% trans "Manufacturer" %}{{ object.manufacturer|linkify|placeholder }}
{% trans "Part ID" %}{{ object.part_id|placeholder }}
{% trans "Serial" %}{{ object.serial|placeholder }}
{% trans "Asset Tag" %}{{ object.asset_tag|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Parent Item" %}{{ object.parent|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Role" %}{{ object.role|linkify|placeholder }}
{% trans "Component" %}{{ object.component|linkify|placeholder }}
{% trans "Manufacturer" %}{{ object.manufacturer|linkify|placeholder }}
{% trans "Part ID" %}{{ object.part_id|placeholder }}
{% trans "Serial" %}{{ object.serial|placeholder }}
{% trans "Asset Tag" %}{{ object.asset_tag|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/dcim/inventoryitemrole.html b/netbox/templates/dcim/inventoryitemrole.html index 083effb5e..9dd3b5b46 100644 --- a/netbox/templates/dcim/inventoryitemrole.html +++ b/netbox/templates/dcim/inventoryitemrole.html @@ -13,30 +13,28 @@
{% trans "Inventory Item Role" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} -   -
{% trans "Inventory Items" %} - {{ inventoryitem_count }} -
-
+ + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} +   +
{% trans "Inventory Items" %} + {{ inventoryitem_count }} +
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html index 56f8854df..818d1d6ec 100644 --- a/netbox/templates/dcim/location.html +++ b/netbox/templates/dcim/location.html @@ -23,42 +23,38 @@
-
- {% trans "Location" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Site" %}{{ object.site|linkify }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
-
+
{% trans "Location" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Site" %}{{ object.site|linkify }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/custom_fields.html' %} diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html index abde714f0..527dcf399 100644 --- a/netbox/templates/dcim/manufacturer.html +++ b/netbox/templates/dcim/manufacturer.html @@ -30,21 +30,17 @@
-
- {% trans "Manufacturer" %} -
-
- - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Manufacturer" %}
+ + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/dcim/module.html b/netbox/templates/dcim/module.html index 677717478..2180a83a3 100644 --- a/netbox/templates/dcim/module.html +++ b/netbox/templates/dcim/module.html @@ -49,38 +49,36 @@
{% trans "Module" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Device Type" %}{{ object.device.device_type|linkify }}
{% trans "Module Type" %}{{ object.module_type|linkify }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Serial Number" %}{{ object.serial|placeholder }}
{% trans "Asset Tag" %}{{ object.asset_tag|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Device Type" %}{{ object.device.device_type|linkify }}
{% trans "Module Type" %}{{ object.module_type|linkify }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Serial Number" %}{{ object.serial|placeholder }}
{% trans "Asset Tag" %}{{ object.asset_tag|placeholder }}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/comments.html' %} diff --git a/netbox/templates/dcim/modulebay.html b/netbox/templates/dcim/modulebay.html index c3e8813f0..c6e814ffe 100644 --- a/netbox/templates/dcim/modulebay.html +++ b/netbox/templates/dcim/modulebay.html @@ -15,32 +15,30 @@
{% trans "Module Bay" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Device" %} - {{ object.device }} -
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Position" %}{{ object.position|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Device" %} + {{ object.device }} +
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Position" %}{{ object.position|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} @@ -49,7 +47,6 @@ {% include 'inc/panels/custom_fields.html' %}
{% trans "Installed Module" %}
-
{% if object.installed_module %} {% with module=object.installed_module %} @@ -76,9 +73,8 @@
{% endwith %} {% else %} -
{% trans "None" %}
+
{% trans "None" %}
{% endif %} -
{% plugin_right_page object %}
diff --git a/netbox/templates/dcim/moduletype.html b/netbox/templates/dcim/moduletype.html index 500f3b7dc..77feece97 100644 --- a/netbox/templates/dcim/moduletype.html +++ b/netbox/templates/dcim/moduletype.html @@ -9,36 +9,34 @@
{% trans "Module Type" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Manufacturer" %}{{ object.manufacturer|linkify }}
{% trans "Model Name" %}{{ object.model }}
{% trans "Part Number" %}{{ object.part_number|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Weight" %} - {% if object.weight %} - {{ object.weight|floatformat }} {{ object.get_weight_unit_display }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Manufacturer" %}{{ object.manufacturer|linkify }}
{% trans "Model Name" %}{{ object.model }}
{% trans "Part Number" %}{{ object.part_number|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Weight" %} + {% if object.weight %} + {{ object.weight|floatformat }} {{ object.get_weight_unit_display }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/comments.html' %} diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html index 5a37dc6af..07dad3d0e 100644 --- a/netbox/templates/dcim/platform.html +++ b/netbox/templates/dcim/platform.html @@ -23,29 +23,25 @@
-
- {% trans "Platform" %} -
-
- - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Manufacturer" %}{{ object.manufacturer|linkify|placeholder }}
{% trans "Config Template" %}{{ object.config_template|linkify|placeholder }}
-
+
{% trans "Platform" %}
+ + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Manufacturer" %}{{ object.manufacturer|linkify|placeholder }}
{% trans "Config Template" %}{{ object.config_template|linkify|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 40e6cdb54..367683bf0 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -18,96 +18,88 @@
-
- {% trans "Power Feed" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% with utilization=object.connected_endpoints.0.get_power_draw %} - {% if utilization %} - - {% else %} - - {% endif %} - {% endwith %} - -
{% trans "Power Panel" %}{{ object.power_panel|linkify }}
{% trans "Rack" %}{{ object.rack|linkify|placeholder }}
{% trans "Type" %}{% badge object.get_type_display bg_color=object.get_type_color %}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Connected Device" %} - {% if object.connected_endpoints %} - {{ object.connected_endpoints.0.device|linkify }} ({{ object.connected_endpoints.0|linkify:"name" }}) - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Utilization (Allocated" %}) - {{ utilization.allocated }}{% trans "VA" %} / {{ object.available_power }}{% trans "VA" %} - {% if object.available_power > 0 %} - {% utilization_graph utilization.allocated|percentage:object.available_power %} - {% endif %} - {{ ''|placeholder }}
-
+
{% trans "Power Feed" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% with utilization=object.connected_endpoints.0.get_power_draw %} + {% if utilization %} + + {% else %} + + {% endif %} + {% endwith %} + +
{% trans "Power Panel" %}{{ object.power_panel|linkify }}
{% trans "Rack" %}{{ object.rack|linkify|placeholder }}
{% trans "Type" %}{% badge object.get_type_display bg_color=object.get_type_color %}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Connected Device" %} + {% if object.connected_endpoints %} + {{ object.connected_endpoints.0.device|linkify }} ({{ object.connected_endpoints.0|linkify:"name" }}) + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Utilization (Allocated" %}) + {{ utilization.allocated }}{% trans "VA" %} / {{ object.available_power }}{% trans "VA" %} + {% if object.available_power > 0 %} + {% utilization_graph utilization.allocated|percentage:object.available_power %} + {% endif %} + {{ ''|placeholder }}
-
- {% trans "Electrical Characteristics" %} -
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Supply" %}{{ object.get_supply_display }}
{% trans "Voltage" %}{{ object.voltage }}{% trans "V" context "Abbreviation for volts" %}
{% trans "Amperage" %}{{ object.amperage }}{% trans "A" context "Abbreviation for amperes" %}
{% trans "Phase" %}{{ object.get_phase_display }}
{% trans "Max Utilization" %}{{ object.max_utilization }}%
-
+
{% trans "Electrical Characteristics" %}
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Supply" %}{{ object.get_supply_display }}
{% trans "Voltage" %}{{ object.voltage }}{% trans "V" context "Abbreviation for volts" %}
{% trans "Amperage" %}{{ object.amperage }}{% trans "A" context "Abbreviation for amperes" %}
{% trans "Phase" %}{{ object.get_phase_display }}
{% trans "Max Utilization" %}{{ object.max_utilization }}%
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -116,27 +108,26 @@
{% trans "Connection" %}
-
- {% if object.mark_connected %} -
- {% trans "Marked as connected" %} -
- {% elif object.cable %} - {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:powerfeed_trace' %} - {% else %} -
- {% trans "Not connected" %} -
- {% endif %} -
+ {% if object.mark_connected %} +
+ + {% trans "Marked as connected" %} +
+ {% elif object.cable %} + {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:powerfeed_trace' %} + {% else %} +
+ {% trans "Not connected" %} +
+ {% endif %} {% if not object.mark_connected and not object.cable %} -
- {% if perms.dcim.add_cable %} - - {% trans "Connect" %} - - {% endif %} -
+
+ {% if perms.dcim.add_cable %} + + {% trans "Connect" %} + + {% endif %} +
{% endif %}
{% include 'inc/panels/comments.html' %} diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html index 800eb056b..0e1b07706 100644 --- a/netbox/templates/dcim/poweroutlet.html +++ b/netbox/templates/dcim/poweroutlet.html @@ -14,45 +14,41 @@
-
- {% trans "Power Outlet" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Power Port" %}{{ object.power_port|linkify|placeholder }}
{% trans "Feed Leg" %}{{ object.get_feed_leg_display|placeholder }}
-
+
{% trans "Power Outlet" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Power Port" %}{{ object.power_port|linkify|placeholder }}
{% trans "Feed Leg" %}{{ object.get_feed_leg_display|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -61,24 +57,23 @@
{% trans "Connection" %}
-
- {% if object.mark_connected %} -
- {% trans "Marked as Connected" %} -
- {% elif object.cable %} - {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:poweroutlet_trace' %} - {% else %} -
- {% trans "Not Connected" %} - {% if perms.dcim.add_cable %} - - {% trans "Connect" %} - - {% endif %} -
- {% endif %} -
+ {% if object.mark_connected %} +
+ + {% trans "Marked as Connected" %} +
+ {% elif object.cable %} + {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:poweroutlet_trace' %} + {% else %} +
+ {% trans "Not Connected" %} + {% if perms.dcim.add_cable %} + + {% trans "Connect" %} + + {% endif %} +
+ {% endif %}
{% include 'dcim/inc/panels/inventory_items.html' %} {% plugin_right_page object %} diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html index 2a28d5b15..18212975b 100644 --- a/netbox/templates/dcim/powerpanel.html +++ b/netbox/templates/dcim/powerpanel.html @@ -17,22 +17,20 @@
{% trans "Power Panel" %}
-
- - - - - - - - - - - - - -
{% trans "Site" %}{{ object.site|linkify }}
{% trans "Location" %}{{ object.location|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "Site" %}{{ object.site|linkify }}
{% trans "Location" %}{{ object.location|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/comments.html' %} diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html index e0699fade..77352f99e 100644 --- a/netbox/templates/dcim/powerport.html +++ b/netbox/templates/dcim/powerport.html @@ -14,45 +14,41 @@
-
- {% trans "Power Port" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Maximum Draw" %}{{ object.maximum_draw|placeholder }}
{% trans "Allocated Draw" %}{{ object.allocated_draw|placeholder }}
-
+
{% trans "Power Port" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Maximum Draw" %}{{ object.maximum_draw|placeholder }}
{% trans "Allocated Draw" %}{{ object.allocated_draw|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -61,34 +57,33 @@
{% trans "Connection" %}
-
- {% if object.mark_connected %} -
- {% trans "Marked as Connected" %} -
- {% elif object.cable %} - {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:powerport_trace' %} - {% else %} -
- {% trans "Not Connected" %} - {% if perms.dcim.add_cable %} - - - - - {% endif %} -
- {% endif %} -
+ {% if object.mark_connected %} +
+ + {% trans "Marked as Connected" %} +
+ {% elif object.cable %} + {% include 'dcim/inc/connection_endpoints.html' with trace_url='dcim:powerport_trace' %} + {% else %} +
+ {% trans "Not Connected" %} + {% if perms.dcim.add_cable %} + + + + + {% endif %} +
+ {% endif %}
{% include 'dcim/inc/panels/inventory_items.html' %} {% plugin_right_page object %} diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index a3ed6c6ad..97be5e839 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -10,156 +10,150 @@
-
- {% trans "Rack" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Region" %} - {% nested_tree object.site.region %} -
{% trans "Site" %}{{ object.site|linkify }}
{% trans "Location" %}{% nested_tree object.location %}
{% trans "Facility ID" %}{{ object.facility_id|placeholder }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %}{{ object.role|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Serial Number" %}{{ object.serial|placeholder }}
{% trans "Asset Tag" %}{{ object.asset_tag|placeholder }}
{% trans "Space Utilization" %}{% utilization_graph object.get_utilization %}
{% trans "Power Utilization" %}{% utilization_graph object.get_power_utilization %}
-
+
{% trans "Rack" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Region" %} + {% nested_tree object.site.region %} +
{% trans "Site" %}{{ object.site|linkify }}
{% trans "Location" %}{% nested_tree object.location %}
{% trans "Facility ID" %}{{ object.facility_id|placeholder }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %}{{ object.role|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Serial Number" %}{{ object.serial|placeholder }}
{% trans "Asset Tag" %}{{ object.asset_tag|placeholder }}
{% trans "Space Utilization" %}{% utilization_graph object.get_utilization %}
{% trans "Power Utilization" %}{% utilization_graph object.get_power_utilization %}
{% trans "Dimensions" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Type" %} - {% if object.type %} - {{ object.get_type_display }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Width" %}{{ object.get_width_display }}
{% trans "Height" %}{{ object.u_height }}U ({% if object.desc_units %}{% trans "descending" %}{% else %}{% trans "ascending" %}{% endif %})
{% trans "Starting Unit" %} - {{ object.starting_unit }} -
{% trans "Outer Width" %} - {% if object.outer_width %} - {{ object.outer_width }} {{ object.get_outer_unit_display }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Outer Depth" %} - {% if object.outer_depth %} - {{ object.outer_depth }} {{ object.get_outer_unit_display }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Mounting Depth" %} - {% if object.mounting_depth %} - {{ object.mounting_depth }} {% trans "Millimeters" %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Rack Weight" %} - {% if object.weight %} - {{ object.weight|floatformat }} {{ object.get_weight_unit_display }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Maximum Weight" %} - {% if object.max_weight %} - {{ object.max_weight }} {{ object.get_weight_unit_display }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Total Weight" %} - {{ object.total_weight|floatformat }} {% trans "Kilograms" %} - ({{ object.total_weight|kg_to_pounds|floatformat }} {% trans "Pounds" %}) -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Type" %} + {% if object.type %} + {{ object.get_type_display }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Width" %}{{ object.get_width_display }}
{% trans "Height" %}{{ object.u_height }}U ({% if object.desc_units %}{% trans "descending" %}{% else %}{% trans "ascending" %}{% endif %})
{% trans "Starting Unit" %} + {{ object.starting_unit }} +
{% trans "Outer Width" %} + {% if object.outer_width %} + {{ object.outer_width }} {{ object.get_outer_unit_display }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Outer Depth" %} + {% if object.outer_depth %} + {{ object.outer_depth }} {{ object.get_outer_unit_display }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Mounting Depth" %} + {% if object.mounting_depth %} + {{ object.mounting_depth }} {% trans "Millimeters" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Rack Weight" %} + {% if object.weight %} + {{ object.weight|floatformat }} {{ object.get_weight_unit_display }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Maximum Weight" %} + {% if object.max_weight %} + {{ object.max_weight }} {{ object.get_weight_unit_display }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Total Weight" %} + {{ object.total_weight|floatformat }} {% trans "Kilograms" %} + ({{ object.total_weight|kg_to_pounds|floatformat }} {% trans "Pounds" %}) +
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/dcim/rackreservation.html b/netbox/templates/dcim/rackreservation.html index 3d145145f..63a4da733 100644 --- a/netbox/templates/dcim/rackreservation.html +++ b/netbox/templates/dcim/rackreservation.html @@ -16,61 +16,53 @@
-
- {% trans "Rack" %} -
-
- - - - - - - - - - - - - - - - - -
{% trans "Region" %} - {% nested_tree object.rack.site.region %} -
{% trans "Site" %}{{ object.rack.site|linkify }}
{% trans "Location" %}{{ object.rack.location|linkify|placeholder }}
{% trans "Rack" %}{{ object.rack|linkify }}
-
+
{% trans "Rack" %}
+ + + + + + + + + + + + + + + + + +
{% trans "Region" %} + {% nested_tree object.rack.site.region %} +
{% trans "Site" %}{{ object.rack.site|linkify }}
{% trans "Location" %}{{ object.rack.location|linkify|placeholder }}
{% trans "Rack" %}{{ object.rack|linkify }}
-
- {% trans "Reservation Details" %} -
-
- - - - - - - - - - - - - - - - - -
{% trans "Units" %}{{ object.unit_list }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "User" %}{{ object.user }}
{% trans "Description" %}{{ object.description }}
-
+
{% trans "Reservation Details" %}
+ + + + + + + + + + + + + + + + + +
{% trans "Units" %}{{ object.unit_list }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "User" %}{{ object.user }}
{% trans "Description" %}{{ object.description }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html index 22865b505..6aa72598e 100644 --- a/netbox/templates/dcim/rackrole.html +++ b/netbox/templates/dcim/rackrole.html @@ -16,27 +16,23 @@
-
- {% trans "Rack Role" %} -
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} -   -
-
+
{% trans "Rack Role" %}
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Color" %} +   +
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html index e99eaa3a8..d0d45ac67 100644 --- a/netbox/templates/dcim/rearport.html +++ b/netbox/templates/dcim/rearport.html @@ -14,51 +14,47 @@
-
- {% trans "Rear Port" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Color" %} - {% if object.color %} -   - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Positions" %}{{ object.positions }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Rear Port" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Module" %}{{ object.module|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Color" %} + {% if object.color %} +   + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Positions" %}{{ object.positions }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -66,12 +62,9 @@
-
- {% trans "Connection" %} -
-
+
{% trans "Connection" %}
{% if object.mark_connected %} -
+
{% trans "Marked as Connected" %}
{% elif object.cable %} @@ -97,7 +90,7 @@ {% else %} -
+
{% trans "Not connected" %} {% if perms.dcim.add_cable %} @@ -122,7 +115,6 @@ {% endif %}
{% endif %} -
{% include 'dcim/inc/panels/inventory_items.html' %} {% plugin_right_page object %} diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html index 1c86e8cfd..bf8bae643 100644 --- a/netbox/templates/dcim/region.html +++ b/netbox/templates/dcim/region.html @@ -24,22 +24,20 @@
{% trans "Region" %}
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/custom_fields.html' %} diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index fc10b3451..7c79e9661 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -25,92 +25,90 @@
{% trans "Site" %}
-
- - - - - - - - - - - - - - - - + +
{% trans "Region" %} - {% nested_tree object.region %} -
{% trans "Group" %} - {% nested_tree object.group %} -
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - -
{% trans "Region" %} + {% nested_tree object.region %} +
{% trans "Group" %} + {% nested_tree object.group %} +
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Facility" %}{{ object.facility|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Time Zone" %} + {% if object.time_zone %} + {{ object.time_zone }} ({% trans "UTC" %} {{ object.time_zone|tzoffset }})
+ {% trans "Site time" %}: {% timezone object.time_zone %}{% annotated_now %}{% endtimezone %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Physical Address" %} + {% if object.physical_address %} + {% if config.MAPS_URL %} +
+ + {% trans "Map" %} + +
{% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Facility" %}{{ object.facility|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Time Zone" %} - {% if object.time_zone %} - {{ object.time_zone }} ({% trans "UTC" %} {{ object.time_zone|tzoffset }})
- {% trans "Site time" %}: {% timezone object.time_zone %}{% annotated_now %}{% endtimezone %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Physical Address" %} - {% if object.physical_address %} - {% if config.MAPS_URL %} -
- - {% trans "Map" %} - -
+ {{ object.physical_address|linebreaksbr }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Shipping Address" %}{{ object.shipping_address|linebreaksbr|placeholder }}
{% trans "GPS Coordinates" %} + {% if object.latitude and object.longitude %} + {% if config.MAPS_URL %} +
+ + {% trans "Map It" %} + +
{% endif %} - {{ object.physical_address|linebreaksbr }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Shipping Address" %}{{ object.shipping_address|linebreaksbr|placeholder }}
{% trans "GPS Coordinates" %} - {% if object.latitude and object.longitude %} - {% if config.MAPS_URL %} -
- - {% trans "Map It" %} - -
- {% endif %} - {{ object.latitude }}, {{ object.longitude }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
- + {{ object.latitude }}, {{ object.longitude }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html index 46855c6f9..1bd45f87f 100644 --- a/netbox/templates/dcim/sitegroup.html +++ b/netbox/templates/dcim/sitegroup.html @@ -24,22 +24,20 @@
{% trans "Site Group" %}
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/custom_fields.html' %} diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html index 1c6bdd353..153249bb5 100644 --- a/netbox/templates/dcim/virtualchassis.html +++ b/netbox/templates/dcim/virtualchassis.html @@ -18,32 +18,30 @@
{% trans "Virtual Chassis" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Domain" %}{{ object.domain|placeholder }}
{% trans "Master" %}{{ object.master|linkify }}
{% trans "Description" %}{{ object.description|placeholder }}
Members - {% if object.member_count %} - {{ object.member_count }} - {% else %} - {{ object.member_count }} - {% endif %} -
-
+ + + + + + + + + + + + + + + + + +
{% trans "Domain" %}{{ object.domain|placeholder }}
{% trans "Master" %}{{ object.master|linkify }}
{% trans "Description" %}{{ object.description|placeholder }}
Members + {% if object.member_count %} + {{ object.member_count }} + {% else %} + {{ object.member_count }} + {% endif %} +
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/custom_fields.html' %} @@ -52,34 +50,34 @@
{% trans "Members" %}
-
- +
+ - {% for vc_member in members %} - - - - - - - {% endfor %} -
{% trans "Device" %} {% trans "Position" %} {% trans "Master" %} {% trans "Priority" %}
- {{ vc_member|linkify }} - - {% badge vc_member.vc_position show_empty=True %} - - {% if object.master == vc_member %} - {% checkmark True %} - {% endif %} - - {{ vc_member.vc_priority|placeholder }} -
-
+ + {% for vc_member in members %} + + + {{ vc_member|linkify }} + + + {% badge vc_member.vc_position show_empty=True %} + + + {% if object.master == vc_member %} + {% checkmark True %} + {% endif %} + + + {{ vc_member.vc_priority|placeholder }} + + + {% endfor %} + {% if perms.dcim.change_virtualchassis %}
diff --git a/netbox/templates/dcim/virtualdevicecontext.html b/netbox/templates/dcim/virtualdevicecontext.html index b337097e8..78181a0ed 100644 --- a/netbox/templates/dcim/virtualdevicecontext.html +++ b/netbox/templates/dcim/virtualdevicecontext.html @@ -12,62 +12,58 @@
-
- {% trans "Virtual Device Context" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Identifier" %}{{ object.identifier|placeholder }}
{% trans "Primary IPv4" %} - {% if object.primary_ip4 %} - {{ object.primary_ip4 }} - {% copy_content "primary_ip4" %} - {% else %} - — - {% endif %} -
{% trans "Primary IPv6" %} - {% if object.primary_ip6 %} - {{ object.primary_ip6 }} - {% copy_content "primary_ip6" %} - {% else %} - — - {% endif %} -
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Interfaces" %} - {{ object.interfaces.count }} -
-
+
{% trans "Virtual Device Context" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Device" %}{{ object.device|linkify }}
{% trans "Identifier" %}{{ object.identifier|placeholder }}
{% trans "Primary IPv4" %} + {% if object.primary_ip4 %} + {{ object.primary_ip4 }} + {% copy_content "primary_ip4" %} + {% else %} + — + {% endif %} +
{% trans "Primary IPv6" %} + {% if object.primary_ip6 %} + {{ object.primary_ip6 }} + {% copy_content "primary_ip6" %} + {% else %} + — + {% endif %} +
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Interfaces" %} + {{ object.interfaces.count }} +
{% plugin_left_page object %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/extras/configcontext.html b/netbox/templates/extras/configcontext.html index f1d735cfd..2c7e0200d 100644 --- a/netbox/templates/extras/configcontext.html +++ b/netbox/templates/extras/configcontext.html @@ -8,76 +8,72 @@
{% trans "Config Context" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Weight" %}{{ object.weight }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Active" %}{% checkmark object.is_active %}
{% trans "Data Source" %} - {% if object.data_source %} - {{ object.data_source }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Data File" %} - {% if object.data_file %} - {{ object.data_file }} - {% elif object.data_path %} -
- -
- {{ object.data_path }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Data Synced" %}{{ object.data_synced|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Weight" %}{{ object.weight }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Active" %}{% checkmark object.is_active %}
{% trans "Data Source" %} + {% if object.data_source %} + {{ object.data_source }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Data File" %} + {% if object.data_file %} + {{ object.data_file }} + {% elif object.data_path %} +
+ +
+ {{ object.data_path }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Data Synced" %}{{ object.data_synced|placeholder }}
{% trans "Assignment" %}
-
- - {% for title, objects in assigned_objects %} - - - - - {% endfor %} -
{{ title }} -
    - {% for object in objects %} -
  • {{ object|linkify }}
    • - {% empty %} -
  • {% trans "None" %}
    • - {% endfor %} -
-
-
+ + {% for title, objects in assigned_objects %} + + + + + {% endfor %} +
{{ title }} +
    + {% for object in objects %} +
  • {{ object|linkify }}
    • + {% empty %} +
  • {% trans "None" %}
    • + {% endfor %} +
+
diff --git a/netbox/templates/extras/configtemplate.html b/netbox/templates/extras/configtemplate.html index ef2ae4f51..ea96e2ea6 100644 --- a/netbox/templates/extras/configtemplate.html +++ b/netbox/templates/extras/configtemplate.html @@ -8,47 +8,45 @@
{% trans "Config Template" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Data Source" %} - {% if object.data_source %} - {{ object.data_source }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Data File" %} - {% if object.data_file %} - {{ object.data_file }} - {% elif object.data_path %} -
- -
- {{ object.data_path }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Data Synced" %}{{ object.data_synced|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Data Source" %} + {% if object.data_source %} + {{ object.data_source }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Data File" %} + {% if object.data_file %} + {{ object.data_file }} + {% elif object.data_path %} +
+ +
+ {{ object.data_path }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Data Synced" %}{{ object.data_synced|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/extras/customfield.html b/netbox/templates/extras/customfield.html index 35b356ae6..ca6988152 100644 --- a/netbox/templates/extras/customfield.html +++ b/netbox/templates/extras/customfield.html @@ -7,127 +7,117 @@
-
- {% trans "Custom Field" %} -
-
- +
{% trans "Custom Field" %}
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + {% if object.choice_set %} - - + + - - - - - - - - - - - - - - - - - - - - - - - - - {% if object.choice_set %} - - - - - {% endif %} - - - - -
{% trans "Name" %}{{ object.name }}
Type + {{ object.get_type_display }} + {% if object.object_type %}({{ object.object_type.model|bettertitle }}){% endif %} +
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Group Name" %}{{ object.group_name|placeholder }}
{% trans "Description" %}{{ object.description|markdown|placeholder }}
{% trans "Required" %}{% checkmark object.required %}
{% trans "Cloneable" %}{% checkmark object.is_cloneable %}
{% trans "Name" %}{{ object.name }}{% trans "Choice Set" %}{{ object.choice_set|linkify }} ({{ object.choice_set.choices|length }} choices)
Type - {{ object.get_type_display }} - {% if object.object_type %}({{ object.object_type.model|bettertitle }}){% endif %} -
{% trans "Label" %}{{ object.label|placeholder }}
{% trans "Group Name" %}{{ object.group_name|placeholder }}
{% trans "Description" %}{{ object.description|markdown|placeholder }}
{% trans "Required" %}{% checkmark object.required %}
{% trans "Cloneable" %}{% checkmark object.is_cloneable %}
{% trans "Choice Set" %}{{ object.choice_set|linkify }} ({{ object.choice_set.choices|length }} choices)
{% trans "Default Value" %}{{ object.default }}
-
+ {% endif %} + + {% trans "Default Value" %} + {{ object.default }} + +
{% trans "Behavior" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Search Weight" %} - {% if object.search_weight %} - {{ object.search_weight }} - {% else %} - {% trans "Disabled" %} - {% endif %} -
{% trans "Filter Logic" %}{{ object.get_filter_logic_display }}
{% trans "Display Weight" %}{{ object.weight }}
{% trans "UI Visible" %}{{ object.get_ui_visible_display }}
{% trans "UI Editable" %}{{ object.get_ui_editable_display }}
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Search Weight" %} + {% if object.search_weight %} + {{ object.search_weight }} + {% else %} + {% trans "Disabled" %} + {% endif %} +
{% trans "Filter Logic" %}{{ object.get_filter_logic_display }}
{% trans "Display Weight" %}{{ object.weight }}
{% trans "UI Visible" %}{{ object.get_ui_visible_display }}
{% trans "UI Editable" %}{{ object.get_ui_editable_display }}
{% plugin_left_page object %}
{% trans "Object Types" %}
-
- - {% for ct in object.content_types.all %} - - - - {% endfor %} -
{{ ct }}
-
+ + {% for ct in object.content_types.all %} + + + + {% endfor %} +
{{ ct }}
{% trans "Validation Rules" %}
-
- - - - - - - - - - - - - -
{% trans "Minimum Value" %}{{ object.validation_minimum|placeholder }}
{% trans "Maximum Value" %}{{ object.validation_maximum|placeholder }}
{% trans "Regular Expression" %} - {% if object.validation_regex %} - {{ object.validation_regex }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
-
+ + + + + + + + + + + + + +
{% trans "Minimum Value" %}{{ object.validation_minimum|placeholder }}
{% trans "Maximum Value" %}{{ object.validation_maximum|placeholder }}
{% trans "Regular Expression" %} + {% if object.validation_regex %} + {{ object.validation_regex }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
Related Objects
diff --git a/netbox/templates/extras/customfieldchoiceset.html b/netbox/templates/extras/customfieldchoiceset.html index 7240a88bf..7c1e5b2b8 100644 --- a/netbox/templates/extras/customfieldchoiceset.html +++ b/netbox/templates/extras/customfieldchoiceset.html @@ -7,63 +7,59 @@
Custom Field Choice Set
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
Name{{ object.name }}
Description{{ object.description|markdown|placeholder }}
Base Choices{{ object.get_base_choices_display|placeholder }}
Choices{{ object.choices|length }}
Order Alphabetically{% checkmark object.order_alphabetically %}
Used by -
    - {% for cf in object.choices_for.all %} -
  • {{ cf|linkify }}
    • - {% endfor %} -
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
Name{{ object.name }}
Description{{ object.description|markdown|placeholder }}
Base Choices{{ object.get_base_choices_display|placeholder }}
Choices{{ object.choices|length }}
Order Alphabetically{% checkmark object.order_alphabetically %}
Used by +
    + {% for cf in object.choices_for.all %} +
  • {{ cf|linkify }}
    • + {% endfor %} +
+
{% plugin_left_page object %}
Choices ({{ object.choices|length }})
-
- - - - - - - - {% for value, label in choices %} - - - - - {% endfor %} -
ValueLabel
{{ value }}{{ label }}
- {% include 'inc/paginator.html' with page=choices %} -
+ + + + + + + + {% for value, label in choices %} + + + + + {% endfor %} +
ValueLabel
{{ value }}{{ label }}
+ {% include 'inc/paginator.html' with page=choices %}
{% plugin_right_page object %}
diff --git a/netbox/templates/extras/customlink.html b/netbox/templates/extras/customlink.html index c8bda78c5..492408396 100644 --- a/netbox/templates/extras/customlink.html +++ b/netbox/templates/extras/customlink.html @@ -8,46 +8,42 @@
{% trans "Custom Link" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Group Name" %}{{ object.group_name|placeholder }}
{% trans "Weight" %}{{ object.weight }}
{% trans "Button Class" %}{{ object.get_button_class_display }}
{% trans "New Window" %}{% checkmark object.new_window %}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Group Name" %}{{ object.group_name|placeholder }}
{% trans "Weight" %}{{ object.weight }}
{% trans "Button Class" %}{{ object.get_button_class_display }}
{% trans "New Window" %}{% checkmark object.new_window %}
{% trans "Assigned Models" %}
-
- - {% for ct in object.content_types.all %} - - - - {% endfor %} -
{{ ct }}
-
+ + {% for ct in object.content_types.all %} + + + + {% endfor %} +
{{ ct }}
{% plugin_left_page object %}
diff --git a/netbox/templates/extras/eventrule.html b/netbox/templates/extras/eventrule.html index eff7e60e5..5a8aeab72 100644 --- a/netbox/templates/extras/eventrule.html +++ b/netbox/templates/extras/eventrule.html @@ -7,68 +7,56 @@
-
- {% trans "Event Rule" %} -
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Event Rule" %}
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Description" %}{{ object.description|placeholder }}
-
- {% trans "Object Types" %} -
-
- - {% for ct in object.content_types.all %} - - - - {% endfor %} -
{{ ct }}
-
+
{% trans "Object Types" %}
+ + {% for ct in object.content_types.all %} + + + + {% endfor %} +
{{ ct }}
-
- {% trans "Events" %} -
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Create" %}{% checkmark object.type_create %}
{% trans "Update" %}{% checkmark object.type_update %}
{% trans "Delete" %}{% checkmark object.type_delete %}
{% trans "Job start" %}{% checkmark object.type_job_start %}
{% trans "Job end" %}{% checkmark object.type_job_end %}
-
+
{% trans "Events" %}
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Create" %}{% checkmark object.type_create %}
{% trans "Update" %}{% checkmark object.type_update %}
{% trans "Delete" %}{% checkmark object.type_delete %}
{% trans "Job start" %}{% checkmark object.type_job_start %}
{% trans "Job end" %}{% checkmark object.type_job_end %}
{% plugin_left_page object %}
@@ -86,39 +74,35 @@
-
- {% trans "Action" %} -
-
- - - - - - - - - - - - - -
{% trans "Type" %}{{ object.get_action_type_display }}
{% trans "Object" %} - {% if object.action_type == 'script' %} - - {{ object.action_object }} / {{ object.action_parameters.script_name }} - - {% else %} - {{ object.action_object|linkify }} - {% endif %} -
{% trans "Data" %} - {% if object.action_data %} - 
{{ object.action_data|json }}
- {% else %} - {{ ''|placeholder }} - {% endif %} -
-
+
{% trans "Action" %}
+ + + + + + + + + + + + + +
{% trans "Type" %}{{ object.get_action_type_display }}
{% trans "Object" %} + {% if object.action_type == 'script' %} + + {{ object.action_object }} / {{ object.action_parameters.script_name }} + + {% else %} + {{ object.action_object|linkify }} + {% endif %} +
{% trans "Data" %} + {% if object.action_data %} + 
{{ object.action_data|json }}
+ {% else %} + {{ ''|placeholder }} + {% endif %} +
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/extras/exporttemplate.html b/netbox/templates/extras/exporttemplate.html index 184658874..0648a8191 100644 --- a/netbox/templates/extras/exporttemplate.html +++ b/netbox/templates/extras/exporttemplate.html @@ -15,71 +15,67 @@
{% trans "Export Template" %}
-
- +
+ + + + + + + + + + + + + + + + + + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "MIME Type" %}{{ object.mime_type|placeholder }}
{% trans "File Extension" %}{{ object.file_extension|placeholder }}
{% trans "Attachment" %}{% checkmark object.as_attachment %}
{% trans "Name" %}{{ object.name }}{% trans "Data Source" %} + {% if object.data_source %} + {{ object.data_source }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Description" %}{{ object.description|placeholder }}{% trans "Data File" %} + {% if object.data_file %} + {{ object.data_file }} + {% elif object.data_path %} +
+ +
+ {{ object.data_path }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "MIME Type" %}{{ object.mime_type|placeholder }}{% trans "Data Synced" %}{{ object.data_synced|placeholder }}
{% trans "File Extension" %}{{ object.file_extension|placeholder }}
{% trans "Attachment" %}{% checkmark object.as_attachment %}
{% trans "Data Source" %} - {% if object.data_source %} - {{ object.data_source }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Data File" %} - {% if object.data_file %} - {{ object.data_file }} - {% elif object.data_path %} -
- -
- {{ object.data_path }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Data Synced" %}{{ object.data_synced|placeholder }}
-
+
{% trans "Assigned Models" %}
-
- - {% for ct in object.content_types.all %} - - - - {% endfor %} -
{{ ct }}
-
+ + {% for ct in object.content_types.all %} + + + + {% endfor %} +
{{ ct }}
{% plugin_left_page object %}
diff --git a/netbox/templates/extras/htmx/report_result.html b/netbox/templates/extras/htmx/report_result.html index 09592308d..363b4a75e 100644 --- a/netbox/templates/extras/htmx/report_result.html +++ b/netbox/templates/extras/htmx/report_result.html @@ -18,63 +18,59 @@ {% if job.completed %}
{% trans "Report Methods" %}
-
- - {% for method, data in job.data.items %} - - - - - {% endfor %} -
{{ method }} - {{ data.success }} - {{ data.info }} - {{ data.warning }} - {{ data.failure }} -
-
+ + {% for method, data in job.data.items %} + + + + + {% endfor %} +
{{ method }} + {{ data.success }} + {{ data.info }} + {{ data.warning }} + {{ data.failure }} +
{% trans "Report Results" %}
-
- - - - - - - +
{% trans "Time" %}{% trans "Level" %}{% trans "Object" %}{% trans "Message" %}
+ + + + + + + + + + {% for method, data in job.data.items %} + + - - - {% for method, data in job.data.items %} - - + {% for time, level, obj, url, message in data.log %} + + + + + - {% for time, level, obj, url, message in data.log %} - - - - - - - {% endfor %} {% endfor %} - -
{% trans "Time" %}{% trans "Level" %}{% trans "Object" %}{% trans "Message" %}
+ {{ method }} +
- {{ method }} -
{{ time }} + + + {% if obj and url %} + {{ obj }} + {% elif obj %} + {{ obj }} + {% else %} + {{ ''|placeholder }} + {% endif %} + {{ message|markdown }}
{{ time }} - - - {% if obj and url %} - {{ obj }} - {% elif obj %} - {{ obj }} - {% else %} - {{ ''|placeholder }} - {% endif %} - {{ message|markdown }}
-
+ {% endfor %} + +
{% elif job.started %} {% include 'extras/inc/result_pending.html' %} diff --git a/netbox/templates/extras/htmx/script_result.html b/netbox/templates/extras/htmx/script_result.html index ddc9b05f6..2fb0de468 100644 --- a/netbox/templates/extras/htmx/script_result.html +++ b/netbox/templates/extras/htmx/script_result.html @@ -19,28 +19,26 @@ {% if job.completed %}
{% trans "Script Log" %}
-
- +
+ + + + + + {% for log in job.data.log %} - - - + + + - {% for log in job.data.log %} - - - - - - {% empty %} - - - - {% endfor %} -
{% trans "Line" %}{% trans "Level" %}{% trans "Message" %}
{% trans "Line" %}{% trans "Level" %}{% trans "Message" %}{{ forloop.counter }}{% log_level log.status %}{{ log.message|markdown }}
{{ forloop.counter }}{% log_level log.status %}{{ log.message|markdown }}
- {% trans "No log output" %} -
-
+ {% empty %} + + + {% trans "No log output" %} + + + {% endfor %} + {% if execution_time %}
{% trans "Exec Time" %}: {{ execution_time|floatformat:3 }} {% trans "seconds" context "Unit of time" %} diff --git a/netbox/templates/extras/journalentry.html b/netbox/templates/extras/journalentry.html index b276113cf..7a4c06b25 100644 --- a/netbox/templates/extras/journalentry.html +++ b/netbox/templates/extras/journalentry.html @@ -12,29 +12,25 @@
-
- {% trans "Journal Entry" %} -
-
- - - - - - - - - - - - - - - - - -
{% trans "Object" %}{{ object.assigned_object|linkify }}
{% trans "Created" %}{{ object.created|annotated_date }}
{% trans "Created By" %}{{ object.created_by }}
{% trans "Kind" %}{% badge object.get_kind_display bg_color=object.get_kind_color %}
-
+
{% trans "Journal Entry" %}
+ + + + + + + + + + + + + + + + + +
{% trans "Object" %}{{ object.assigned_object|linkify }}
{% trans "Created" %}{{ object.created|annotated_date }}
{% trans "Created By" %}{{ object.created_by }}
{% trans "Kind" %}{% badge object.get_kind_display bg_color=object.get_kind_color %}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html index 4cc0cb481..3a9c04cdc 100644 --- a/netbox/templates/extras/objectchange.html +++ b/netbox/templates/extras/objectchange.html @@ -25,57 +25,53 @@
-
- {% trans "Change" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Time" %} - {{ object.time|annotated_date }} -
{% trans "User" %} - {% if object.user.get_full_name %} - {{ object.user.get_full_name }} ({{ object.user_name }}) - {% else %} - {{ object.user_name }} - {% endif %} -
{% trans "Action" %} - {{ object.get_action_display }} -
{% trans "Object Type" %} - {{ object.changed_object_type }} -
{% trans "Object" %} - {% if object.changed_object and object.changed_object.get_absolute_url %} - {{ object.changed_object|linkify }} - {% else %} - {{ object.object_repr }} - {% endif %} -
{% trans "Request ID" %} - {{ object.request_id }} -
-
+
{% trans "Change" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Time" %} + {{ object.time|annotated_date }} +
{% trans "User" %} + {% if object.user.get_full_name %} + {{ object.user.get_full_name }} ({{ object.user_name }}) + {% else %} + {{ object.user_name }} + {% endif %} +
{% trans "Action" %} + {{ object.get_action_display }} +
{% trans "Object Type" %} + {{ object.changed_object_type }} +
{% trans "Object" %} + {% if object.changed_object and object.changed_object.get_absolute_url %} + {{ object.changed_object|linkify }} + {% else %} + {{ object.object_repr }} + {% endif %} +
{% trans "Request ID" %} + {{ object.request_id }} +
diff --git a/netbox/templates/extras/savedfilter.html b/netbox/templates/extras/savedfilter.html index 574d4e76b..840852c7f 100644 --- a/netbox/templates/extras/savedfilter.html +++ b/netbox/templates/extras/savedfilter.html @@ -8,46 +8,42 @@
{% trans "Saved Filter" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "User" %}{{ object.user|placeholder }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Shared" %}{% checkmark object.shared %}
{% trans "Weight" %}{{ object.weight }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "User" %}{{ object.user|placeholder }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Shared" %}{% checkmark object.shared %}
{% trans "Weight" %}{{ object.weight }}
{% trans "Assigned Models" %}
-
- - {% for ct in object.content_types.all %} - - - - {% endfor %} -
{{ ct }}
-
+ + {% for ct in object.content_types.all %} + + + + {% endfor %} +
{{ ct }}
{% plugin_left_page object %}
diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html index caa44502b..6feaf2eac 100644 --- a/netbox/templates/extras/tag.html +++ b/netbox/templates/extras/tag.html @@ -8,77 +8,69 @@
-
- {% trans "Tag" %} -
-
- - - - - - - - - - - - - - - - - -
{% trans "Name" %} - {{ object.name }} -
{% trans "Description" %} - {{ object.description|placeholder }} -
{% trans "Color" %} -   -
{% trans "Tagged Items" %} - {{ taggeditem_table.rows|length }} -
-
+
{% trans "Tag" %}
+ + + + + + + + + + + + + + + + + +
{% trans "Name" %} + {{ object.name }} +
{% trans "Description" %} + {{ object.description|placeholder }} +
{% trans "Color" %} +   +
{% trans "Tagged Items" %} + {{ taggeditem_table.rows|length }} +
{% plugin_left_page object %}
{% trans "Allowed Object Types" %}
-
- - {% for ct in object.object_types.all %} - - - - {% empty %} - - - - {% endfor %} -
{{ ct }}
{% trans "Any" %}
-
+ + {% for ct in object.object_types.all %} + + + + {% empty %} + + + + {% endfor %} +
{{ ct }}
{% trans "Any" %}
{% trans "Tagged Item Types" %}
-
- - {% for object_type in object_types %} - - - - - {% endfor %} -
{{ object_type.content_type.name|bettertitle }} - {% with viewname=object_type.content_type.model_class|validated_viewname:"list" %} - {% if viewname %} - {{ object_type.item_count }} - {% else %} - {{ object_type.item_count }} - {% endif %} - {% endwith %} -
-
+ + {% for object_type in object_types %} + + + + + {% endfor %} +
{{ object_type.content_type.name|bettertitle }} + {% with viewname=object_type.content_type.model_class|validated_viewname:"list" %} + {% if viewname %} + {{ object_type.item_count }} + {% else %} + {{ object_type.item_count }} + {% endif %} + {% endwith %} +
{% plugin_right_page object %}
diff --git a/netbox/templates/extras/webhook.html b/netbox/templates/extras/webhook.html index 0f390d3e4..9fce9d591 100644 --- a/netbox/templates/extras/webhook.html +++ b/netbox/templates/extras/webhook.html @@ -7,63 +7,51 @@
-
- {% trans "Webhook" %} -
-
- - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Webhook" %}
+ + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
-
- {% trans "HTTP Request" %} -
-
- - - - - - - - - - - - - - - - - -
{% trans "HTTP Method" %}{{ object.get_http_method_display }}
{% trans "Payload URL" %}{{ object.payload_url }}
{% trans "HTTP Content Type" %}{{ object.http_content_type }}
{% trans "Secret" %}{{ object.secret|placeholder }}
-
+
{% trans "HTTP Request" %}
+ + + + + + + + + + + + + + + + + +
{% trans "HTTP Method" %}{{ object.get_http_method_display }}
{% trans "Payload URL" %}{{ object.payload_url }}
{% trans "HTTP Content Type" %}{{ object.http_content_type }}
{% trans "Secret" %}{{ object.secret|placeholder }}
-
- {% trans "SSL" %} -
-
- - - - - - - - - -
{% trans "SSL Verification" %}{% checkmark object.ssl_verification %}
{% trans "CA File Path" %}{{ object.ca_file_path|placeholder }}
-
+
{% trans "SSL" %}
+ + + + + + + + + +
{% trans "SSL Verification" %}{% checkmark object.ssl_verification %}
{% trans "CA File Path" %}{{ object.ca_file_path|placeholder }}
{% plugin_left_page object %}
diff --git a/netbox/templates/generic/bulk_import.html b/netbox/templates/generic/bulk_import.html index db91d22c2..484b7a36e 100644 --- a/netbox/templates/generic/bulk_import.html +++ b/netbox/templates/generic/bulk_import.html @@ -105,87 +105,83 @@ Context:
-
- {% trans "Field Options" %} -
-
- +
{% trans "Field Options" %}
+
+ + + + + + + {% for name, field in fields.items %} - - - - - - {% for name, field in fields.items %} - - - - - + + + - - {% endfor %} -
{% trans "Field" %}{% trans "Required" %}{% trans "Accessor" %}{% trans "Description" %}
{% trans "Field" %}{% trans "Required" %}{% trans "Accessor" %}{% trans "Description" %}
- {% if field.required %}{% endif %}{{ name }}{% if field.required %}{% endif %} - - {% if field.required %} - {% checkmark True true="Required" %} - {% else %} - {{ ''|placeholder }} - {% endif %} - - {% if field.to_field_name %} - {{ field.to_field_name }} - {% else %} - {{ ''|placeholder }} - {% endif %} - - {% if field.STATIC_CHOICES %} - - + {% if field.required %}{% endif %}{{ name }}{% if field.required %}{% endif %} + + {% if field.required %} + {% checkmark True true="Required" %} + {% else %} + {{ ''|placeholder }} + {% endif %} + + {% if field.to_field_name %} + {{ field.to_field_name }} + {% else %} + {{ ''|placeholder }} + {% endif %} + + {% if field.STATIC_CHOICES %} + +
-
+
+ {% endif %} + {% if field.help_text %} + {{ field.help_text }}
+ {% elif field.label %} + {{ field.label }}
+ {% endif %} + {% if field|widget_type == 'dateinput' %} + {% trans "Format: YYYY-MM-DD" %} + {% elif field|widget_type == 'checkboxinput' %} + {% trans "Specify true or false" %} + {% endif %} + + + {% endfor %} +
diff --git a/netbox/templates/inc/panel_table.html b/netbox/templates/inc/panel_table.html index 85b867b7e..2abad8e3c 100644 --- a/netbox/templates/inc/panel_table.html +++ b/netbox/templates/inc/panel_table.html @@ -5,7 +5,7 @@ {% if heading %}
{{ heading }}
{% endif %} -
+
{% if table.rows %} {% render_table table 'inc/table.html' %} {% else %} diff --git a/netbox/templates/inc/panels/custom_fields.html b/netbox/templates/inc/panels/custom_fields.html index b4041120a..1cda049ce 100644 --- a/netbox/templates/inc/panels/custom_fields.html +++ b/netbox/templates/inc/panels/custom_fields.html @@ -5,32 +5,30 @@ {% if custom_fields %}
{% trans "Custom Fields" %}
-
- {% for group_name, fields in custom_fields.items %} - {% if group_name %} -
{{ group_name }}
- {% endif %} - - {% for field, value in fields.items %} - - - - - {% endfor %} -
{{ field }} - {% if field.description %} - - {% endif %} - - {% customfield_value field value %} -
- {% endfor %} -
+ {% for group_name, fields in custom_fields.items %} + {% if group_name %} +
{{ group_name }}
+ {% endif %} + + {% for field, value in fields.items %} + + + + + {% endfor %} +
{{ field }} + {% if field.description %} + + {% endif %} + + {% customfield_value field value %} +
+ {% endfor %}
{% endif %} {% endwith %} diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index 1d162c4f0..6819e5448 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -9,43 +9,41 @@
{% trans "Aggregate" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Family" %}IPv{{ object.family }}
{% trans "RIR" %} - {{ object.rir }} -
{% trans "Utilization" %} - {% utilization_graph object.get_utilization %} -
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Date Added" %}{{ object.date_added|annotated_date|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Family" %}IPv{{ object.family }}
{% trans "RIR" %} + {{ object.rir }} +
{% trans "Utilization" %} + {% utilization_graph object.get_utilization %} +
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Date Added" %}{{ object.date_added|annotated_date|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% plugin_left_page object %}
diff --git a/netbox/templates/ipam/asn.html b/netbox/templates/ipam/asn.html index 19f9db444..b0494cf53 100644 --- a/netbox/templates/ipam/asn.html +++ b/netbox/templates/ipam/asn.html @@ -18,33 +18,31 @@
{% trans "ASN" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "AS Number" %}{{ object.asn_with_asdot }}
{% trans "RIR" %} - {{ object.rir }} -
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + +
{% trans "AS Number" %}{{ object.asn_with_asdot }}
{% trans "RIR" %} + {{ object.rir }} +
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Description" %}{{ object.description|placeholder }}
{% plugin_left_page object %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/ipam/asnrange.html b/netbox/templates/ipam/asnrange.html index c8952c1eb..314d33361 100644 --- a/netbox/templates/ipam/asnrange.html +++ b/netbox/templates/ipam/asnrange.html @@ -10,37 +10,35 @@
{% trans "ASN Range" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "RIR" %} - {{ object.rir }} -
{% trans "Range" %}{{ object.range_as_string }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "RIR" %} + {{ object.rir }} +
{% trans "Range" %}{{ object.range_as_string }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Description" %}{{ object.description|placeholder }}
{% plugin_left_page object %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/ipam/fhrpgroup.html b/netbox/templates/ipam/fhrpgroup.html index 3e8e6490b..4eb6fc9a9 100644 --- a/netbox/templates/ipam/fhrpgroup.html +++ b/netbox/templates/ipam/fhrpgroup.html @@ -17,30 +17,28 @@
{% trans "FHRP Group" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Protocol" %}{{ object.get_protocol_display }}
{% trans "Group ID" %}{{ object.group_id }}
{% trans "Name" %}{{ object.name|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Members" %}{{ member_count }}
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Protocol" %}{{ object.get_protocol_display }}
{% trans "Group ID" %}{{ object.group_id }}
{% trans "Name" %}{{ object.name|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Members" %}{{ member_count }}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/comments.html' %} @@ -49,18 +47,16 @@
{% trans "Authentication" %}
-
- - - - - - - - - -
{% trans "Authentication Type" %}{{ object.get_auth_type_display|placeholder }}
{% trans "Authentication Key" %}{{ object.auth_key|placeholder }}
-
+ + + + + + + + + +
{% trans "Authentication Type" %}{{ object.get_auth_type_display|placeholder }}
{% trans "Authentication Key" %}{{ object.auth_key|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% plugin_right_page object %} diff --git a/netbox/templates/ipam/inc/panels/fhrp_groups.html b/netbox/templates/ipam/inc/panels/fhrp_groups.html index 0fcbc2ad1..d542da2d7 100644 --- a/netbox/templates/ipam/inc/panels/fhrp_groups.html +++ b/netbox/templates/ipam/inc/panels/fhrp_groups.html @@ -3,49 +3,47 @@
{% trans "FHRP Groups" %}
-
- - +
+ + + + + + + + + + + {% for assignment in object.fhrp_group_assignments.all %} - - - - - + + + + + - - - {% for assignment in object.fhrp_group_assignments.all %} - - - - - - - - {% empty %} - - - - {% endfor %} - -
{% trans "Group" %}{% trans "Protocol" %}{% trans "Virtual IPs" %}{% trans "Priority" %}
{% trans "Group" %}{% trans "Protocol" %}{% trans "Virtual IPs" %}{% trans "Priority" %}{{ assignment.group|linkify:"group_id" }}{{ assignment.group.get_protocol_display }} + {% for ipaddress in assignment.group.ip_addresses.all %} + {{ ipaddress|linkify }}{% if not forloop.last %}
{% endif %} + {% endfor %} + 		{{ assignment.priority }} + {% if perms.ipam.change_fhrpgroupassignment %} + + + + {% endif %} + {% if perms.ipam.delete_fhrpgroupassignment %} + + + + {% endif %} +
{{ assignment.group|linkify:"group_id" }}{{ assignment.group.get_protocol_display }} - {% for ipaddress in assignment.group.ip_addresses.all %} - {{ ipaddress|linkify }}{% if not forloop.last %}
{% endif %} - {% endfor %} - 		{{ assignment.priority }} - {% if perms.ipam.change_fhrpgroupassignment %} - - - - {% endif %} - {% if perms.ipam.delete_fhrpgroupassignment %} - - - - {% endif %} -
{% trans "None" %}
-
+ {% empty %} + + {% trans "None" %} + + {% endfor %} + +
{% if perms.ipam.add_fhrpgroup %} diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index 862e7e3e2..2f8050193 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -8,105 +8,101 @@
-
- {% trans "IP Address" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +
{% trans "Family" %}IPv{{ object.family }}
{% trans "VRF" %} - {% if object.vrf %} - {{ object.vrf }} - {% else %} - {% trans "Global" %} - {% endif %} -
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %} - {% if object.role %} - {{ object.get_role_display }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "DNS Name" %}{{ object.dns_name|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Assignment" %} - {% if object.assigned_object %} - {% if object.assigned_object.parent_object %} - {{ object.assigned_object.parent_object|linkify }} / - {% endif %} - {{ object.assigned_object|linkify }} - {% else %} +
{% trans "IP Address" %}
+ + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - -
{% trans "Family" %}IPv{{ object.family }}
{% trans "VRF" %} + {% if object.vrf %} + {{ object.vrf }} + {% else %} + {% trans "Global" %} + {% endif %} +
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %} + {% if object.role %} + {{ object.get_role_display }} + {% else %} {{ ''|placeholder }} - {% endif %} -
{% trans "NAT (inside)" %} - {% if object.nat_inside %} - {{ object.nat_inside|linkify }} - {% if object.nat_inside.assigned_object %} - ({{ object.nat_inside.assigned_object.parent_object|linkify }}) - {% endif %} - {% else %} - {{ ''|placeholder }} + {% endif %} +
{% trans "DNS Name" %}{{ object.dns_name|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Assignment" %} + {% if object.assigned_object %} + {% if object.assigned_object.parent_object %} + {{ object.assigned_object.parent_object|linkify }} / + {% endif %} + {{ object.assigned_object|linkify }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "NAT (inside)" %} + {% if object.nat_inside %} + {{ object.nat_inside|linkify }} + {% if object.nat_inside.assigned_object %} + ({{ object.nat_inside.assigned_object.parent_object|linkify }}) {% endif %} -
{% trans "NAT (outside)" %} - {% for ip in object.nat_outside.all %} - {{ ip|linkify }} - {% if ip.assigned_object %} - ({{ ip.assigned_object.parent_object|linkify }}) - {% endif %}
- {% empty %} + {% else %} {{ ''|placeholder }} - {% endfor %} -
Primary IP{% checkmark object.is_primary_ip %}
OOB IP{% checkmark object.is_oob_ip %}
- + {% endif %} +
{% trans "NAT (outside)" %} + {% for ip in object.nat_outside.all %} + {{ ip|linkify }} + {% if ip.assigned_object %} + ({{ ip.assigned_object.parent_object|linkify }}) + {% endif %}
+ {% empty %} + {{ ''|placeholder }} + {% endfor %} +
Primary IP{% checkmark object.is_primary_ip %}
OOB IP{% checkmark object.is_oob_ip %}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/custom_fields.html' %} diff --git a/netbox/templates/ipam/iprange.html b/netbox/templates/ipam/iprange.html index 13bfe4902..3a1a7f6ed 100644 --- a/netbox/templates/ipam/iprange.html +++ b/netbox/templates/ipam/iprange.html @@ -5,82 +5,78 @@ {% block content %}
-
-
-
- {% trans "IP Range" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Family" %}IPv{{ object.family }}
{% trans "Starting Address" %}{{ object.start_address }}
{% trans "Ending Address" %}{{ object.end_address }}
{% trans "Size" %}{{ object.size }}
{% trans "Utilization" %} - {% if object.mark_utilized %} - {% utilization_graph 100 warning_threshold=0 danger_threshold=0 %} - ({% trans "Marked fully utilized" %}) - {% else %} - {% utilization_graph object.utilization %} - {% endif %} -
{% trans "VRF" %} - {% if object.vrf %} - {{ object.vrf|linkify }} ({{ object.vrf.rd }}) - {% else %} - {% trans "Global" %} - {% endif %} -
{% trans "Role" %}{{ object.role|linkify|placeholder }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Description" %}{{ object.description|placeholder }}
-
-
- {% plugin_left_page object %} -
-
- {% include 'inc/panels/tags.html' %} - {% include 'inc/panels/custom_fields.html' %} - {% include 'inc/panels/comments.html' %} - {% plugin_right_page object %} +
+
+
{% trans "IP Range" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Family" %}IPv{{ object.family }}
{% trans "Starting Address" %}{{ object.start_address }}
{% trans "Ending Address" %}{{ object.end_address }}
{% trans "Size" %}{{ object.size }}
{% trans "Utilization" %} + {% if object.mark_utilized %} + {% utilization_graph 100 warning_threshold=0 danger_threshold=0 %} + ({% trans "Marked fully utilized" %}) + {% else %} + {% utilization_graph object.utilization %} + {% endif %} +
{% trans "VRF" %} + {% if object.vrf %} + {{ object.vrf|linkify }} ({{ object.vrf.rd }}) + {% else %} + {% trans "Global" %} + {% endif %} +
{% trans "Role" %}{{ object.role|linkify|placeholder }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Description" %}{{ object.description|placeholder }}
+ {% plugin_left_page object %} +
+
+ {% include 'inc/panels/tags.html' %} + {% include 'inc/panels/custom_fields.html' %} + {% include 'inc/panels/comments.html' %} + {% plugin_right_page object %} +
@@ -88,8 +84,8 @@
-
- {% plugin_full_width_page object %} -
+
+ {% plugin_full_width_page object %} +
{% endblock %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 48c1cc526..f4f066157 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -10,149 +10,145 @@
{% trans "Prefix" %}
-
- - - - - - - +
{% trans "Family" %}IPv{{ object.family }}
{% trans "VRF" %}
+ + + + + + + + + + + + + + + + {% if object.site.region %} + + + - - - - - - - + + + + + + - - {% if object.site.region %} - - - - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Family" %}IPv{{ object.family }}
{% trans "VRF" %} + {% if object.vrf %} + {{ object.vrf }} + {% else %} + {% trans "Global" %} + {% endif %} +
{% trans "Tenant" %} - {% if object.vrf %} - {{ object.vrf }} - {% else %} - {% trans "Global" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Aggregate" %} + {% if aggregate %} + {{ aggregate.prefix }} ({{ aggregate.rir }}) + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Region" %} + {% nested_tree object.site.region %}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Aggregate" %} - {% if aggregate %} - {{ aggregate.prefix }} ({{ aggregate.rir }}) - {% else %} - {{ ''|placeholder }} + {% endif %} +
{% trans "Site" %}{{ object.site|linkify|placeholder }}
{% trans "VLAN" %} + {% if object.vlan %} + {% if object.vlan.group %} + {{ object.vlan.group|linkify }} / {% endif %} -
{% trans "Region" %} - {% nested_tree object.site.region %} -
{% trans "Site" %}{{ object.site|linkify|placeholder }}
{% trans "VLAN" %} - {% if object.vlan %} - {% if object.vlan.group %} - {{ object.vlan.group|linkify }} / - {% endif %} - {{ object.vlan|linkify }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %}{{ object.role|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Is a pool" %}{% checkmark object.is_pool %}
-
+ {{ object.vlan|linkify }} + {% else %} + {{ ''|placeholder }} + {% endif %} + + + + {% trans "Status" %} + {% badge object.get_status_display bg_color=object.get_status_color %} + + + {% trans "Role" %} + {{ object.role|linkify|placeholder }} + + + {% trans "Description" %} + {{ object.description|placeholder }} + + + {% trans "Is a pool" %} + {% checkmark object.is_pool %} + +
- {% plugin_left_page object %} + {% plugin_left_page object %}
{% trans "Addressing" %}
-
- +
+ + + + + {% with child_ip_count=object.get_child_ips.count %} - + + + {% endwith %} + {% with available_count=object.get_available_ips.size %} + + + - {% with child_ip_count=object.get_child_ips.count %} - - - - - {% endwith %} - {% with available_count=object.get_available_ips.size %} - - - + + - - {% endwith %} - - - - -
{% trans "Utilization" %} + {% if object.mark_utilized %} + {% utilization_graph 100 warning_threshold=0 danger_threshold=0 %} + ({% trans "Marked fully utilized" %}) + {% else %} + {% utilization_graph object.get_utilization %} + {% endif %} +
{% trans "Utilization" %}{% trans "Child IPs" %} - {% if object.mark_utilized %} - {% utilization_graph 100 warning_threshold=0 danger_threshold=0 %} - ({% trans "Marked fully utilized" %}) + {{ child_ip_count }} +
{% trans "Available IPs" %} + {# Use human-friendly words for counts greater than one million #} + {% if available_count > 1000000 %} + {{ available_count|intword }} {% else %} - {% utilization_graph object.get_utilization %} + {{ available_count|intcomma }} {% endif %}
{% trans "Child IPs" %} - {{ child_ip_count }} -
{% trans "Available IPs" %} - {# Use human-friendly words for counts greater than one million #} - {% if available_count > 1000000 %} - {{ available_count|intword }} + {% endwith %} +
{% trans "First available IP" %} + {% with first_available_ip=object.get_first_available_ip %} + {% if first_available_ip %} + {% if perms.ipam.add_ipaddress %} + {{ first_available_ip }} {% else %} - {{ available_count|intcomma }} + {{ first_available_ip }} {% endif %} -
{% trans "First available IP" %} - {% with first_available_ip=object.get_first_available_ip %} - {% if first_available_ip %} - {% if perms.ipam.add_ipaddress %} - {{ first_available_ip }} - {% else %} - {{ first_available_ip }} - {% endif %} - {% else %} - {{ ''|placeholder }} - {% endif %} - {% endwith %} -
- {% if object.prefix.version == 4 %} -
- - {% trans "Addressing Details" %} - -
- {% endif %} -
+ {% else %} + {{ ''|placeholder }} + {% endif %} + {% endwith %} + + + + {% if object.prefix.version == 4 %} +
+ + {% trans "Addressing Details" %} + +
+ {% endif %}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -181,8 +177,8 @@
{% trans "Prefix Details" %}
-
- +
+
diff --git a/netbox/templates/ipam/rir.html b/netbox/templates/ipam/rir.html index ab9f70b5b..53a259389 100644 --- a/netbox/templates/ipam/rir.html +++ b/netbox/templates/ipam/rir.html @@ -16,25 +16,21 @@
-
- {% trans "RIR" %} -
-
+
{% trans "RIR" %}
{% trans "Network Address" %} {{ object.prefix.network }}
- - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Private" %}{% checkmark object.is_private %}
-
+ + {% trans "Name" %} + {{ object.name }} + + + {% trans "Description" %} + {{ object.description|placeholder }} + + + {% trans "Private" %} + {% checkmark object.is_private %} + +
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html index cba9e2db5..952e3cbf2 100644 --- a/netbox/templates/ipam/role.html +++ b/netbox/templates/ipam/role.html @@ -16,25 +16,21 @@
-
- {% trans "Role" %} -
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Weight" %}{{ object.weight }}
-
+
{% trans "Role" %}
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Weight" %}{{ object.weight }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/ipam/routetarget.html b/netbox/templates/ipam/routetarget.html index b5b2357fa..3c92ba16c 100644 --- a/netbox/templates/ipam/routetarget.html +++ b/netbox/templates/ipam/routetarget.html @@ -8,22 +8,20 @@
{% trans "Route Target" %}
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Tenant" %}{{ object.tenant|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Tenant" %}{{ object.tenant|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html index ec70e1e77..7f0b8451d 100644 --- a/netbox/templates/ipam/service.html +++ b/netbox/templates/ipam/service.html @@ -18,43 +18,39 @@
-
- {% trans "Service" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Parent" %}{{ object.parent|linkify }}
{% trans "Protocol" %}{{ object.get_protocol_display }}
{% trans "Ports" %}{{ object.port_list }}
{% trans "IP Addresses" %} - {% for ipaddress in object.ipaddresses.all %} - {{ ipaddress|linkify }}
- {% empty %} - {{ ''|placeholder }} - {% endfor %} -
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Service" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Parent" %}{{ object.parent|linkify }}
{% trans "Protocol" %}{{ object.get_protocol_display }}
{% trans "Ports" %}{{ object.port_list }}
{% trans "IP Addresses" %} + {% for ipaddress in object.ipaddresses.all %} + {{ ipaddress|linkify }}
+ {% empty %} + {{ ''|placeholder }} + {% endfor %} +
{% trans "Description" %}{{ object.description|placeholder }}
{% plugin_left_page object %}
diff --git a/netbox/templates/ipam/servicetemplate.html b/netbox/templates/ipam/servicetemplate.html index a5a3ff41e..edf471e6b 100644 --- a/netbox/templates/ipam/servicetemplate.html +++ b/netbox/templates/ipam/servicetemplate.html @@ -10,26 +10,24 @@
{% trans "Service Template" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Protocol" %}{{ object.get_protocol_display }}
{% trans "Ports" %}{{ object.port_list }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Protocol" %}{{ object.get_protocol_display }}
{% trans "Ports" %}{{ object.port_list }}
{% trans "Description" %}{{ object.description|placeholder }}
{% plugin_left_page object %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index f316b5da1..bac728a54 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -9,68 +9,64 @@
-
- {% trans "VLAN" %} -
-
- - {% if object.site.region %} - - - - - {% endif %} +
{% trans "VLAN" %}
+
{% trans "Region" %} - {% nested_tree object.site.region %} -
+ {% if object.site.region %} - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - -
{% trans "Site" %}{{ object.site|linkify|placeholder }}
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "VLAN ID" %}{{ object.vid }}
{% trans "Name" %}{{ object.name }}
{% trans "Tenant" %}{% trans "Region" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} + {% nested_tree object.site.region %}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %} - {% if object.role %} - {{ object.role }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "L2VPN" %}{{ object.l2vpn_termination.l2vpn|linkify|placeholder }}
-
+ {% endif %} + + {% trans "Site" %} + {{ object.site|linkify|placeholder }} + + + {% trans "Group" %} + {{ object.group|linkify|placeholder }} + + + {% trans "VLAN ID" %} + {{ object.vid }} + + + {% trans "Name" %} + {{ object.name }} + + + {% trans "Tenant" %} + + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} + + + + {% trans "Status" %} + {% badge object.get_status_display bg_color=object.get_status_color %} + + + {% trans "Role" %} + + {% if object.role %} + {{ object.role }} + {% else %} + {{ ''|placeholder }} + {% endif %} + + + + {% trans "Description" %} + {{ object.description|placeholder }} + + + {% trans "L2VPN" %} + {{ object.l2vpn_termination.l2vpn|linkify|placeholder }} + +
{% plugin_left_page object %}
diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html index 4ea9062bc..cc8c790a9 100644 --- a/netbox/templates/ipam/vlangroup.html +++ b/netbox/templates/ipam/vlangroup.html @@ -25,30 +25,28 @@
{% trans "VLAN Group" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Scope" %}{{ object.scope|linkify|placeholder }}
{% trans "Permitted VIDs" %}{{ object.min_vid }} - {{ object.max_vid }}
Utilization{% utilization_graph object.utilization %}
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Scope" %}{{ object.scope|linkify|placeholder }}
{% trans "Permitted VIDs" %}{{ object.min_vid }} - {{ object.max_vid }}
Utilization{% utilization_graph object.utilization %}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html index aa52fa843..936391ecf 100644 --- a/netbox/templates/ipam/vrf.html +++ b/netbox/templates/ipam/vrf.html @@ -10,34 +10,30 @@
-
- {% trans "VRF" %} -
-
- - - - - - - - - - - - - - - - - -
{% trans "Route Distinguisher" %}{{ object.rd|placeholder }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Unique IP Space" %}{% checkmark object.enforce_unique %}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "VRF" %}
+ + + + + + + + + + + + + + + + + +
{% trans "Route Distinguisher" %}{{ object.rd|placeholder }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Unique IP Space" %}{% checkmark object.enforce_unique %}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/tenancy/contact.html b/netbox/templates/tenancy/contact.html index 04f3eec0e..3678a4779 100644 --- a/netbox/templates/tenancy/contact.html +++ b/netbox/templates/tenancy/contact.html @@ -16,60 +16,58 @@
{% trans "Contact" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Title" %}{{ object.title|placeholder }}
{% trans "Phone" %} - {% if object.phone %} - {{ object.phone }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Email" %} - {% if object.email %} - {{ object.email }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Address" %}{{ object.address|linebreaksbr|placeholder }}
{% trans "Link" %} - {% if object.link %} - {{ object.link }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Name" %}{{ object.name }}
{% trans "Title" %}{{ object.title|placeholder }}
{% trans "Phone" %} + {% if object.phone %} + {{ object.phone }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Email" %} + {% if object.email %} + {{ object.email }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Address" %}{{ object.address|linebreaksbr|placeholder }}
{% trans "Link" %} + {% if object.link %} + {{ object.link }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/tenancy/contactgroup.html b/netbox/templates/tenancy/contactgroup.html index a3597bf95..cf8686260 100644 --- a/netbox/templates/tenancy/contactgroup.html +++ b/netbox/templates/tenancy/contactgroup.html @@ -15,25 +15,21 @@
-
- {% trans "Contact Group" %} -
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
-
+
{% trans "Contact Group" %}
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/tenancy/contactrole.html b/netbox/templates/tenancy/contactrole.html index fed7d744e..335c814cb 100644 --- a/netbox/templates/tenancy/contactrole.html +++ b/netbox/templates/tenancy/contactrole.html @@ -13,18 +13,16 @@
{% trans "Contact Role" %}
-
- - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index da16637fc..3f0056da8 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -15,18 +15,16 @@
{% trans "Tenant" %}
-
- - - - - - - - - -
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + +
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html index 550e81de2..5b523093d 100644 --- a/netbox/templates/tenancy/tenantgroup.html +++ b/netbox/templates/tenancy/tenantgroup.html @@ -23,25 +23,21 @@
-
- {% trans "Tenant Group" %} -
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
-
+
{% trans "Tenant Group" %}
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/users/group.html b/netbox/templates/users/group.html index e4eee0812..fc84aa789 100644 --- a/netbox/templates/users/group.html +++ b/netbox/templates/users/group.html @@ -12,14 +12,12 @@
{% trans "Group" %}
-
- - - - - -
{% trans "Name" %}{{ object.name }}
-
+ + + + + +
{% trans "Name" %}{{ object.name }}
diff --git a/netbox/templates/users/objectpermission.html b/netbox/templates/users/objectpermission.html index 4da5a6ea5..fbf3ccc6b 100644 --- a/netbox/templates/users/objectpermission.html +++ b/netbox/templates/users/objectpermission.html @@ -12,45 +12,41 @@
{% trans "Permission" %}
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Enabled" %}{% checkmark object.enabled %}
-
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Enabled" %}{% checkmark object.enabled %}
{% trans "Actions" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "View" %}{% checkmark object.can_view %}
{% trans "Add" %}{% checkmark object.can_add %}
{% trans "Change" %}{% checkmark object.can_change %}
{% trans "Delete" %}{% checkmark object.can_delete %}
-
+ + + + + + + + + + + + + + + + + +
{% trans "View" %}{% checkmark object.can_view %}
{% trans "Add" %}{% checkmark object.can_add %}
{% trans "Change" %}{% checkmark object.can_change %}
{% trans "Delete" %}{% checkmark object.can_delete %}
{% trans "Constraints" %}
diff --git a/netbox/templates/users/token.html b/netbox/templates/users/token.html index 0fa8c572e..91ac9c5e5 100644 --- a/netbox/templates/users/token.html +++ b/netbox/templates/users/token.html @@ -12,44 +12,42 @@
{% trans "Token" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Key" %}{% if settings.ALLOW_TOKEN_RETRIEVAL %}{{ object.key }}{% else %}{{ object.partial }}{% endif %}
{% trans "User" %} - {{ object.user }} -
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Write enabled" %}{% checkmark object.write_enabled %}
{% trans "Created" %}{{ object.created|annotated_date }}
{% trans "Expires" %}{{ object.expires|placeholder }}
{% trans "Last used" %}{{ object.last_used|placeholder }}
{% trans "Allowed IPs" %}{{ object.allowed_ips|join:", "|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Key" %}{% if settings.ALLOW_TOKEN_RETRIEVAL %}{{ object.key }}{% else %}{{ object.partial }}{% endif %}
{% trans "User" %} + {{ object.user }} +
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Write enabled" %}{% checkmark object.write_enabled %}
{% trans "Created" %}{{ object.created|annotated_date }}
{% trans "Expires" %}{{ object.expires|placeholder }}
{% trans "Last used" %}{{ object.last_used|placeholder }}
{% trans "Allowed IPs" %}{{ object.allowed_ips|join:", "|placeholder }}
diff --git a/netbox/templates/users/user.html b/netbox/templates/users/user.html index 18c07c1cc..82f6d03b0 100644 --- a/netbox/templates/users/user.html +++ b/netbox/templates/users/user.html @@ -12,38 +12,36 @@
{% trans "User" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Username" %}{{ object.username }}
{% trans "Full Name" %}{{ object.get_full_name|placeholder }}
{% trans "Email" %}{{ object.email|placeholder }}
{% trans "Account Created" %}{{ object.date_joined|annotated_date }}
{% trans "Active" %}{% checkmark object.is_active %}
{% trans "Staff" %}{% checkmark object.is_staff %}
{% trans "Superuser" %}{% checkmark object.is_superuser %}
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Username" %}{{ object.username }}
{% trans "Full Name" %}{{ object.get_full_name|placeholder }}
{% trans "Email" %}{{ object.email|placeholder }}
{% trans "Account Created" %}{{ object.date_joined|annotated_date }}
{% trans "Active" %}{% checkmark object.is_active %}
{% trans "Staff" %}{% checkmark object.is_staff %}
{% trans "Superuser" %}{% checkmark object.is_superuser %}
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html index cc7a14a22..264a275e9 100644 --- a/netbox/templates/virtualization/cluster.html +++ b/netbox/templates/virtualization/cluster.html @@ -7,46 +7,42 @@
-
- {% trans "Cluster" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Type" %}{{ object.type|linkify }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Site" %}{{ object.site|linkify|placeholder }}
-
+
{% trans "Cluster" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Type" %}{{ object.type|linkify }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Site" %}{{ object.site|linkify|placeholder }}
{% include 'inc/panels/comments.html' %} {% plugin_left_page object %} @@ -54,34 +50,32 @@
{% trans "Allocated Resources" %}
-
- - - - - - - - - - - - - -
{% trans "Virtual CPUs" %}{{ vcpus_sum|placeholder }}
{% trans "Memory" %} - {% if memory_sum %} - {{ memory_sum|humanize_megabytes }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Disk Space" %} - {% if disk_sum %} - {{ disk_sum }} {% trans "GB" context "Abbreviation for gigabyte" %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
-
+ + + + + + + + + + + + + +
{% trans "Virtual CPUs" %}{{ vcpus_sum|placeholder }}
{% trans "Memory" %} + {% if memory_sum %} + {{ memory_sum|humanize_megabytes }} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Disk Space" %} + {% if disk_sum %} + {{ disk_sum }} {% trans "GB" context "Abbreviation for gigabyte" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} diff --git a/netbox/templates/virtualization/clustergroup.html b/netbox/templates/virtualization/clustergroup.html index 3571a20ea..1c818d94c 100644 --- a/netbox/templates/virtualization/clustergroup.html +++ b/netbox/templates/virtualization/clustergroup.html @@ -16,21 +16,17 @@
-
- {% trans "Cluster Group" %} -
-
- - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Cluster Group" %}
+ + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/virtualization/clustertype.html b/netbox/templates/virtualization/clustertype.html index e56cde8b7..877c0fec7 100644 --- a/netbox/templates/virtualization/clustertype.html +++ b/netbox/templates/virtualization/clustertype.html @@ -16,27 +16,23 @@
-
- {% trans "Cluster Type" %} -
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Clusters" %} - {{ object.clusters.count }} -
-
+
{% trans "Cluster Type" %}
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Clusters" %} + {{ object.clusters.count }} +
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/virtualization/virtualdisk.html b/netbox/templates/virtualization/virtualdisk.html index 821e58796..2cad4fcd8 100644 --- a/netbox/templates/virtualization/virtualdisk.html +++ b/netbox/templates/virtualization/virtualdisk.html @@ -16,32 +16,30 @@
{% trans "Virtual Disk" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Virtual Machine" %}{{ object.virtual_machine|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Size" %} - {% if object.size %} - {{ object.size }} {% trans "GB" context "Abbreviation for gigabyte" %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + +
{% trans "Virtual Machine" %}{{ object.virtual_machine|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Size" %} + {% if object.size %} + {{ object.size }} {% trans "GB" context "Abbreviation for gigabyte" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 6f180a88c..6ed3046a1 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -9,78 +9,74 @@
-
- {% trans "Virtual Machine" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %}{{ object.role|linkify|placeholder }}
{% trans "Platform" %}{{ object.platform|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Config Template" %}{{ object.config_template|linkify|placeholder }}
{% trans "Primary IPv4" %} - {% if object.primary_ip4 %} - {{ object.primary_ip4.address.ip }} - {% if object.primary_ip4.nat_inside %} - ({% trans "NAT for" %} {{ object.primary_ip4.nat_inside.address.ip }}) - {% elif object.primary_ip4.nat_outside.exists %} - ({% trans "NAT" %}: {% for nat in object.primary_ip4.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %}) - {% endif %} - {% copy_content "primary_ip4" %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
{% trans "Primary IPv6" %} - {% if object.primary_ip6 %} - {{ object.primary_ip6.address.ip }} - {% if object.primary_ip6.nat_inside %} - ({% trans "NAT for" %} {{ object.primary_ip6.nat_inside.address.ip }}) - {% elif object.primary_ip6.nat_outside.exists %} - ({% trans "NAT" %}: {% for nat in object.primary_ip6.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %}) - {% endif %} - {% copy_content "primary_ip6" %} - {% else %} - {{ ''|placeholder }} - {% endif %} -
-
+
{% trans "Virtual Machine" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Role" %}{{ object.role|linkify|placeholder }}
{% trans "Platform" %}{{ object.platform|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Config Template" %}{{ object.config_template|linkify|placeholder }}
{% trans "Primary IPv4" %} + {% if object.primary_ip4 %} + {{ object.primary_ip4.address.ip }} + {% if object.primary_ip4.nat_inside %} + ({% trans "NAT for" %} {{ object.primary_ip4.nat_inside.address.ip }}) + {% elif object.primary_ip4.nat_outside.exists %} + ({% trans "NAT" %}: {% for nat in object.primary_ip4.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %}) + {% endif %} + {% copy_content "primary_ip4" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Primary IPv6" %} + {% if object.primary_ip6 %} + {{ object.primary_ip6.address.ip }} + {% if object.primary_ip6.nat_inside %} + ({% trans "NAT for" %} {{ object.primary_ip6.nat_inside.address.ip }}) + {% elif object.primary_ip6.nat_outside.exists %} + ({% trans "NAT" %}: {% for nat in object.primary_ip6.nat_outside.all %}{{ nat.address.ip }}{% if not forloop.last %}, {% endif %}{% endfor %}) + {% endif %} + {% copy_content "primary_ip6" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% include 'inc/panels/custom_fields.html' %} {% include 'inc/panels/tags.html' %} @@ -90,68 +86,64 @@
{% trans "Cluster" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Site" %} - {{ object.site|linkify|placeholder }} -
{% trans "Cluster" %} - {% if object.cluster.group %} - {{ object.cluster.group|linkify }} / - {% endif %} - {{ object.cluster|linkify|placeholder }} -
{% trans "Cluster Type" %}{{ object.cluster.type }}
{% trans "Device" %} - {{ object.device|linkify|placeholder }} -
-
+ + + + + + + + + + + + + + + + + +
{% trans "Site" %} + {{ object.site|linkify|placeholder }} +
{% trans "Cluster" %} + {% if object.cluster.group %} + {{ object.cluster.group|linkify }} / + {% endif %} + {{ object.cluster|linkify|placeholder }} +
{% trans "Cluster Type" %}{{ object.cluster.type }}
{% trans "Device" %} + {{ object.device|linkify|placeholder }} +
{% trans "Resources" %}
-
- - - - - - - - - - - - + + + + + +
{% trans "Virtual CPUs" %}{{ object.vcpus|placeholder }}
{% trans "Memory" %} - {% if object.memory %} - {{ object.memory|humanize_megabytes }} - {% else %} - {{ ''|placeholder }} - {% endif %} -
- {% trans "Disk Space" %} - - {% if object.disk %} - {{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %} + + + + + + + + - -
{% trans "Virtual CPUs" %}{{ object.vcpus|placeholder }}
{% trans "Memory" %} + {% if object.memory %} + {{ object.memory|humanize_megabytes }} {% else %} - {{ ''|placeholder }} + {{ ''|placeholder }} {% endif %} -
- +
+ {% trans "Disk Space" %} + + {% if object.disk %} + {{ object.disk }} {% trans "GB" context "Abbreviation for gigabyte" %} + {% else %} + {{ ''|placeholder }} + {% endif %} +
{% trans "Services" %}
diff --git a/netbox/templates/virtualization/virtualmachine/render_config.html b/netbox/templates/virtualization/virtualmachine/render_config.html index e1ff26d0a..4b67982f4 100644 --- a/netbox/templates/virtualization/virtualmachine/render_config.html +++ b/netbox/templates/virtualization/virtualmachine/render_config.html @@ -9,22 +9,20 @@
{% trans "Config Template" %}
-
- - - - - - - - - - - - - -
{% trans "Config Template" %}{{ config_template|linkify|placeholder }}
{% trans "Data Source" %}{{ config_template.data_file.source|linkify|placeholder }}
{% trans "Data File" %}{{ config_template.data_file|linkify|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "Config Template" %}{{ config_template|linkify|placeholder }}
{% trans "Data Source" %}{{ config_template.data_file.source|linkify|placeholder }}
{% trans "Data File" %}{{ config_template.data_file|linkify|placeholder }}
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html index ad323311d..97042cb81 100644 --- a/netbox/templates/virtualization/vminterface.html +++ b/netbox/templates/virtualization/vminterface.html @@ -15,63 +15,59 @@
-
- {% trans "Interface" %} -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Virtual Machine" %}{{ object.virtual_machine|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Enabled" %} - {% if object.enabled %} - - {% else %} - - {% endif %} -
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% trans "Bridge" %}{{ object.bridge|linkify|placeholder }}
{% trans "VRF" %}{{ object.vrf|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "MTU" %}{{ object.mtu|placeholder }}
{% trans "MAC Address" %}{{ object.mac_address|placeholder }}
{% trans "802.1Q Mode" %}{{ object.get_mode_display|placeholder }}
{% trans "Tunnel" %}{{ object.tunnel_termination.tunnel|linkify|placeholder }}
-
+
{% trans "Interface" %}
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Virtual Machine" %}{{ object.virtual_machine|linkify }}
{% trans "Name" %}{{ object.name }}
{% trans "Enabled" %} + {% if object.enabled %} + + {% else %} + + {% endif %} +
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% trans "Bridge" %}{{ object.bridge|linkify|placeholder }}
{% trans "VRF" %}{{ object.vrf|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "MTU" %}{{ object.mtu|placeholder }}
{% trans "MAC Address" %}{{ object.mac_address|placeholder }}
{% trans "802.1Q Mode" %}{{ object.get_mode_display|placeholder }}
{% trans "Tunnel" %}{{ object.tunnel_termination.tunnel|linkify|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/vpn/ikepolicy.html b/netbox/templates/vpn/ikepolicy.html index 17b58e394..379f3a2af 100644 --- a/netbox/templates/vpn/ikepolicy.html +++ b/netbox/templates/vpn/ikepolicy.html @@ -8,41 +8,39 @@
{% trans "IKE Policy" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "IKE Version" %}{{ object.get_version_display }}
{% trans "Mode" %}{{ object.get_mode_display }}
{% trans "Pre-Shared Key" %} - {{ object.preshared_key|placeholder }} - {% if object.preshared_key %} - - {% endif %} -
{% trans "IPSec Profiles" %} - {{ object.ipsec_profiles.count }} -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "IKE Version" %}{{ object.get_version_display }}
{% trans "Mode" %}{{ object.get_mode_display }}
{% trans "Pre-Shared Key" %} + {{ object.preshared_key|placeholder }} + {% if object.preshared_key %} + + {% endif %} +
{% trans "IPSec Profiles" %} + {{ object.ipsec_profiles.count }} +
{% plugin_left_page object %}
diff --git a/netbox/templates/vpn/ikeproposal.html b/netbox/templates/vpn/ikeproposal.html index c8b25f623..616bca16a 100644 --- a/netbox/templates/vpn/ikeproposal.html +++ b/netbox/templates/vpn/ikeproposal.html @@ -8,44 +8,42 @@
{% trans "IKE Proposal" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Authentication method" %}{{ object.get_authentication_method_display }}
{% trans "Encryption algorithm" %}{{ object.get_encryption_algorithm_display }}
{% trans "Authentication algorithm" %}{{ object.get_authentication_algorithm_display }}
{% trans "DH group" %}{{ object.get_group_display }}
{% trans "SA lifetime (seconds)" %}{{ object.sa_lifetime|placeholder }}
{% trans "IKE Policies" %} - {{ object.ike_policies.count }} -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Authentication method" %}{{ object.get_authentication_method_display }}
{% trans "Encryption algorithm" %}{{ object.get_encryption_algorithm_display }}
{% trans "Authentication algorithm" %}{{ object.get_authentication_algorithm_display }}
{% trans "DH group" %}{{ object.get_group_display }}
{% trans "SA lifetime (seconds)" %}{{ object.sa_lifetime|placeholder }}
{% trans "IKE Policies" %} + {{ object.ike_policies.count }} +
{% plugin_left_page object %}
diff --git a/netbox/templates/vpn/ipsecpolicy.html b/netbox/templates/vpn/ipsecpolicy.html index 312303f41..ce618264d 100644 --- a/netbox/templates/vpn/ipsecpolicy.html +++ b/netbox/templates/vpn/ipsecpolicy.html @@ -8,28 +8,26 @@
{% trans "IPSec Policy" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "PFS group" %}{{ object.get_pfs_group_display|placeholder }}
{% trans "IPSec Profiles" %} - {{ object.ipsec_profiles.count }} -
-
+ + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "PFS group" %}{{ object.get_pfs_group_display|placeholder }}
{% trans "IPSec Profiles" %} + {{ object.ipsec_profiles.count }} +
{% plugin_left_page object %}
diff --git a/netbox/templates/vpn/ipsecprofile.html b/netbox/templates/vpn/ipsecprofile.html index c1172870f..2d31e2553 100644 --- a/netbox/templates/vpn/ipsecprofile.html +++ b/netbox/templates/vpn/ipsecprofile.html @@ -8,22 +8,20 @@
{% trans "IPSec Profile" %}
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Mode" %}{{ object.get_mode_display }}
-
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Mode" %}{{ object.get_mode_display }}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/custom_fields.html' %} @@ -33,69 +31,65 @@
{% trans "IKE Policy" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.ike_policy|linkify }}
{% trans "Description" %}{{ object.ike_policy.description|placeholder }}
{% trans "Version" %}{{ object.ike_policy.get_version_display }}
{% trans "Mode" %}{{ object.ike_policy.get_mode_display }}
{% trans "Proposals" %} -
    - {% for proposal in object.ike_policy.proposals.all %} -
  • - {{ proposal }} -
    • - {% endfor %} -
-
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.ike_policy|linkify }}
{% trans "Description" %}{{ object.ike_policy.description|placeholder }}
{% trans "Version" %}{{ object.ike_policy.get_version_display }}
{% trans "Mode" %}{{ object.ike_policy.get_mode_display }}
{% trans "Proposals" %} +
    + {% for proposal in object.ike_policy.proposals.all %} +
  • + {{ proposal }} +
    • + {% endfor %} +
+
{% trans "IPSec Policy" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.ipsec_policy|linkify }}
{% trans "Description" %}{{ object.ipsec_policy.description|placeholder }}
{% trans "Proposals" %} -
    - {% for proposal in object.ipsec_policy.proposals.all %} -
  • - {{ proposal }} -
    • - {% endfor %} -
-
{% trans "PFS Group" %}{{ object.ipsec_policy.get_pfs_group_display }}
-
+ + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.ipsec_policy|linkify }}
{% trans "Description" %}{{ object.ipsec_policy.description|placeholder }}
{% trans "Proposals" %} +
    + {% for proposal in object.ipsec_policy.proposals.all %} +
  • + {{ proposal }} +
    • + {% endfor %} +
+
{% trans "PFS Group" %}{{ object.ipsec_policy.get_pfs_group_display }}
{% plugin_right_page object %}
diff --git a/netbox/templates/vpn/ipsecproposal.html b/netbox/templates/vpn/ipsecproposal.html index d97775bf8..68c516a6a 100644 --- a/netbox/templates/vpn/ipsecproposal.html +++ b/netbox/templates/vpn/ipsecproposal.html @@ -8,40 +8,38 @@
{% trans "IPSec Proposal" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Encryption algorithm" %}{{ object.get_encryption_algorithm_display }}
{% trans "Authentication algorithm" %}{{ object.get_authentication_algorithm_display }}
{% trans "SA lifetime (seconds)" %}{{ object.sa_lifetime_seconds|placeholder }}
{% trans "SA lifetime (KB)" %}{{ object.sa_lifetime_data|placeholder }}
{% trans "IPSec Policies" %} - {{ object.ipsec_policies.count }} -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Encryption algorithm" %}{{ object.get_encryption_algorithm_display }}
{% trans "Authentication algorithm" %}{{ object.get_authentication_algorithm_display }}
{% trans "SA lifetime (seconds)" %}{{ object.sa_lifetime_seconds|placeholder }}
{% trans "SA lifetime (KB)" %}{{ object.sa_lifetime_data|placeholder }}
{% trans "IPSec Policies" %} + {{ object.ipsec_policies.count }} +
{% plugin_left_page object %}
diff --git a/netbox/templates/vpn/l2vpn.html b/netbox/templates/vpn/l2vpn.html index ea21a1857..af9997cc6 100644 --- a/netbox/templates/vpn/l2vpn.html +++ b/netbox/templates/vpn/l2vpn.html @@ -9,30 +9,28 @@
{% trans "L2VPN Attributes" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name|placeholder }}
{% trans "Identifier" %}{{ object.identifier|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Tenant" %}{{ object.tenant|linkify|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name|placeholder }}
{% trans "Identifier" %}{{ object.identifier|placeholder }}
{% trans "Type" %}{{ object.get_type_display }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Tenant" %}{{ object.tenant|linkify|placeholder }}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='vpn:l2vpn_list' %} {% plugin_left_page object %} diff --git a/netbox/templates/vpn/l2vpntermination.html b/netbox/templates/vpn/l2vpntermination.html index 0e7539481..725a98533 100644 --- a/netbox/templates/vpn/l2vpntermination.html +++ b/netbox/templates/vpn/l2vpntermination.html @@ -6,21 +6,17 @@
-
- {% trans "L2VPN Attributes" %} -
-
- - - - - - - - - -
{% trans "L2VPN" %}{{ object.l2vpn|linkify }}
{% trans "Assigned Object" %}{{ object.assigned_object|linkify }}
-
+
{% trans "L2VPN Attributes" %}
+ + + + + + + + + +
{% trans "L2VPN" %}{{ object.l2vpn|linkify }}
{% trans "Assigned Object" %}{{ object.assigned_object|linkify }}
diff --git a/netbox/templates/vpn/tunnel.html b/netbox/templates/vpn/tunnel.html index 194b12ddd..b1993f428 100644 --- a/netbox/templates/vpn/tunnel.html +++ b/netbox/templates/vpn/tunnel.html @@ -16,47 +16,45 @@
{% trans "Tunnel" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Encapsulation" %}{{ object.get_encapsulation_display }}
{% trans "IPSec profile" %}{{ object.ipsec_profile|linkify|placeholder }}
{% trans "Tunnel ID" %}{{ object.tunnel_id|placeholder }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Encapsulation" %}{{ object.get_encapsulation_display }}
{% trans "IPSec profile" %}{{ object.ipsec_profile|linkify|placeholder }}
{% trans "Tunnel ID" %}{{ object.tunnel_id|placeholder }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% plugin_left_page object %}
diff --git a/netbox/templates/vpn/tunnelgroup.html b/netbox/templates/vpn/tunnelgroup.html index 3eac913bf..09f4ec2d2 100644 --- a/netbox/templates/vpn/tunnelgroup.html +++ b/netbox/templates/vpn/tunnelgroup.html @@ -20,21 +20,17 @@
-
- {% trans "Tunnel Group" %} -
-
- - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
-
+
{% trans "Tunnel Group" %}
+ + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/vpn/tunneltermination.html b/netbox/templates/vpn/tunneltermination.html index 9fb3c8489..0df707478 100644 --- a/netbox/templates/vpn/tunneltermination.html +++ b/netbox/templates/vpn/tunneltermination.html @@ -8,36 +8,34 @@
{% trans "Tunnel Termination" %}
-
- - - - - - - - - - - - - - - - - - - - - -
{% trans "Tunnel" %}{{ object.tunnel|linkify }}
{% trans "Role" %}{% badge object.get_role_display bg_color=object.get_role_color %}
- {% if object.termination.device %} - {% trans "Device" %} - {% elif object.termination.virtual_machine %} - {% trans "Virtual Machine" %} - {% endif %} - {{ object.termination.parent_object|linkify }}
{% trans "Interface" %}{{ object.termination|linkify }}
{% trans "Outside IP" %}{{ object.outside_ip|linkify|placeholder }}
-
+ + + + + + + + + + + + + + + + + + + + + +
{% trans "Tunnel" %}{{ object.tunnel|linkify }}
{% trans "Role" %}{% badge object.get_role_display bg_color=object.get_role_color %}
+ {% if object.termination.device %} + {% trans "Device" %} + {% elif object.termination.virtual_machine %} + {% trans "Virtual Machine" %} + {% endif %} + {{ object.termination.parent_object|linkify }}
{% trans "Interface" %}{{ object.termination|linkify }}
{% trans "Outside IP" %}{{ object.outside_ip|linkify|placeholder }}
{% plugin_left_page object %}
diff --git a/netbox/templates/wireless/inc/authentication_attrs.html b/netbox/templates/wireless/inc/authentication_attrs.html index 683e7978a..739177a3e 100644 --- a/netbox/templates/wireless/inc/authentication_attrs.html +++ b/netbox/templates/wireless/inc/authentication_attrs.html @@ -3,25 +3,23 @@
{% trans "Authentication" %}
-
- - - - - - - - - - - - - -
{% trans "Type" %}{{ object.get_auth_type_display|placeholder }}
{% trans "Cipher" %}{{ object.get_auth_cipher_display|placeholder }}
{% trans "PSK" %} - {{ object.auth_psk|placeholder }} - {% if object.auth_psk %} - - {% endif %} -
-
+ + + + + + + + + + + + + +
{% trans "Type" %}{{ object.get_auth_type_display|placeholder }}
{% trans "Cipher" %}{{ object.get_auth_cipher_display|placeholder }}
{% trans "PSK" %} + {{ object.auth_psk|placeholder }} + {% if object.auth_psk %} + + {% endif %} +
diff --git a/netbox/templates/wireless/wirelesslan.html b/netbox/templates/wireless/wirelesslan.html index 82abc2f74..1adcc578a 100644 --- a/netbox/templates/wireless/wirelesslan.html +++ b/netbox/templates/wireless/wirelesslan.html @@ -9,39 +9,37 @@
{% trans "Wireless LAN" %}
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
{% trans "SSID" %}{{ object.ssid }}
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "VLAN" %}{{ object.vlan|linkify|placeholder }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + +
{% trans "SSID" %}{{ object.ssid }}
{% trans "Group" %}{{ object.group|linkify|placeholder }}
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "VLAN" %}{{ object.vlan|linkify|placeholder }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/comments.html' %} diff --git a/netbox/templates/wireless/wirelesslangroup.html b/netbox/templates/wireless/wirelesslangroup.html index a7b956ca5..60fdd0684 100644 --- a/netbox/templates/wireless/wirelesslangroup.html +++ b/netbox/templates/wireless/wirelesslangroup.html @@ -24,22 +24,20 @@
{% trans "Wireless LAN Group" %}
-
- - - - - - - - - - - - - -
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
-
+ + + + + + + + + + + + + +
{% trans "Name" %}{{ object.name }}
{% trans "Description" %}{{ object.description|placeholder }}
{% trans "Parent" %}{{ object.parent|linkify|placeholder }}
{% include 'inc/panels/tags.html' %} {% plugin_left_page object %} diff --git a/netbox/templates/wireless/wirelesslink.html b/netbox/templates/wireless/wirelesslink.html index 8b1ecfd0d..3237c9ab8 100644 --- a/netbox/templates/wireless/wirelesslink.html +++ b/netbox/templates/wireless/wirelesslink.html @@ -8,37 +8,33 @@
{% trans "Interface" %} A
-
- {% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_a %} -
+ {% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_a %}
{% trans "Link Properties" %}
-
- - - - - - - - - - - - - - - - - -
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "SSID" %}{{ object.ssid|placeholder }}
{% trans "Tenant" %} - {% if object.tenant.group %} - {{ object.tenant.group|linkify }} / - {% endif %} - {{ object.tenant|linkify|placeholder }} -
{% trans "Description" %}{{ object.description|placeholder }}
-
+ + + + + + + + + + + + + + + + + +
{% trans "Status" %}{% badge object.get_status_display bg_color=object.get_status_color %}
{% trans "SSID" %}{{ object.ssid|placeholder }}
{% trans "Tenant" %} + {% if object.tenant.group %} + {{ object.tenant.group|linkify }} / + {% endif %} + {{ object.tenant|linkify|placeholder }} +
{% trans "Description" %}{{ object.description|placeholder }}
{% include 'inc/panels/tags.html' %} {% include 'inc/panels/comments.html' %} @@ -47,9 +43,7 @@
{% trans "Interface" %} B
-
- {% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_b %} -
+ {% include 'wireless/inc/wirelesslink_interface.html' with interface=object.interface_b %}
{% include 'wireless/inc/authentication_attrs.html' %} {% include 'inc/panels/custom_fields.html' %}