From 17f400e88fea91e1ec8b524f1d4845b20969c6d8 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 3 Jan 2024 15:54:04 -0500 Subject: [PATCH] Standardize primary button sizing --- netbox/project-static/dist/netbox.css | Bin 523723 -> 523724 bytes netbox/project-static/styles/variables.scss | 5 ++ netbox/templates/account/bookmarks.html | 10 ++- netbox/templates/account/token_list.html | 2 +- netbox/templates/base/40x.html | 2 +- netbox/templates/circuits/circuittype.html | 2 +- .../circuits/inc/circuit_termination.html | 16 ++--- netbox/templates/circuits/provider.html | 2 +- netbox/templates/core/datasource.html | 4 +- netbox/templates/dcim/cable_trace.html | 2 +- netbox/templates/dcim/component_list.html | 2 +- netbox/templates/dcim/consoleport.html | 2 +- netbox/templates/dcim/consoleserverport.html | 2 +- netbox/templates/dcim/device.html | 10 +-- netbox/templates/dcim/device/base.html | 2 +- .../dcim/device/components_base.html | 4 +- .../templates/dcim/device/consoleports.html | 6 +- .../dcim/device/consoleserverports.html | 6 +- netbox/templates/dcim/device/devicebays.html | 4 +- netbox/templates/dcim/device/frontports.html | 6 +- .../device/inc/interface_table_controls.html | 2 +- netbox/templates/dcim/device/interfaces.html | 12 ++-- netbox/templates/dcim/device/inventory.html | 4 +- netbox/templates/dcim/device/modulebays.html | 4 +- .../templates/dcim/device/poweroutlets.html | 6 +- netbox/templates/dcim/device/powerports.html | 6 +- netbox/templates/dcim/device/rearports.html | 6 +- .../templates/dcim/device/render_config.html | 2 +- netbox/templates/dcim/device_list.html | 4 +- netbox/templates/dcim/devicerole.html | 2 +- netbox/templates/dcim/devicetype/base.html | 2 +- .../dcim/devicetype/component_templates.html | 8 +-- netbox/templates/dcim/frontport.html | 4 +- .../dcim/inc/connection_endpoints.html | 2 +- .../dcim/inc/interface_vlans_table.html | 4 +- .../dcim/inc/panels/inventory_items.html | 6 +- netbox/templates/dcim/inc/rack_elevation.html | 2 +- netbox/templates/dcim/interface.html | 10 +-- netbox/templates/dcim/location.html | 6 +- netbox/templates/dcim/manufacturer.html | 2 +- netbox/templates/dcim/module.html | 2 +- netbox/templates/dcim/moduletype/base.html | 2 +- .../dcim/moduletype/component_templates.html | 8 +-- netbox/templates/dcim/platform.html | 2 +- netbox/templates/dcim/powerfeed.html | 2 +- netbox/templates/dcim/poweroutlet.html | 2 +- netbox/templates/dcim/powerpanel.html | 8 +-- netbox/templates/dcim/powerport.html | 2 +- netbox/templates/dcim/rack.html | 2 +- netbox/templates/dcim/rack/base.html | 6 +- .../dcim/rack/non_racked_devices.html | 10 ++- netbox/templates/dcim/rack/reservations.html | 10 ++- .../templates/dcim/rack_elevation_list.html | 6 +- netbox/templates/dcim/rack_list.html | 2 +- netbox/templates/dcim/rackrole.html | 2 +- netbox/templates/dcim/rearport.html | 4 +- netbox/templates/dcim/region.html | 4 +- netbox/templates/dcim/site.html | 8 +-- netbox/templates/dcim/sitegroup.html | 4 +- netbox/templates/dcim/virtualchassis.html | 2 +- .../templates/dcim/virtualchassis_edit.html | 2 +- .../templates/extras/configcontext_list.html | 2 +- .../templates/extras/configtemplate_list.html | 2 +- .../templates/extras/exporttemplate_list.html | 2 +- netbox/templates/extras/report_list.html | 4 +- netbox/templates/extras/script_list.html | 2 +- netbox/templates/generic/bulk_edit.html | 4 +- netbox/templates/generic/bulk_import.html | 2 +- netbox/templates/generic/object_children.html | 62 ++++++++---------- netbox/templates/generic/object_list.html | 20 +++--- netbox/templates/home.html | 10 +-- netbox/templates/htmx/object_selector.html | 2 +- netbox/templates/inc/filter_list.html | 4 +- .../inc/panels/image_attachments.html | 2 +- netbox/templates/ipam/aggregate/prefixes.html | 2 +- netbox/templates/ipam/fhrpgroup.html | 2 +- .../ipam/inc/panels/fhrp_groups.html | 8 +-- .../templates/ipam/inc/toggle_available.html | 6 +- .../templates/ipam/iprange/ip_addresses.html | 2 +- netbox/templates/ipam/prefix.html | 2 +- .../templates/ipam/prefix/ip_addresses.html | 2 +- netbox/templates/ipam/prefix/ip_ranges.html | 2 +- netbox/templates/ipam/prefix/prefixes.html | 2 +- netbox/templates/ipam/prefix_list.html | 6 +- netbox/templates/ipam/rir.html | 2 +- netbox/templates/ipam/role.html | 2 +- netbox/templates/ipam/vlan.html | 2 +- netbox/templates/ipam/vlangroup.html | 2 +- netbox/templates/tenancy/contactgroup.html | 2 +- netbox/templates/tenancy/object_contacts.html | 2 +- netbox/templates/tenancy/tenantgroup.html | 4 +- .../virtualization/cluster/base.html | 4 +- .../virtualization/cluster/devices.html | 2 +- .../virtualization/clustergroup.html | 2 +- .../templates/virtualization/clustertype.html | 2 +- .../virtualization/virtualmachine.html | 4 +- .../virtualization/virtualmachine/base.html | 2 +- .../virtualmachine/interfaces.html | 2 +- .../virtualmachine/render_config.html | 2 +- .../virtualmachine/virtual_disks.html | 2 +- .../virtualization/virtualmachine_list.html | 2 +- .../templates/virtualization/vminterface.html | 2 +- netbox/templates/vpn/ikepolicy.html | 2 +- netbox/templates/vpn/l2vpn.html | 2 +- netbox/templates/vpn/tunnel.html | 4 +- netbox/templates/vpn/tunnelgroup.html | 2 +- .../wireless/inc/authentication_attrs.html | 2 +- .../templates/wireless/wirelesslangroup.html | 4 +- 108 files changed, 237 insertions(+), 246 deletions(-) diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css index 8ed4ecab422a18b0f27de1942b36a6c03a7a8d2d..3e753bcac425de608efd67b451ffd3730e603320 100644 GIT binary patch delta 63 zcmX^8TmH;%`3+M)PWPV7$U8auKhN~+$&7-V4}9#_pI)?%O}0Hvkr9ZQfS4JGS%8=o Nh}pKMDYB>D0RWTc84Lgb delta 64 zcmX@}TmJNK`3+M)G8#_y|1Zu~X{DfNYPNaP#~J#J=F<(QvJ1B-C^7;u6A&{4F$)m0 N0x{e61V#3oI{;Kd7d8L@ diff --git a/netbox/project-static/styles/variables.scss b/netbox/project-static/styles/variables.scss index 547931622..4b85b6158 100644 --- a/netbox/project-static/styles/variables.scss +++ b/netbox/project-static/styles/variables.scss @@ -1,3 +1,8 @@ // NetBox CSS Variables +// Set the navigation sidebar width $sidebar-width: 18rem; + +// Reduce the default button padding +$btn-padding-x: 0.5rem; +$btn-padding-y: 0.25rem; diff --git a/netbox/templates/account/bookmarks.html b/netbox/templates/account/bookmarks.html index 4b90beed3..93f741fd4 100644 --- a/netbox/templates/account/bookmarks.html +++ b/netbox/templates/account/bookmarks.html @@ -23,12 +23,10 @@ {# Form buttons #} -
-
- {% if 'bulk_delete' in actions %} - {% bulk_delete_button model query_params=request.GET %} - {% endif %} -
+
+ {% if 'bulk_delete' in actions %} + {% bulk_delete_button model query_params=request.GET %} + {% endif %}
{% endblock %} diff --git a/netbox/templates/account/token_list.html b/netbox/templates/account/token_list.html index cfcdeb537..ee57c29d5 100644 --- a/netbox/templates/account/token_list.html +++ b/netbox/templates/account/token_list.html @@ -8,7 +8,7 @@ {% block content %}
- + {% trans "Add a Token" %}
diff --git a/netbox/templates/base/40x.html b/netbox/templates/base/40x.html index 7942b9ffd..d14882964 100644 --- a/netbox/templates/base/40x.html +++ b/netbox/templates/base/40x.html @@ -14,7 +14,7 @@ {% block message %}{% endblock %}
- {% trans "Home Page" %} + {% trans "Home Page" %}
diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html index 407ee4042..fe82bc4b9 100644 --- a/netbox/templates/circuits/circuittype.html +++ b/netbox/templates/circuits/circuittype.html @@ -6,7 +6,7 @@ {% block extra_controls %} {% if perms.circuits.add_circuit %} - + {% trans "Add Circuit" %} {% endif %} diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index 7ca83d265..eafaba57d 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -5,20 +5,20 @@
{% if not termination and perms.circuits.add_circuittermination %} - + {% trans "Add" %} {% endif %} {% if termination and perms.circuits.change_circuittermination %} - + {% trans "Edit" %} - + {% trans "Swap" %} {% endif %} {% if termination and perms.circuits.delete_circuittermination %} - + {% trans "Delete" %} {% endif %} @@ -55,23 +55,23 @@ {{ peer|linkify }}{% if not forloop.last %},{% endif %} {% endfor %}
- + {% trans "Trace" %} {% if perms.dcim.change_cable %} - + {% trans "Edit" %} {% endif %} {% if perms.dcim.delete_cable %} - + {% trans "Disconnect" %} {% endif %}
{% elif perms.dcim.add_cable %}
-
    diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 6fabb304d..6ea4a6f1f 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -7,7 +7,7 @@ {% block extra_controls %} {% if perms.circuits.add_circuit %} - + {% trans "Add circuit" %} {% endif %} diff --git a/netbox/templates/core/datasource.html b/netbox/templates/core/datasource.html index 51090b0c9..abd366901 100644 --- a/netbox/templates/core/datasource.html +++ b/netbox/templates/core/datasource.html @@ -10,13 +10,13 @@ {% if object.ready_for_sync %}
    {% csrf_token %} -
    {% else %} - diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html index b004634bb..e925c79d8 100644 --- a/netbox/templates/dcim/cable_trace.html +++ b/netbox/templates/dcim/cable_trace.html @@ -17,7 +17,7 @@
    diff --git a/netbox/templates/dcim/component_list.html b/netbox/templates/dcim/component_list.html index a80dcfea8..4f9b543f0 100644 --- a/netbox/templates/dcim/component_list.html +++ b/netbox/templates/dcim/component_list.html @@ -10,7 +10,7 @@ {% endif %} {% if 'bulk_rename' in actions %} {% with bulk_rename_view=model|validated_viewname:"bulk_rename" %} - {% endwith %} diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html index b501215e6..52da72142 100644 --- a/netbox/templates/dcim/consoleport.html +++ b/netbox/templates/dcim/consoleport.html @@ -67,7 +67,7 @@ {% trans "Not Connected" %} {% if perms.dcim.add_cable %}
    -
      diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html index 14fa572ec..86fc705bd 100644 --- a/netbox/templates/dcim/consoleserverport.html +++ b/netbox/templates/dcim/consoleserverport.html @@ -67,7 +67,7 @@ {% trans "Not Connected" %} {% if perms.dcim.add_cable %}
      -
        diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 39e78c81b..435fb4f0b 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -32,7 +32,7 @@ {% if object.rack %} {{ object.rack|linkify }}
        - +
        @@ -66,7 +66,7 @@ {% if object.latitude and object.longitude %} {% if config.MAPS_URL %}
        - + {% trans "Map It" %}
        @@ -149,7 +149,7 @@
      - + {% trans "View Virtual Chassis" %}
      @@ -166,7 +166,7 @@ >
    {% if perms.dcim.add_virtualdevicecontext %}
    - + {% trans "Create VDC" %}
    @@ -308,7 +308,7 @@ >
    {% if perms.ipam.add_service %}
    - + {% trans "Add a service" %}
    diff --git a/netbox/templates/dcim/device/base.html b/netbox/templates/dcim/device/base.html index 43d5c5ae9..fd0557fd0 100644 --- a/netbox/templates/dcim/device/base.html +++ b/netbox/templates/dcim/device/base.html @@ -17,7 +17,7 @@ {% block extra_controls %} {% if perms.dcim.change_device %}
    -
      diff --git a/netbox/templates/dcim/device/components_base.html b/netbox/templates/dcim/device/components_base.html index b6ec700b0..40d3f0f80 100644 --- a/netbox/templates/dcim/device/components_base.html +++ b/netbox/templates/dcim/device/components_base.html @@ -6,7 +6,7 @@ {% if 'bulk_edit' in actions and bulk_edit_view %} {% endif %} @@ -15,7 +15,7 @@ {% if 'bulk_rename' in actions and bulk_rename_view %} {% endif %} diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html index 90f4f99ed..0e9fcb7bf 100644 --- a/netbox/templates/dcim/device/consoleports.html +++ b/netbox/templates/dcim/device/consoleports.html @@ -8,7 +8,7 @@ {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} {% endif %} @@ -18,9 +18,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_consoleport %} -
      +
      + class="btn btn-primary"> {% trans "Add Console Ports" %}
      diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html index 39289f2e5..09598e4f1 100644 --- a/netbox/templates/dcim/device/consoleserverports.html +++ b/netbox/templates/dcim/device/consoleserverports.html @@ -8,7 +8,7 @@ {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} {% endif %} @@ -18,9 +18,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_consoleserverport %} -
      +
      + class="btn btn-primary"> {% trans "Add Console Server Ports" %}
      diff --git a/netbox/templates/dcim/device/devicebays.html b/netbox/templates/dcim/device/devicebays.html index 5b2a396d7..b558cdfb4 100644 --- a/netbox/templates/dcim/device/devicebays.html +++ b/netbox/templates/dcim/device/devicebays.html @@ -4,9 +4,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_devicebay %} -
      +
      + class="btn btn-primary"> {% trans "Add Device Bays" %}
      diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html index 2edef9894..ed7a6a0ba 100644 --- a/netbox/templates/dcim/device/frontports.html +++ b/netbox/templates/dcim/device/frontports.html @@ -8,7 +8,7 @@ {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} {% endif %} @@ -18,9 +18,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_frontport %} -
      +
      + class="btn btn-primary"> {% trans "Add Front Ports" %}
      diff --git a/netbox/templates/dcim/device/inc/interface_table_controls.html b/netbox/templates/dcim/device/inc/interface_table_controls.html index 7868d99db..f942ba9ca 100644 --- a/netbox/templates/dcim/device/inc/interface_table_controls.html +++ b/netbox/templates/dcim/device/inc/interface_table_controls.html @@ -2,7 +2,7 @@ {% load i18n %} {% block extra_table_controls %} -
        diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html index 8b3fe3097..8b668e7eb 100644 --- a/netbox/templates/dcim/device/interfaces.html +++ b/netbox/templates/dcim/device/interfaces.html @@ -12,7 +12,7 @@ {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} {% endif %} @@ -22,11 +22,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_interface %} -
        - - {% trans "Add Interfaces" %} - -
        + + {% trans "Add Interfaces" %} + {% endif %} {% endblock bulk_extra_controls %} diff --git a/netbox/templates/dcim/device/inventory.html b/netbox/templates/dcim/device/inventory.html index 15d70d959..cbc113d86 100644 --- a/netbox/templates/dcim/device/inventory.html +++ b/netbox/templates/dcim/device/inventory.html @@ -4,9 +4,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_inventoryitem %} -
        +
        + class="btn btn-primary"> {% trans "Add Inventory Item" %}
        diff --git a/netbox/templates/dcim/device/modulebays.html b/netbox/templates/dcim/device/modulebays.html index b218242be..c23532efe 100644 --- a/netbox/templates/dcim/device/modulebays.html +++ b/netbox/templates/dcim/device/modulebays.html @@ -4,9 +4,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_modulebay %} -
        +
        + class="btn btn-primary"> {% trans "Add Module Bays" %}
        diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html index 34f51e389..7f786d13c 100644 --- a/netbox/templates/dcim/device/poweroutlets.html +++ b/netbox/templates/dcim/device/poweroutlets.html @@ -8,7 +8,7 @@ {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} {% endif %} @@ -18,9 +18,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_poweroutlet %} -
        +
        + class="btn btn-primary"> {% trans "Add Power Outlets" %}
        diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html index ee9d57fd2..af7c69549 100644 --- a/netbox/templates/dcim/device/powerports.html +++ b/netbox/templates/dcim/device/powerports.html @@ -8,7 +8,7 @@ {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} {% endif %} @@ -18,9 +18,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_powerport %} -
        +
        + class="btn btn-primary"> {% trans "Add Power Port" %}
        diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html index 0c7781005..5db8fb7bc 100644 --- a/netbox/templates/dcim/device/rearports.html +++ b/netbox/templates/dcim/device/rearports.html @@ -8,7 +8,7 @@ {% if 'bulk_disconnect' in actions and bulk_disconnect_view %} {% endif %} @@ -18,9 +18,9 @@ {% block bulk_extra_controls %} {{ block.super }} {% if perms.dcim.add_rearport %} -
        +
        + class="btn btn-primary"> {% trans "Add Rear Ports" %}
        diff --git a/netbox/templates/dcim/device/render_config.html b/netbox/templates/dcim/device/render_config.html index 090bfccdf..759fc7177 100644 --- a/netbox/templates/dcim/device/render_config.html +++ b/netbox/templates/dcim/device/render_config.html @@ -53,7 +53,7 @@
        - + {% trans "Download" %}
        diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html index e30a92265..6ccb78480 100644 --- a/netbox/templates/dcim/device_list.html +++ b/netbox/templates/dcim/device_list.html @@ -5,7 +5,7 @@ {% block bulk_buttons %} {% if perms.dcim.change_device %}
        -
          @@ -78,7 +78,7 @@ {% if 'bulk_edit' in actions %}
          {% bulk_edit_button model query_params=request.GET %} -
          diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html index 8bc10bfc2..72bd3845f 100644 --- a/netbox/templates/dcim/devicerole.html +++ b/netbox/templates/dcim/devicerole.html @@ -10,7 +10,7 @@ {% block extra_controls %} {% if perms.dcim.add_device %} - + {% trans "Add Device" %} {% endif %} diff --git a/netbox/templates/dcim/devicetype/base.html b/netbox/templates/dcim/devicetype/base.html index 5a6b5e15d..19d3ec33c 100644 --- a/netbox/templates/dcim/devicetype/base.html +++ b/netbox/templates/dcim/devicetype/base.html @@ -14,7 +14,7 @@ {% block extra_controls %} {% if perms.dcim.change_devicetype %}
          -
            diff --git a/netbox/templates/dcim/devicetype/component_templates.html b/netbox/templates/dcim/devicetype/component_templates.html index 9a5210762..8c392965d 100644 --- a/netbox/templates/dcim/devicetype/component_templates.html +++ b/netbox/templates/dcim/devicetype/component_templates.html @@ -14,18 +14,18 @@
          {% if table.rows %} - - - {% endif %}
          - + {% trans "Add" %} {{ title }} diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html index e8b6216ac..0387f5206 100644 --- a/netbox/templates/dcim/frontport.html +++ b/netbox/templates/dcim/frontport.html @@ -84,7 +84,7 @@ {% trans "Cable" %} {{ object.cable|linkify }} - + @@ -105,7 +105,7 @@ {% trans "Not Connected" %} {% if perms.dcim.add_cable %}
          -
            diff --git a/netbox/templates/dcim/inc/connection_endpoints.html b/netbox/templates/dcim/inc/connection_endpoints.html index 27b7ce468..79d2cf5d1 100644 --- a/netbox/templates/dcim/inc/connection_endpoints.html +++ b/netbox/templates/dcim/inc/connection_endpoints.html @@ -4,7 +4,7 @@ {% trans "Cable" %} {{ object.cable|linkify }} - + diff --git a/netbox/templates/dcim/inc/interface_vlans_table.html b/netbox/templates/dcim/inc/interface_vlans_table.html index 399b9d6b8..72689b374 100644 --- a/netbox/templates/dcim/inc/interface_vlans_table.html +++ b/netbox/templates/dcim/inc/interface_vlans_table.html @@ -41,10 +41,10 @@ - {% trans "Clear" %} + {% trans "Clear" %} - {% trans "Clear All" %} + {% trans "Clear All" %} {% endif %} diff --git a/netbox/templates/dcim/inc/panels/inventory_items.html b/netbox/templates/dcim/inc/panels/inventory_items.html index 5a2065827..c022f254a 100644 --- a/netbox/templates/dcim/inc/panels/inventory_items.html +++ b/netbox/templates/dcim/inc/panels/inventory_items.html @@ -21,12 +21,12 @@ {{ item.role|linkify|placeholder }} {% if perms.dcim.change_inventoryitem %} - + {% endif %} {% if perms.ipam.delete_inventoryitem %} - + {% endif %} @@ -42,7 +42,7 @@
          {% if perms.dcim.add_inventoryitem %} - + {% trans "Add Inventory Item" %} {% endif %} diff --git a/netbox/templates/dcim/inc/rack_elevation.html b/netbox/templates/dcim/inc/rack_elevation.html index 65897d4de..bfffa8272 100644 --- a/netbox/templates/dcim/inc/rack_elevation.html +++ b/netbox/templates/dcim/inc/rack_elevation.html @@ -3,7 +3,7 @@
          - + {% trans "Download SVG" %}
          diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index 6b15a766d..c315fac59 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -13,7 +13,7 @@ {% block extra_controls %} {% if perms.dcim.add_interface and not object.is_virtual %} - + {% trans "Add Child Interface" %} {% endif %} @@ -157,7 +157,7 @@ {% trans "Wireless Link" %} {{ object.wireless_link|linkify }} - + @@ -182,7 +182,7 @@ {% trans "Not Connected" %} {% if object.is_wired and perms.dcim.add_cable %}
          -
            @@ -202,7 +202,7 @@
          {% elif object.is_wireless and perms.wireless.add_wirelesslink %}
          - + {% trans "Connect" %}
          @@ -355,7 +355,7 @@ >
          {% if perms.ipam.add_ipaddress %}
          - + {% trans "Add IP Address" %}
          diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html index 854b93f9e..705e07da7 100644 --- a/netbox/templates/dcim/location.html +++ b/netbox/templates/dcim/location.html @@ -13,7 +13,7 @@ {% block extra_controls %} {% if perms.dcim.add_location %} - + {% trans "Add Child Location" %} {% endif %} @@ -80,7 +80,7 @@ >
          {% if perms.dcim.add_location %}
          - + {% trans "Add a Location" %}
          @@ -94,7 +94,7 @@ >
        {% if perms.dcim.add_device %}
        - + {% trans "Add a Device" %}
        diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html index 8734fbdf9..abde714f0 100644 --- a/netbox/templates/dcim/manufacturer.html +++ b/netbox/templates/dcim/manufacturer.html @@ -7,7 +7,7 @@ {% block extra_controls %} {% if perms.dcim.add_devicetype or perms.dcim.add_moduletype %}
        -
          diff --git a/netbox/templates/dcim/module.html b/netbox/templates/dcim/module.html index 0b6604cc7..677717478 100644 --- a/netbox/templates/dcim/module.html +++ b/netbox/templates/dcim/module.html @@ -14,7 +14,7 @@ {% block extra_controls %} {% if perms.dcim.change_module %}
          -
            diff --git a/netbox/templates/dcim/moduletype/base.html b/netbox/templates/dcim/moduletype/base.html index e41010f2f..1aaaa427f 100644 --- a/netbox/templates/dcim/moduletype/base.html +++ b/netbox/templates/dcim/moduletype/base.html @@ -14,7 +14,7 @@ {% block extra_controls %} {% if perms.dcim.change_devicetype %}
            -
              diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html index bb54a33f9..6beb4258a 100644 --- a/netbox/templates/dcim/moduletype/component_templates.html +++ b/netbox/templates/dcim/moduletype/component_templates.html @@ -14,18 +14,18 @@
            {% if table.rows %} - - - {% endif %}
            - + {% trans "Add" %} {{ title }} diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html index 9448ad3e5..5a37dc6af 100644 --- a/netbox/templates/dcim/platform.html +++ b/netbox/templates/dcim/platform.html @@ -13,7 +13,7 @@ {% block extra_controls %} {% if perms.dcim.add_device %} - + {% trans "Add Device" %} {% endif %} diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html index 9b791d0e2..40e6cdb54 100644 --- a/netbox/templates/dcim/powerfeed.html +++ b/netbox/templates/dcim/powerfeed.html @@ -132,7 +132,7 @@ {% if not object.mark_connected and not object.cable %}
            {% if perms.dcim.add_cable %} - + {% trans "Connect" %} {% endif %} diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html index 8c8294a8a..800eb056b 100644 --- a/netbox/templates/dcim/poweroutlet.html +++ b/netbox/templates/dcim/poweroutlet.html @@ -72,7 +72,7 @@
            {% trans "Not Connected" %} {% if perms.dcim.add_cable %} - + {% trans "Connect" %} {% endif %} diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html index 0340f7990..8cb4158ff 100644 --- a/netbox/templates/dcim/powerpanel.html +++ b/netbox/templates/dcim/powerpanel.html @@ -57,23 +57,23 @@ >
            {% if perms.dcim.change_powerfeed %} - {% endif %} {% if perms.dcim.delete_cable %} - {% endif %} {% if perms.dcim.delete_powerfeed %} - {% endif %} {% if perms.dcim.add_powerfeed %}
            - + {% trans "Add Power Feeds" %}
            diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html index 48bbc9cfe..e0699fade 100644 --- a/netbox/templates/dcim/powerport.html +++ b/netbox/templates/dcim/powerport.html @@ -73,7 +73,7 @@ {% trans "Not Connected" %} {% if perms.dcim.add_cable %} -
              diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 857061d00..a3ed6c6ad 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -169,7 +169,7 @@
            - diff --git a/netbox/templates/dcim/rack/base.html b/netbox/templates/dcim/rack/base.html index 2f4eb227c..4ab211ac3 100644 --- a/netbox/templates/dcim/rack/base.html +++ b/netbox/templates/dcim/rack/base.html @@ -17,14 +17,14 @@ {% block extra_controls %}
            {% if prev_rack %} - + {{ prev_rack }} {% endif %} {% if peer_racks %}
            - +
              {% for peer_rack in peer_racks %}
            • {{ peer_rack }}
              • @@ -34,7 +34,7 @@ {% endif %} {% if next_rack %} - + {{ next_rack }} {% endif %} diff --git a/netbox/templates/dcim/rack/non_racked_devices.html b/netbox/templates/dcim/rack/non_racked_devices.html index e52b8647f..609dc55ec 100644 --- a/netbox/templates/dcim/rack/non_racked_devices.html +++ b/netbox/templates/dcim/rack/non_racked_devices.html @@ -2,11 +2,9 @@ {% block extra_controls %} {% if perms.dcim.add_device %} -
              - - Add non-racked device - -
              + + Add non-racked device + {% endif %} {% endblock extra_controls %} diff --git a/netbox/templates/dcim/rack/reservations.html b/netbox/templates/dcim/rack/reservations.html index cca8800e7..360cf0ea9 100644 --- a/netbox/templates/dcim/rack/reservations.html +++ b/netbox/templates/dcim/rack/reservations.html @@ -3,11 +3,9 @@ {% block extra_controls %} {% if perms.dcim.add_rackreservation %} -
              - - {% trans "Add reservation" %} - -
              + + {% trans "Add reservation" %} + {% endif %} {% endblock extra_controls %} diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index e1512e7ba..4cff6f68a 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -8,11 +8,11 @@ {% block controls %}
              - + {% trans "View List" %}
              - @@ -23,7 +23,7 @@ {% trans "Rear" %}
              -
                diff --git a/netbox/templates/dcim/rack_list.html b/netbox/templates/dcim/rack_list.html index e0452a5e3..ca72d2f25 100644 --- a/netbox/templates/dcim/rack_list.html +++ b/netbox/templates/dcim/rack_list.html @@ -4,7 +4,7 @@ {% load i18n %} {% block extra_controls %} - + {% trans "View Elevations" %} {% endblock %} diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html index f1148e6ec..22865b505 100644 --- a/netbox/templates/dcim/rackrole.html +++ b/netbox/templates/dcim/rackrole.html @@ -6,7 +6,7 @@ {% block extra_controls %} {% if perms.dcim.add_rack %} - + {% trans "Add Rack" %} {% endif %} diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html index 38b40b6c0..5b4a7a7aa 100644 --- a/netbox/templates/dcim/rearport.html +++ b/netbox/templates/dcim/rearport.html @@ -80,7 +80,7 @@ {% trans "Cable" %} {{ object.cable|linkify }} - + @@ -101,7 +101,7 @@ {% trans "Not connected" %} {% if perms.dcim.add_cable %} -
                  diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html index b677e8f5a..8a74a9faa 100644 --- a/netbox/templates/dcim/region.html +++ b/netbox/templates/dcim/region.html @@ -13,7 +13,7 @@ {% block extra_controls %} {% if perms.dcim.add_site %} - + {% trans "Add Site" %} {% endif %} @@ -60,7 +60,7 @@ >
              {% if perms.dcim.add_region %}
              - + {% trans "Add Region" %}
              diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 16a870182..6d42a160a 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -77,7 +77,7 @@ {% if object.physical_address %} {% if config.MAPS_URL %}
              - + {% trans "Map" %}
              @@ -98,7 +98,7 @@ {% if object.latitude and object.longitude %} {% if config.MAPS_URL %}
              - + {% trans "Map It" %}
              @@ -133,7 +133,7 @@ >
              {% if perms.dcim.add_location %}
              - + {% trans "Add a Location" %}
              @@ -147,7 +147,7 @@ >
              {% if perms.dcim.add_device %}
              - + {% trans "Add a Device" %}
              diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html index 30dfa8503..abe353d4c 100644 --- a/netbox/templates/dcim/sitegroup.html +++ b/netbox/templates/dcim/sitegroup.html @@ -13,7 +13,7 @@ {% block extra_controls %} {% if perms.dcim.add_site %} - + {% trans "Add Site" %} {% endif %} @@ -60,7 +60,7 @@ >
            {% if perms.dcim.add_sitegroup %}
            - + {% trans "Add Site Group" %}
            diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html index afde397c6..1c6bdd353 100644 --- a/netbox/templates/dcim/virtualchassis.html +++ b/netbox/templates/dcim/virtualchassis.html @@ -82,7 +82,7 @@
            {% if perms.dcim.change_virtualchassis %}
            - + {% trans "Add Member" %}
            diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html index b8f232fc2..ca80f0071 100644 --- a/netbox/templates/dcim/virtualchassis_edit.html +++ b/netbox/templates/dcim/virtualchassis_edit.html @@ -89,7 +89,7 @@ {% if virtual_chassis.pk %} - + {% endif %} diff --git a/netbox/templates/extras/configcontext_list.html b/netbox/templates/extras/configcontext_list.html index 94a168cc6..e3835a682 100644 --- a/netbox/templates/extras/configcontext_list.html +++ b/netbox/templates/extras/configcontext_list.html @@ -3,7 +3,7 @@ {% block bulk_buttons %} {% if perms.extras.sync_configcontext %} - {% endif %} diff --git a/netbox/templates/extras/configtemplate_list.html b/netbox/templates/extras/configtemplate_list.html index dc8a26488..14e1e41b2 100644 --- a/netbox/templates/extras/configtemplate_list.html +++ b/netbox/templates/extras/configtemplate_list.html @@ -3,7 +3,7 @@ {% block bulk_buttons %} {% if perms.extras.sync_configtemplate %} - {% endif %} diff --git a/netbox/templates/extras/exporttemplate_list.html b/netbox/templates/extras/exporttemplate_list.html index 6684c2cd0..0d4200aba 100644 --- a/netbox/templates/extras/exporttemplate_list.html +++ b/netbox/templates/extras/exporttemplate_list.html @@ -3,7 +3,7 @@ {% block bulk_buttons %} {% if perms.extras.sync_configcontext %} - {% endif %} diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html index d4d3962c3..0a38ea75c 100644 --- a/netbox/templates/extras/report_list.html +++ b/netbox/templates/extras/report_list.html @@ -30,7 +30,7 @@
            {% if perms.extras.delete_reportmodule %}
            - + {% trans "Delete" %}
            @@ -83,7 +83,7 @@
            {% csrf_token %} -
            - - {% trans "Cancel" %} + + {% trans "Cancel" %}
            diff --git a/netbox/templates/generic/bulk_import.html b/netbox/templates/generic/bulk_import.html index f78cb0bf5..2fc5d0a14 100644 --- a/netbox/templates/generic/bulk_import.html +++ b/netbox/templates/generic/bulk_import.html @@ -138,7 +138,7 @@ Context: {% if field.STATIC_CHOICES %} -
            -
            +
            {% block bulk_controls %} -
            -
            - {# Bulk edit buttons #} - {% block bulk_edit_controls %} - {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %} - {% if 'bulk_edit' in actions and bulk_edit_view %} - - {% endif %} - {% endwith %} - {% endblock bulk_edit_controls %} -
            -
            - {# Bulk delete buttons #} - {% block bulk_delete_controls %} - {% with bulk_delete_view=child_model|validated_viewname:"bulk_delete" %} - {% if 'bulk_delete' in actions and bulk_delete_view %} - - {% endif %} - {% endwith %} - {% endblock bulk_delete_controls %} -
            +
            + {# Bulk edit buttons #} + {% block bulk_edit_controls %} + {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %} + {% if 'bulk_edit' in actions and bulk_edit_view %} + + {% endif %} + {% endwith %} + {% endblock bulk_edit_controls %}
            -
            - {# Other bulk action buttons #} - {% block bulk_extra_controls %}{% endblock %} +
            + {# Bulk delete buttons #} + {% block bulk_delete_controls %} + {% with bulk_delete_view=child_model|validated_viewname:"bulk_delete" %} + {% if 'bulk_delete' in actions and bulk_delete_view %} + + {% endif %} + {% endwith %} + {% endblock bulk_delete_controls %}
            + {# Other bulk action buttons #} + {% block bulk_extra_controls %}{% endblock %} {% endblock bulk_controls %}
            diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html index 2a1aa5c06..31783f241 100644 --- a/netbox/templates/generic/object_list.html +++ b/netbox/templates/generic/object_list.html @@ -116,17 +116,15 @@ Context:
            {# Form buttons #} -
            -
            - {% block bulk_buttons %} - {% if 'bulk_edit' in actions %} - {% bulk_edit_button model query_params=request.GET %} - {% endif %} - {% if 'bulk_delete' in actions %} - {% bulk_delete_button model query_params=request.GET %} - {% endif %} - {% endblock %} -
            +
            + {% block bulk_buttons %} + {% if 'bulk_edit' in actions %} + {% bulk_edit_button model query_params=request.GET %} + {% endif %} + {% if 'bulk_delete' in actions %} + {% bulk_delete_button model query_params=request.GET %} + {% endif %} + {% endblock %}
            diff --git a/netbox/templates/home.html b/netbox/templates/home.html index 357eb8a7c..7dc9777af 100644 --- a/netbox/templates/home.html +++ b/netbox/templates/home.html @@ -33,7 +33,7 @@
            -
            @@ -42,7 +42,7 @@
            -
            @@ -52,14 +52,14 @@ hx-target="#htmx-modal-content" data-bs-toggle="modal" data-bs-target="#htmx-modal" - class="btn btn-success btn-sm" + class="btn btn-success" > {% trans "Add Widget" %} - - + {% trans "Reset Dashboard" %}
            diff --git a/netbox/templates/htmx/object_selector.html b/netbox/templates/htmx/object_selector.html index 280102ada..1e17b1fa9 100644 --- a/netbox/templates/htmx/object_selector.html +++ b/netbox/templates/htmx/object_selector.html @@ -25,7 +25,7 @@ {% endfor %}
            - +
            diff --git a/netbox/templates/inc/filter_list.html b/netbox/templates/inc/filter_list.html index 633cc7439..2a1676960 100644 --- a/netbox/templates/inc/filter_list.html +++ b/netbox/templates/inc/filter_list.html @@ -46,10 +46,10 @@ {% endif %}
            - -
            diff --git a/netbox/templates/inc/panels/image_attachments.html b/netbox/templates/inc/panels/image_attachments.html index a3c8b9102..df39e6e4a 100644 --- a/netbox/templates/inc/panels/image_attachments.html +++ b/netbox/templates/inc/panels/image_attachments.html @@ -6,7 +6,7 @@ {% htmx_table 'extras:imageattachment_list' content_type_id=object|content_type_id object_id=object.pk %} {% if perms.extras.add_imageattachment %}
            - + {% trans "Attach an image" %}
            diff --git a/netbox/templates/ipam/aggregate/prefixes.html b/netbox/templates/ipam/aggregate/prefixes.html index e1e53962d..c6f769a57 100644 --- a/netbox/templates/ipam/aggregate/prefixes.html +++ b/netbox/templates/ipam/aggregate/prefixes.html @@ -4,7 +4,7 @@ {% block extra_controls %} {% include 'ipam/inc/toggle_available.html' %} {% if perms.ipam.add_prefix and first_available_prefix %} - + {% trans "Add Prefix" %} {% endif %} diff --git a/netbox/templates/ipam/fhrpgroup.html b/netbox/templates/ipam/fhrpgroup.html index 20bec9bd4..4fee4a802 100644 --- a/netbox/templates/ipam/fhrpgroup.html +++ b/netbox/templates/ipam/fhrpgroup.html @@ -76,7 +76,7 @@ >
            {% if perms.ipam.add_ipaddress %}
            - + {% trans "Add IP Address" %}
            diff --git a/netbox/templates/ipam/inc/panels/fhrp_groups.html b/netbox/templates/ipam/inc/panels/fhrp_groups.html index d01a04568..0fcbc2ad1 100644 --- a/netbox/templates/ipam/inc/panels/fhrp_groups.html +++ b/netbox/templates/ipam/inc/panels/fhrp_groups.html @@ -27,12 +27,12 @@ {{ assignment.priority }} {% if perms.ipam.change_fhrpgroupassignment %} - + {% endif %} {% if perms.ipam.delete_fhrpgroupassignment %} - + {% endif %} @@ -48,12 +48,12 @@
            {% if perms.ipam.add_fhrpgroup %} - + {% trans "Create Group" %} {% endif %} {% if perms.ipam.add_fhrpgroupassignment %} - + {% trans "Assign Group" %} {% endif %} diff --git a/netbox/templates/ipam/inc/toggle_available.html b/netbox/templates/ipam/inc/toggle_available.html index 62f742e86..52d56481a 100644 --- a/netbox/templates/ipam/inc/toggle_available.html +++ b/netbox/templates/ipam/inc/toggle_available.html @@ -3,13 +3,13 @@ {% if show_assigned or show_available is not None %}
            - + {% trans "Show Assigned" %} - + {% trans "Show Available" %} - + {% trans "Show All" %}
            diff --git a/netbox/templates/ipam/iprange/ip_addresses.html b/netbox/templates/ipam/iprange/ip_addresses.html index a9baccc39..f6c8e9101 100644 --- a/netbox/templates/ipam/iprange/ip_addresses.html +++ b/netbox/templates/ipam/iprange/ip_addresses.html @@ -3,7 +3,7 @@ {% block extra_controls %} {% if perms.ipam.add_ipaddress and object.first_available_ip %} - + {% trans "Add IP Address" %} {% endif %} diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index ec6138d69..7049a6a2a 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -147,7 +147,7 @@ {% if object.prefix.version == 4 %}
            - + {% trans "Addressing Details" %}
            diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html index 51ebcc730..399f29799 100644 --- a/netbox/templates/ipam/prefix/ip_addresses.html +++ b/netbox/templates/ipam/prefix/ip_addresses.html @@ -3,7 +3,7 @@ {% block extra_controls %} {% if perms.ipam.add_ipaddress and first_available_ip %} - + {% trans "Add IP Address" %} {% endif %} diff --git a/netbox/templates/ipam/prefix/ip_ranges.html b/netbox/templates/ipam/prefix/ip_ranges.html index 3bfba921f..f7a858c80 100644 --- a/netbox/templates/ipam/prefix/ip_ranges.html +++ b/netbox/templates/ipam/prefix/ip_ranges.html @@ -3,7 +3,7 @@ {% block extra_controls %} {% if perms.ipam.add_iprange and first_available_ip %} - + {% trans "Add IP Range" %} {% endif %} diff --git a/netbox/templates/ipam/prefix/prefixes.html b/netbox/templates/ipam/prefix/prefixes.html index b8c2fd31c..3962455a2 100644 --- a/netbox/templates/ipam/prefix/prefixes.html +++ b/netbox/templates/ipam/prefix/prefixes.html @@ -4,7 +4,7 @@ {% block extra_controls %} {% include 'ipam/inc/toggle_available.html' %} {% if perms.ipam.add_prefix and first_available_prefix %} - + {% trans "Add Prefix" %} {% endif %} diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html index 00c0ed31a..5b7103b94 100644 --- a/netbox/templates/ipam/prefix_list.html +++ b/netbox/templates/ipam/prefix_list.html @@ -3,11 +3,11 @@ {% load i18n %} {% block extra_controls %} -
            -
              @@ -24,7 +24,7 @@
            -
              diff --git a/netbox/templates/ipam/rir.html b/netbox/templates/ipam/rir.html index 1cffc86f6..ab9f70b5b 100644 --- a/netbox/templates/ipam/rir.html +++ b/netbox/templates/ipam/rir.html @@ -6,7 +6,7 @@ {% block extra_controls %} {% if perms.ipam.add_aggregate %} - + {% trans "Add Aggregate" %} {% endif %} diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html index fb96d0fc3..cba9e2db5 100644 --- a/netbox/templates/ipam/role.html +++ b/netbox/templates/ipam/role.html @@ -6,7 +6,7 @@ {% block extra_controls %} {% if perms.ipam.add_prefix %} - + {% trans "Add Prefix" %} {% endif %} diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index a5ed9d643..fa7cf2564 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -91,7 +91,7 @@ >
            {% if perms.ipam.add_prefix %}
            - + {% trans "Add a Prefix" %}
            diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html index 2dfa229eb..4ea9062bc 100644 --- a/netbox/templates/ipam/vlangroup.html +++ b/netbox/templates/ipam/vlangroup.html @@ -14,7 +14,7 @@ {% block extra_controls %} {% if perms.ipam.add_vlan %} - + {% trans "Add VLAN" %} {% endif %} diff --git a/netbox/templates/tenancy/contactgroup.html b/netbox/templates/tenancy/contactgroup.html index cb97fa78e..e8f6a86a7 100644 --- a/netbox/templates/tenancy/contactgroup.html +++ b/netbox/templates/tenancy/contactgroup.html @@ -53,7 +53,7 @@ >
            {% if perms.tenancy.add_contactgroup %}
            - + {% trans "Add Contact Group" %}
            diff --git a/netbox/templates/tenancy/object_contacts.html b/netbox/templates/tenancy/object_contacts.html index 6e4814d8e..4b78e53d3 100644 --- a/netbox/templates/tenancy/object_contacts.html +++ b/netbox/templates/tenancy/object_contacts.html @@ -5,7 +5,7 @@ {% block extra_controls %} {% if perms.tenancy.add_contactassignment %} {% with viewname=object|viewname:"contacts" %} - + {% trans "Add a contact" %} {% endwith %} diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html index afbc5509c..874c6912d 100644 --- a/netbox/templates/tenancy/tenantgroup.html +++ b/netbox/templates/tenancy/tenantgroup.html @@ -13,7 +13,7 @@ {% block extra_controls %} {% if perms.tenancy.add_tenant %} - + {% trans "Add Tenant" %} {% endif %} @@ -62,7 +62,7 @@ >
            {% if perms.tenancy.add_tenantgroup %}
            - + {% trans "Add Tenant Group" %}
            diff --git a/netbox/templates/virtualization/cluster/base.html b/netbox/templates/virtualization/cluster/base.html index 72fa0d02e..e83a7fc58 100644 --- a/netbox/templates/virtualization/cluster/base.html +++ b/netbox/templates/virtualization/cluster/base.html @@ -14,13 +14,13 @@ {% block extra_controls %} {% if perms.virtualization.change_cluster and perms.virtualization.add_virtualmachine %} - + {% trans "Add Virtual Machine" %} {% endif %} {% if perms.virtualization.change_cluster %} - + {% trans "Assign Device" %} {% endif %} diff --git a/netbox/templates/virtualization/cluster/devices.html b/netbox/templates/virtualization/cluster/devices.html index caf0af0de..6f8082020 100644 --- a/netbox/templates/virtualization/cluster/devices.html +++ b/netbox/templates/virtualization/cluster/devices.html @@ -6,7 +6,7 @@ {% if 'bulk_remove_devices' in actions %} {% endif %} diff --git a/netbox/templates/virtualization/clustergroup.html b/netbox/templates/virtualization/clustergroup.html index d99eb5011..3571a20ea 100644 --- a/netbox/templates/virtualization/clustergroup.html +++ b/netbox/templates/virtualization/clustergroup.html @@ -6,7 +6,7 @@ {% block extra_controls %} {% if perms.virtualization.add_cluster %} - + {% trans "Add Cluster" %} {% endif %} diff --git a/netbox/templates/virtualization/clustertype.html b/netbox/templates/virtualization/clustertype.html index d32c474f5..e56cde8b7 100644 --- a/netbox/templates/virtualization/clustertype.html +++ b/netbox/templates/virtualization/clustertype.html @@ -6,7 +6,7 @@ {% block extra_controls %} {% if perms.virtualization.add_cluster %} - + {% trans "Add Cluster" %} {% endif %} diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html index 873f18158..128d03c33 100644 --- a/netbox/templates/virtualization/virtualmachine.html +++ b/netbox/templates/virtualization/virtualmachine.html @@ -161,7 +161,7 @@ >
            {% if perms.ipam.add_service %}
            - + {% trans "Add a service" %}
            @@ -181,7 +181,7 @@ >
            {% if perms.virtualization.add_virtualdisk %}
            - + {% trans "Add Virtual Disk" %}
            diff --git a/netbox/templates/virtualization/virtualmachine/base.html b/netbox/templates/virtualization/virtualmachine/base.html index a147ef944..610af6fb9 100644 --- a/netbox/templates/virtualization/virtualmachine/base.html +++ b/netbox/templates/virtualization/virtualmachine/base.html @@ -18,7 +18,7 @@ {% block extra_controls %}
            -
              diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html index b68872da8..94bdbacae 100644 --- a/netbox/templates/virtualization/virtualmachine/interfaces.html +++ b/netbox/templates/virtualization/virtualmachine/interfaces.html @@ -7,7 +7,7 @@ {% if 'bulk_rename' in actions %} {% endif %} diff --git a/netbox/templates/virtualization/virtualmachine/render_config.html b/netbox/templates/virtualization/virtualmachine/render_config.html index 7b638199b..6d14b5e6d 100644 --- a/netbox/templates/virtualization/virtualmachine/render_config.html +++ b/netbox/templates/virtualization/virtualmachine/render_config.html @@ -53,7 +53,7 @@
              - + {% trans "Download" %}
              diff --git a/netbox/templates/virtualization/virtualmachine/virtual_disks.html b/netbox/templates/virtualization/virtualmachine/virtual_disks.html index a947f9824..0d63a984b 100644 --- a/netbox/templates/virtualization/virtualmachine/virtual_disks.html +++ b/netbox/templates/virtualization/virtualmachine/virtual_disks.html @@ -7,7 +7,7 @@ {% if 'bulk_rename' in actions %} {% endif %} diff --git a/netbox/templates/virtualization/virtualmachine_list.html b/netbox/templates/virtualization/virtualmachine_list.html index 8c5e81256..5eed1c6a4 100644 --- a/netbox/templates/virtualization/virtualmachine_list.html +++ b/netbox/templates/virtualization/virtualmachine_list.html @@ -4,7 +4,7 @@ {% block bulk_buttons %} {% if perms.virtualization.change_virtualmachine %}
              -
                diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html index cf22ddf89..db567e7e0 100644 --- a/netbox/templates/virtualization/vminterface.html +++ b/netbox/templates/virtualization/vminterface.html @@ -92,7 +92,7 @@ >
              {% if perms.ipam.add_ipaddress %}
              - + {% trans "Add IP Address" %}
              diff --git a/netbox/templates/vpn/ikepolicy.html b/netbox/templates/vpn/ikepolicy.html index da116cfa2..7217aaf28 100644 --- a/netbox/templates/vpn/ikepolicy.html +++ b/netbox/templates/vpn/ikepolicy.html @@ -31,7 +31,7 @@ {{ object.preshared_key|placeholder }} {% if object.preshared_key %} - + {% endif %} diff --git a/netbox/templates/vpn/l2vpn.html b/netbox/templates/vpn/l2vpn.html index 2176a537f..7cc747ed8 100644 --- a/netbox/templates/vpn/l2vpn.html +++ b/netbox/templates/vpn/l2vpn.html @@ -61,7 +61,7 @@ >
              {% if perms.vpn.add_l2vpntermination %}
              - + {% trans "Add a Termination" %}
              diff --git a/netbox/templates/vpn/tunnel.html b/netbox/templates/vpn/tunnel.html index d1607bd95..d8a831722 100644 --- a/netbox/templates/vpn/tunnel.html +++ b/netbox/templates/vpn/tunnel.html @@ -5,7 +5,7 @@ {% block extra_controls %} {% if perms.vpn.add_tunneltermination %} - + {% trans "Add Termination" %} {% endif %} @@ -77,7 +77,7 @@ >
              {% if perms.vpn.add_tunneltermination %}
              - + {% trans "Add a Termination" %}
              diff --git a/netbox/templates/vpn/tunnelgroup.html b/netbox/templates/vpn/tunnelgroup.html index 3afea48c4..3eac913bf 100644 --- a/netbox/templates/vpn/tunnelgroup.html +++ b/netbox/templates/vpn/tunnelgroup.html @@ -10,7 +10,7 @@ {% block extra_controls %} {% if perms.vpn.add_tunnel %} - + {% trans "Add Tunnel" %} {% endif %} diff --git a/netbox/templates/wireless/inc/authentication_attrs.html b/netbox/templates/wireless/inc/authentication_attrs.html index c58518f95..683e7978a 100644 --- a/netbox/templates/wireless/inc/authentication_attrs.html +++ b/netbox/templates/wireless/inc/authentication_attrs.html @@ -18,7 +18,7 @@ {{ object.auth_psk|placeholder }} {% if object.auth_psk %} - + {% endif %} diff --git a/netbox/templates/wireless/wirelesslangroup.html b/netbox/templates/wireless/wirelesslangroup.html index 135064fd0..095ec9fc8 100644 --- a/netbox/templates/wireless/wirelesslangroup.html +++ b/netbox/templates/wireless/wirelesslangroup.html @@ -13,7 +13,7 @@ {% block extra_controls %} {% if perms.wireless.add_wirelesslan %} - + {% trans "Add Wireless LAN" %} {% endif %} @@ -60,7 +60,7 @@ >
            {% if perms.wireless.add_wirelesslangroup %}
            - + {% trans "Add Wireless LAN Group" %}