From e8ba4b05645e08d16a01046cb93c9697c39a8bad Mon Sep 17 00:00:00 2001 From: Matt Date: Tue, 3 Aug 2021 10:03:22 -0700 Subject: [PATCH] #6797: Improve controls & custom link styling --- netbox/extras/choices.py | 38 +- netbox/extras/templatetags/custom_links.py | 4 +- netbox/project-static/dist/netbox-dark.css | 2 +- netbox/project-static/dist/netbox-light.css | 2 +- netbox/project-static/styles/netbox.scss | 27 ++ netbox/project-static/styles/theme-dark.scss | 8 + netbox/project-static/styles/theme-light.scss | 14 + .../circuits/inc/circuit_termination.html | 2 +- netbox/templates/dcim/device/base.html | 370 ++++++++---------- netbox/templates/dcim/devicetype.html | 2 +- netbox/templates/dcim/interface.html | 2 +- netbox/templates/dcim/rack.html | 6 +- .../templates/dcim/rack_elevation_list.html | 10 +- netbox/templates/generic/object.html | 6 +- netbox/templates/generic/object_edit.html | 10 +- netbox/templates/generic/object_list.html | 4 +- .../templates/ipam/inc/toggle_available.html | 7 +- .../templates/ipam/iprange/ip_addresses.html | 2 +- .../templates/ipam/prefix/ip_addresses.html | 2 +- netbox/templates/ipam/prefix_list.html | 4 +- .../virtualization/cluster/base.html | 39 +- .../virtualization/virtualmachine/base.html | 4 +- netbox/utilities/templates/buttons/add.html | 7 +- netbox/utilities/templates/buttons/clone.html | 2 +- .../utilities/templates/buttons/delete.html | 2 +- netbox/utilities/templates/buttons/edit.html | 2 +- .../utilities/templates/buttons/export.html | 4 +- .../utilities/templates/buttons/import.html | 2 +- 28 files changed, 313 insertions(+), 271 deletions(-) diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index 86860b0bc..4452b5aad 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -46,28 +46,40 @@ class CustomFieldFilterLogicChoices(ChoiceSet): class CustomLinkButtonClassChoices(ChoiceSet): CLASS_DEFAULT = 'outline-dark' - CLASS_PRIMARY = 'primary' - CLASS_SUCCESS = 'success' - CLASS_INFO = 'info' - CLASS_WARNING = 'warning' - CLASS_DANGER = 'danger' - CLASS_LINK = 'link' + CLASS_LINK = 'ghost-dark' + CLASS_BLUE = 'blue' + CLASS_INDIGO = 'indigo' + CLASS_PURPLE = 'purple' + CLASS_PINK = 'pink' + CLASS_RED = 'red' + CLASS_ORANGE = 'orange' + CLASS_YELLOW = 'yellow' + CLASS_GREEN = 'green' + CLASS_TEAL = 'teal' + CLASS_CYAN = 'cyan' + CLASS_GRAY = 'secondary' CHOICES = ( (CLASS_DEFAULT, 'Default'), - (CLASS_PRIMARY, 'Primary (blue)'), - (CLASS_SUCCESS, 'Success (green)'), - (CLASS_INFO, 'Info (aqua)'), - (CLASS_WARNING, 'Warning (orange)'), - (CLASS_DANGER, 'Danger (red)'), - (CLASS_LINK, 'None (link)'), + (CLASS_LINK, 'Link'), + (CLASS_BLUE, 'Blue'), + (CLASS_INDIGO, 'Indigo'), + (CLASS_PURPLE, 'Purple'), + (CLASS_PINK, 'Pink'), + (CLASS_RED, 'Red'), + (CLASS_ORANGE, 'Orange'), + (CLASS_YELLOW, 'Yellow'), + (CLASS_GREEN, 'Green'), + (CLASS_TEAL, 'Teal'), + (CLASS_CYAN, 'Cyan'), + (CLASS_GRAY, 'Gray'), ) - # # ObjectChanges # + class ObjectChangeActionChoices(ChoiceSet): ACTION_CREATE = 'create' diff --git a/netbox/extras/templatetags/custom_links.py b/netbox/extras/templatetags/custom_links.py index 814acbbcb..fec5cf65a 100644 --- a/netbox/extras/templatetags/custom_links.py +++ b/netbox/extras/templatetags/custom_links.py @@ -10,10 +10,10 @@ from utilities.utils import render_jinja2 register = template.Library() -LINK_BUTTON = '{}\n' +LINK_BUTTON = '{}\n' GROUP_BUTTON = """ -
+
- -
-{% endif %} {% endblock %} {% block tab_items %} - -{% with interface_count=object.interfaces_count %} -{% if interface_count %} - -{% endif %} -{% endwith %} - -{% with frontport_count=object.frontports.count %} -{% if frontport_count %} - -{% endif %} -{% endwith %} - -{% with rearport_count=object.rearports.count %} -{% if rearport_count %} - -{% endif %} -{% endwith %} - -{% with consoleport_count=object.consoleports.count %} -{% if consoleport_count %} - -{% endif %} -{% endwith %} - -{% with consoleserverport_count=object.consoleserverports.count %} -{% if consoleserverport_count %} -{% endif %} -{% endwith %} - -{% with powerport_count=object.powerports.count %} -{% if powerport_count %} - -{% endif %} -{% endwith %} - -{% with poweroutlet_count=object.poweroutlets.count %} -{% if poweroutlet_count %} - -{% endif %} -{% endwith %} - -{% with devicebay_count=object.devicebays.count %} -{% if devicebay_count %} - -{% endif %} -{% endwith %} - -{% with inventoryitem_count=object.inventoryitems.count %} -{% if inventoryitem_count %} - -{% endif %} -{% endwith %} -{% if perms.dcim.napalm_read_device and object.status == 'active' and object.primary_ip and object.platform.napalm_driver %} -{# NAPALM-enabled tabs #} - - - -{% endif %} -{% if perms.extras.view_configcontext %} - -{% endif %} + + {% with interface_count=object.interfaces_count %} + {% if interface_count %} + + {% endif %} + {% endwith %} + + {% with frontport_count=object.frontports.count %} + {% if frontport_count %} + + {% endif %} + {% endwith %} + + {% with rearport_count=object.rearports.count %} + {% if rearport_count %} + + {% endif %} + {% endwith %} + + {% with consoleport_count=object.consoleports.count %} + {% if consoleport_count %} + + {% endif %} + {% endwith %} + + {% with consoleserverport_count=object.consoleserverports.count %} + {% if consoleserverport_count %} + + {% endif %} + {% endwith %} + + {% with powerport_count=object.powerports.count %} + {% if powerport_count %} + + {% endif %} + {% endwith %} + + {% with poweroutlet_count=object.poweroutlets.count %} + {% if poweroutlet_count %} + + {% endif %} + {% endwith %} + + {% with devicebay_count=object.devicebays.count %} + {% if devicebay_count %} + + {% endif %} + {% endwith %} + + {% with inventoryitem_count=object.inventoryitems.count %} + {% if inventoryitem_count %} + + {% endif %} + {% endwith %} + + {% if perms.dcim.napalm_read_device and object.status == 'active' and object.primary_ip and object.platform.napalm_driver %} + {# NAPALM-enabled tabs #} + + + + {% endif %} + + {% if perms.extras.view_configcontext %} + + {% endif %} {% endblock %} diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 40772d4af..2a9f4a93b 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -12,7 +12,7 @@ {% block extra_controls %} {% if perms.dcim.change_devicetype %} -
+
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html index d57b2fe89..3a4d16db3 100644 --- a/netbox/templates/dcim/interface.html +++ b/netbox/templates/dcim/interface.html @@ -5,7 +5,7 @@ {% block extra_controls %} {% if perms.dcim.add_interface and not object.is_virtual %} - + Add Child Interface {% endif %} diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 0a278f2d6..e7bad2bad 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -18,14 +18,14 @@ {% endblock %} {% block extra_controls %} - - + Previous - + Next {% endblock %} diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html index 55e1eeacc..c9f0080da 100644 --- a/netbox/templates/dcim/rack_elevation_list.html +++ b/netbox/templates/dcim/rack_elevation_list.html @@ -5,16 +5,16 @@ {% block title %}Rack Elevations{% endblock %} {% block controls %} -
-
- -
+
Front Rear
-
+
Normal Reversed
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html index e4b4885f3..4a209093e 100644 --- a/netbox/templates/generic/object.html +++ b/netbox/templates/generic/object.html @@ -29,11 +29,11 @@ {% block controls %} {# Clone/Edit/Delete Buttons #} -
-
+
+
{% custom_links object %} {% plugin_buttons object %} - + {# Extra buttons #} {% block extra_controls %}{% endblock %} diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html index 691762508..b5e73ab16 100644 --- a/netbox/templates/generic/object_edit.html +++ b/netbox/templates/generic/object_edit.html @@ -8,10 +8,12 @@ {% block controls %} {% if settings.DOCS_ROOT %} -
- +
+
+ +
{% endif %} {% endblock controls %} diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html index 9ac484227..e00b47a02 100644 --- a/netbox/templates/generic/object_list.html +++ b/netbox/templates/generic/object_list.html @@ -7,8 +7,8 @@ {% block title %}{{ content_type.model_class|meta:"verbose_name_plural"|bettertitle }}{% endblock %} {% block controls %} -
-
+
+
{% block extra_controls %}{% endblock %} {% if permissions.add and 'add' in action_buttons %} {% add_button content_type.model_class|validated_viewname:"add" %} diff --git a/netbox/templates/ipam/inc/toggle_available.html b/netbox/templates/ipam/inc/toggle_available.html index e73257605..234218a01 100644 --- a/netbox/templates/ipam/inc/toggle_available.html +++ b/netbox/templates/ipam/inc/toggle_available.html @@ -1,10 +1,11 @@ {% 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 2db243e1d..f034d5622 100644 --- a/netbox/templates/ipam/iprange/ip_addresses.html +++ b/netbox/templates/ipam/iprange/ip_addresses.html @@ -2,7 +2,7 @@ {% block extra_controls %} {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and object.first_available_ip %} - + Add IP Address {% endif %} diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html index d51790c75..6291befcf 100644 --- a/netbox/templates/ipam/prefix/ip_addresses.html +++ b/netbox/templates/ipam/prefix/ip_addresses.html @@ -2,7 +2,7 @@ {% block extra_controls %} {% if perms.ipam.add_ipaddress and active_tab == 'ip-addresses' and first_available_ip %} - + Add IP Address {% endif %} diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html index 1b4a48433..f65d45c58 100644 --- a/netbox/templates/ipam/prefix_list.html +++ b/netbox/templates/ipam/prefix_list.html @@ -2,7 +2,7 @@ {% load helpers %} {% block extra_controls %} -
+
@@ -19,7 +19,7 @@ {% endfor %}
-
+
diff --git a/netbox/templates/virtualization/cluster/base.html b/netbox/templates/virtualization/cluster/base.html index dbcd08ea0..fec0da220 100644 --- a/netbox/templates/virtualization/cluster/base.html +++ b/netbox/templates/virtualization/cluster/base.html @@ -13,35 +13,36 @@ {% 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 %} {% endblock %} {% block tab_items %} - + -{% with virtualmachine_count=object.virtual_machines.count %} - -{% endwith %} + {% with virtualmachine_count=object.virtual_machines.count %} + + {% endwith %} -{% with device_count=object.devices.count %} - -{% endwith %} + {% with device_count=object.devices.count %} + + {% endwith %} {% endblock %} diff --git a/netbox/templates/virtualization/virtualmachine/base.html b/netbox/templates/virtualization/virtualmachine/base.html index 83b134230..4869a56ce 100644 --- a/netbox/templates/virtualization/virtualmachine/base.html +++ b/netbox/templates/virtualization/virtualmachine/base.html @@ -10,8 +10,8 @@ {% block extra_controls %} {% if perms.virtualization.add_vminterface %} - - Add Interfaces + + Add Interfaces {% endif %} {% endblock %} diff --git a/netbox/utilities/templates/buttons/add.html b/netbox/utilities/templates/buttons/add.html index ba0e36381..60767951a 100644 --- a/netbox/utilities/templates/buttons/add.html +++ b/netbox/utilities/templates/buttons/add.html @@ -1,6 +1,9 @@ -
+{% comment %}
 Add -
+
{% endcomment %} + + Add + diff --git a/netbox/utilities/templates/buttons/clone.html b/netbox/utilities/templates/buttons/clone.html index cddd15632..24e685c3d 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..6fe3fe7d8 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..b2bfe5da7 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 a655556f1..20ecc2dff 100644 --- a/netbox/utilities/templates/buttons/export.html +++ b/netbox/utilities/templates/buttons/export.html @@ -1,5 +1,5 @@ -
-
    diff --git a/netbox/utilities/templates/buttons/import.html b/netbox/utilities/templates/buttons/import.html index 98fc0f95e..9df619607 100644 --- a/netbox/utilities/templates/buttons/import.html +++ b/netbox/utilities/templates/buttons/import.html @@ -1,3 +1,3 @@ - +  Import