From a5dda0705e71aea085c11a3c81b5f3c5d34b64c0 Mon Sep 17 00:00:00 2001 From: jeremystretch Date: Tue, 20 Jul 2021 13:46:59 -0400 Subject: [PATCH] Standardize button colors --- netbox/templates/dcim/device/base.html | 2 +- netbox/templates/dcim/interface.html | 2 +- netbox/templates/dcim/rack.html | 10 +++++----- netbox/templates/generic/object.html | 18 +++++++++--------- .../templates/ipam/inc/toggle_available.html | 4 ++-- .../templates/ipam/iprange/ip_addresses.html | 5 ++--- netbox/templates/ipam/prefix/ip_addresses.html | 5 ++--- netbox/templates/ipam/service.html | 15 --------------- .../templates/virtualization/cluster/base.html | 4 ++-- .../virtualization/virtualmachine/base.html | 2 +- netbox/utilities/templates/buttons/add.html | 2 +- netbox/utilities/templates/buttons/clone.html | 2 +- netbox/utilities/templates/buttons/delete.html | 2 +- netbox/utilities/templates/buttons/edit.html | 2 +- netbox/utilities/templates/buttons/export.html | 2 +- netbox/utilities/templates/buttons/import.html | 2 +- 16 files changed, 31 insertions(+), 48 deletions(-) diff --git a/netbox/templates/dcim/device/base.html b/netbox/templates/dcim/device/base.html index 8bc10352c..5075a0b80 100644 --- a/netbox/templates/dcim/device/base.html +++ b/netbox/templates/dcim/device/base.html @@ -16,7 +16,7 @@ {% block extra_controls %} {% if perms.dcim.change_device %} diff --git a/netbox/templates/ipam/inc/toggle_available.html b/netbox/templates/ipam/inc/toggle_available.html index c3c6fd33f..e73257605 100644 --- a/netbox/templates/ipam/inc/toggle_available.html +++ b/netbox/templates/ipam/inc/toggle_available.html @@ -1,10 +1,10 @@ {% load helpers %} {% if show_available is not None %}
- + Show Available - + Hide Available
diff --git a/netbox/templates/ipam/iprange/ip_addresses.html b/netbox/templates/ipam/iprange/ip_addresses.html index c89007c25..08338b7a9 100644 --- a/netbox/templates/ipam/iprange/ip_addresses.html +++ b/netbox/templates/ipam/iprange/ip_addresses.html @@ -2,9 +2,8 @@ {% block extra_controls %} {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and object.first_available_ip %} - - - Add an IP Address + + Add IP Address {% endif %} {% endblock %} diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html index d67e136f0..1ecfcd47f 100644 --- a/netbox/templates/ipam/prefix/ip_addresses.html +++ b/netbox/templates/ipam/prefix/ip_addresses.html @@ -2,9 +2,8 @@ {% block extra_controls %} {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and first_available_ip %} - - - Add an IP Address + + Add IP Address {% endif %} {% endblock %} diff --git a/netbox/templates/ipam/service.html b/netbox/templates/ipam/service.html index 17415ac7c..0122806ef 100644 --- a/netbox/templates/ipam/service.html +++ b/netbox/templates/ipam/service.html @@ -13,21 +13,6 @@ {% endif %} {% endblock %} -{% block controls %} -{% plugin_buttons object %} -
-
- {% block extra_controls %}{% endblock %} - {% if request.user|can_change:object %} - {% edit_button object %} - {% endif %} - {% if request.user|can_delete:object %} - {% delete_button object %} - {% endif %} -
-
-{% endblock %} - {% block content %}
diff --git a/netbox/templates/virtualization/cluster/base.html b/netbox/templates/virtualization/cluster/base.html index dbcd08ea0..2414dfa27 100644 --- a/netbox/templates/virtualization/cluster/base.html +++ b/netbox/templates/virtualization/cluster/base.html @@ -13,12 +13,12 @@ {% block extra_controls %} {% if perms.virtualization.change_cluster and perms.virtualization.add_virtualmachine %} - + Add Virtual Machine {% endif %} {% if perms.virtualization.change_cluster %} - + Assign Device {% endif %} diff --git a/netbox/templates/virtualization/virtualmachine/base.html b/netbox/templates/virtualization/virtualmachine/base.html index 83b134230..b0ea7b720 100644 --- a/netbox/templates/virtualization/virtualmachine/base.html +++ b/netbox/templates/virtualization/virtualmachine/base.html @@ -10,7 +10,7 @@ {% block extra_controls %} {% if perms.virtualization.add_vminterface %} - + Add Interfaces {% endif %} diff --git a/netbox/utilities/templates/buttons/add.html b/netbox/utilities/templates/buttons/add.html index ba0e36381..3120c6f50 100644 --- a/netbox/utilities/templates/buttons/add.html +++ b/netbox/utilities/templates/buttons/add.html @@ -1,5 +1,5 @@
- +  Add diff --git a/netbox/utilities/templates/buttons/clone.html b/netbox/utilities/templates/buttons/clone.html index cddd15632..644fbef65 100644 --- a/netbox/utilities/templates/buttons/clone.html +++ b/netbox/utilities/templates/buttons/clone.html @@ -1,3 +1,3 @@ - +  Clone diff --git a/netbox/utilities/templates/buttons/delete.html b/netbox/utilities/templates/buttons/delete.html index 760b530f7..2e3c9c347 100644 --- a/netbox/utilities/templates/buttons/delete.html +++ b/netbox/utilities/templates/buttons/delete.html @@ -1,3 +1,3 @@ - +  Delete diff --git a/netbox/utilities/templates/buttons/edit.html b/netbox/utilities/templates/buttons/edit.html index 821b668d6..dcdeaf8d4 100644 --- a/netbox/utilities/templates/buttons/edit.html +++ b/netbox/utilities/templates/buttons/edit.html @@ -1,3 +1,3 @@ - +  Edit diff --git a/netbox/utilities/templates/buttons/export.html b/netbox/utilities/templates/buttons/export.html index c13f0cfdf..a655556f1 100644 --- a/netbox/utilities/templates/buttons/export.html +++ b/netbox/utilities/templates/buttons/export.html @@ -1,5 +1,5 @@