From 141b7548965bda8be11c960e262fb783c430b07b Mon Sep 17 00:00:00 2001 From: bellwood Date: Wed, 13 Jul 2016 22:25:40 -0400 Subject: [PATCH 01/20] Add icons to panel headers in device info view --- netbox/templates/dcim/device.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index 0f405b68e..0ff4e8595 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -11,6 +11,7 @@
+ Device
@@ -71,6 +72,7 @@
+ Management
@@ -135,6 +137,7 @@ {% if request.user.is_authenticated %}
+ Secrets
{% if secrets %} @@ -163,6 +166,7 @@ {% endif %}
+ IP Addresses
{% if ip_addresses %} @@ -187,6 +191,7 @@
+ Critical Connections
@@ -254,6 +259,7 @@
+ Comments
@@ -266,6 +272,7 @@
+ Related Devices
{% if related_devices %} @@ -291,6 +298,7 @@ {% if device_bays or device.device_type.is_parent_device %}
+ Device Bays
@@ -315,6 +323,7 @@ {% if interfaces or device.device_type.is_network_device %}
+ Interfaces
@@ -339,6 +348,7 @@ {% if cs_ports or device.device_type.is_console_server %}
+ Console Server Ports
@@ -363,6 +373,7 @@ {% if power_outlets or device.device_type.is_pdu %}
+ Power Outlets
From 677e593016cdc48a9c189cd6eb43317a8e855aa5 Mon Sep 17 00:00:00 2001 From: bellwood Date: Wed, 13 Jul 2016 22:29:06 -0400 Subject: [PATCH 02/20] Add icons to panel headers in device inventory --- netbox/templates/dcim/device_inventory.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/templates/dcim/device_inventory.html b/netbox/templates/dcim/device_inventory.html index e1e8f518d..76cab31a5 100644 --- a/netbox/templates/dcim/device_inventory.html +++ b/netbox/templates/dcim/device_inventory.html @@ -8,6 +8,7 @@
+ Chassis
@@ -25,6 +26,7 @@
+ Hardware
From d54fbdffdeed9eacbd223dc8c8a71c9546cbb750 Mon Sep 17 00:00:00 2001 From: bellwood Date: Wed, 13 Jul 2016 22:31:18 -0400 Subject: [PATCH 03/20] Add icons to panel headers in device lldp view --- netbox/templates/dcim/device_lldp_neighbors.html | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/templates/dcim/device_lldp_neighbors.html b/netbox/templates/dcim/device_lldp_neighbors.html index b37f1860e..b3cc828b9 100644 --- a/netbox/templates/dcim/device_lldp_neighbors.html +++ b/netbox/templates/dcim/device_lldp_neighbors.html @@ -6,6 +6,7 @@ {% include 'dcim/inc/_device_header.html' with active_tab='lldp-neighbors' %}
+ LLDP Neighbors
From 6d9549297d5779dda017cfa09910080df8c550d7 Mon Sep 17 00:00:00 2001 From: bellwood Date: Wed, 13 Jul 2016 22:33:16 -0400 Subject: [PATCH 04/20] Add icons to panel headers in device lldp view --- netbox/templates/dcim/device_lldp_neighbors.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/templates/dcim/device_lldp_neighbors.html b/netbox/templates/dcim/device_lldp_neighbors.html index b3cc828b9..c08ecd4dc 100644 --- a/netbox/templates/dcim/device_lldp_neighbors.html +++ b/netbox/templates/dcim/device_lldp_neighbors.html @@ -22,7 +22,7 @@ {% for iface in interfaces %} - + {% if iface.connection %} {% with iface.get_connected_interface as connected_iface %}
{{ iface }} {{ iface }} From deaa5951813614c544af4fb2479570137e178ddc Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 10:36:21 -0400 Subject: [PATCH 05/20] add icons to device type headers --- netbox/templates/dcim/devicetype.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index f3ae5aa78..67bd82b66 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -37,6 +37,7 @@
+ Chassis
@@ -60,6 +61,7 @@
+ Function
From defb2816b613b940172617e8079aedad8583827d Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 10:47:36 -0400 Subject: [PATCH 06/20] add template vars for icons --- netbox/templates/dcim/devicetype.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 67bd82b66..758b0d0b0 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -79,21 +79,21 @@
- {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' add_url='dcim:devicetype_add_consoleport' delete_url='dcim:devicetype_delete_consoleport' %} - {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' add_url='dcim:devicetype_add_powerport' delete_url='dcim:devicetype_delete_powerport' %} + {% include 'dcim/inc/devicetype_component_table.html' with table=consoleport_table title='Console Ports' icon='desktop' add_url='dcim:devicetype_add_consoleport' delete_url='dcim:devicetype_delete_consoleport' %} + {% include 'dcim/inc/devicetype_component_table.html' with table=powerport_table title='Power Ports' icon='plug' add_url='dcim:devicetype_add_powerport' delete_url='dcim:devicetype_delete_powerport' %}
{% if devicetype.is_parent_device %} - {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' add_url='dcim:devicetype_add_devicebay' delete_url='dcim:devicetype_delete_devicebay' %} + {% include 'dcim/inc/devicetype_component_table.html' with table=devicebay_table title='Device Bays' icon='puzzle-piece' add_url='dcim:devicetype_add_devicebay' delete_url='dcim:devicetype_delete_devicebay' %} {% endif %} {% if devicetype.is_network_device %} - {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %} + {% include 'dcim/inc/devicetype_component_table.html' with table=interface_table title='Interfaces' icon='exchange' add_url='dcim:devicetype_add_interface' delete_url='dcim:devicetype_delete_interface' %} {% endif %} {% if devicetype.is_console_server %} - {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' add_url='dcim:devicetype_add_consoleserverport' delete_url='dcim:devicetype_delete_consoleserverport' %} + {% include 'dcim/inc/devicetype_component_table.html' with table=consoleserverport_table title='Console Server Ports' icon='desktop' add_url='dcim:devicetype_add_consoleserverport' delete_url='dcim:devicetype_delete_consoleserverport' %} {% endif %} {% if devicetype.is_pdu %} - {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} + {% include 'dcim/inc/devicetype_component_table.html' with table=poweroutlet_table title='Power Outlets' icon='plug' add_url='dcim:devicetype_add_poweroutlet' delete_url='dcim:devicetype_delete_poweroutlet' %} {% endif %}
From 535477ddb0262b12291e7bc802b6059d3e33249b Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 10:49:08 -0400 Subject: [PATCH 07/20] add icons based on template vars --- netbox/templates/dcim/inc/devicetype_component_table.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/templates/dcim/inc/devicetype_component_table.html b/netbox/templates/dcim/inc/devicetype_component_table.html index 55bed30e9..7009a4221 100644 --- a/netbox/templates/dcim/inc/devicetype_component_table.html +++ b/netbox/templates/dcim/inc/devicetype_component_table.html @@ -5,6 +5,7 @@
Add {{ title }} + {{ title }}
{% render_table table 'table.html' %} @@ -20,6 +21,7 @@ {% else %}
+ {{ title }}
{% render_table table 'table.html' %} From bbce31edd7d24459dce0da6f0c279402b31d937a Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 10:54:33 -0400 Subject: [PATCH 08/20] add icons and set icon template var --- netbox/templates/ipam/aggregate.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index 0e9f54ebc..7cab180af 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -32,6 +32,7 @@
+ Aggregate
@@ -79,7 +80,7 @@
- {% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %} + {% include 'utilities/obj_table.html' with table=prefix_table table_template='panel_table.html' heading='Child Prefixes' icon='cubes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
{% endblock %} From 2e14294ead9a11455b6863d9e6a2ac611d4b7645 Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 10:57:32 -0400 Subject: [PATCH 09/20] add icon based on template vars --- netbox/templates/panel_table.html | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/templates/panel_table.html b/netbox/templates/panel_table.html index 0d44d7ea9..1b517a3d5 100644 --- a/netbox/templates/panel_table.html +++ b/netbox/templates/panel_table.html @@ -8,6 +8,7 @@
{% if heading %}
+ {{ heading }}
{% endif %} From d3babb9c7c7dac2a421bfe6bd95b17a781867247 Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:01:14 -0400 Subject: [PATCH 10/20] add template vars for icons --- netbox/templates/ipam/prefix.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index 6403717f4..ff024ab03 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -9,6 +9,7 @@
+ Prefix
@@ -93,11 +94,11 @@
{% if duplicate_prefix_table.rows %} - {% with heading='Duplicate Prefixes' panel_class='danger' %} + {% with heading='Duplicate Prefixes' icon='exclamation-triangle' panel_class='danger' %} {% render_table duplicate_prefix_table 'panel_table.html' %} {% endwith %} {% endif %} - {% with heading='Parent Prefixes' %} + {% with heading='Parent Prefixes' icon='cube' %} {% render_table parent_prefix_table 'panel_table.html' %} {% endwith %}
@@ -105,7 +106,7 @@
{% if child_prefix_table.rows %} - {% include 'utilities/obj_table.html' with table=child_prefix_table table_template='panel_table.html' heading='Child Prefixes' parent=prefix bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %} + {% include 'utilities/obj_table.html' with table=child_prefix_table table_template='panel_table.html' heading='Child Prefixes' icon='cubes' parent=prefix bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %} {% elif prefix.new_subnet %} Add Child Prefix From 03968196e24ae20d648c6928f0745199d29d26e9 Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:02:48 -0400 Subject: [PATCH 11/20] add template vars for icons --- netbox/templates/ipam/prefix_ipaddresses.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/templates/ipam/prefix_ipaddresses.html b/netbox/templates/ipam/prefix_ipaddresses.html index 621bb2f22..bfb6af915 100644 --- a/netbox/templates/ipam/prefix_ipaddresses.html +++ b/netbox/templates/ipam/prefix_ipaddresses.html @@ -7,7 +7,7 @@ {% include 'ipam/inc/prefix_header.html' with active_tab='ip-addresses' %}
- {% include 'utilities/obj_table.html' with table=ip_table table_template='panel_table.html' heading='IP Addresses' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %} + {% include 'utilities/obj_table.html' with table=ip_table table_template='panel_table.html' heading='IP Addresses' icon='map-signs' bulk_edit_url='ipam:ipaddress_bulk_edit' bulk_delete_url='ipam:ipaddress_bulk_delete' %}
{% endblock %} From f124504ee5b56c2e7d611b50359a15db6f84843e Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:05:09 -0400 Subject: [PATCH 12/20] add template vars for icons --- netbox/templates/ipam/ipaddress.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index 6834ded9e..b511b58bb 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -47,6 +47,7 @@
+ IP Address
@@ -119,15 +120,15 @@
- {% with heading='Parent Prefixes' %} + {% with heading='Parent Prefixes' icon='cube' %} {% render_table parent_prefixes_table 'panel_table.html' %} {% endwith %} {% if duplicate_ips_table.rows %} - {% with heading='Duplicate IP Addresses' panel_class='danger' %} + {% with heading='Duplicate IP Addresses' icon='exclamation-traingle' panel_class='danger' %} {% render_table duplicate_ips_table 'panel_table.html' %} {% endwith %} {% endif %} - {% with heading='Related IP Addresses' %} + {% with heading='Related IP Addresses' icon=share-alt' %} {% render_table related_ips_table 'panel_table.html' %} {% endwith %}
From 43a03471e92483e2a509cd8442abc1be2cf6ad7b Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:07:19 -0400 Subject: [PATCH 13/20] add icons to headers --- netbox/templates/ipam/vlan.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index 3412d5254..67ff3da30 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -44,6 +44,7 @@
+ VLAN
@@ -83,6 +84,7 @@
+ Prefixes
{% if prefixes %} From 3a729c1a01a2714138f70e57e617f8cdc9684856 Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:09:11 -0400 Subject: [PATCH 14/20] add icons to headers --- netbox/templates/circuits/circuit.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index cbae7aeac..751524902 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -44,6 +44,7 @@
+ Circuit
@@ -107,6 +108,7 @@
+ Comments
From 97dbfa6bc4b0fd408314d4546ef916344d473405 Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:10:28 -0400 Subject: [PATCH 15/20] Add icons to headers --- netbox/templates/circuits/provider.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index 333a07faf..b5796a98e 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -36,6 +36,7 @@
+ Provider
@@ -73,6 +74,7 @@
+ Comments
@@ -87,6 +89,7 @@
+ Circuit: Circuits
From 88b75edd0037b90315462749b90a4aaa25cbc8ab Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:14:36 -0400 Subject: [PATCH 16/20] add icons to headers --- netbox/templates/secrets/secret.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/netbox/templates/secrets/secret.html b/netbox/templates/secrets/secret.html index e98030c9a..ac9bc9614 100644 --- a/netbox/templates/secrets/secret.html +++ b/netbox/templates/secrets/secret.html @@ -33,6 +33,7 @@
+ Secret Attributes
@@ -71,6 +72,7 @@ {% if secret|decryptable_by:request.user %}
+ Secret Data
From 5c2b61807ad820c23f3276340c9220bdc372f539 Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:21:38 -0400 Subject: [PATCH 17/20] add icons to header --- netbox/templates/circuits/circuit_list.html | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/templates/circuits/circuit_list.html b/netbox/templates/circuits/circuit_list.html index 2b40e0df0..e9d8d684c 100644 --- a/netbox/templates/circuits/circuit_list.html +++ b/netbox/templates/circuits/circuit_list.html @@ -21,6 +21,7 @@
+ Search
From a4822084fe96c8768a9dc14db31c35c942258a22 Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:26:44 -0400 Subject: [PATCH 18/20] add icons to headers --- netbox/templates/dcim/component_template_add.html | 1 + 1 file changed, 1 insertion(+) diff --git a/netbox/templates/dcim/component_template_add.html b/netbox/templates/dcim/component_template_add.html index d305debf5..978f365d0 100644 --- a/netbox/templates/dcim/component_template_add.html +++ b/netbox/templates/dcim/component_template_add.html @@ -18,6 +18,7 @@ {% endif %}
+ New {{ component_type }}
From 9e1dbd38f66684dff9ab1745c8c81fb79a9e2434 Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:27:35 -0400 Subject: [PATCH 19/20] add icons to headers --- netbox/templates/dcim/devicebay_populate.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html index a9d84c5e7..97b342798 100644 --- a/netbox/templates/dcim/devicebay_populate.html +++ b/netbox/templates/dcim/devicebay_populate.html @@ -17,7 +17,9 @@
{% endif %}
-
Populate {{ device_bay }}
+
+ + Populate {{ device_bay }}
From 693a97f58c341e6d6e985154fe1cc2ddb5da7e76 Mon Sep 17 00:00:00 2001 From: bellwood Date: Thu, 14 Jul 2016 11:28:34 -0400 Subject: [PATCH 20/20] add icons to headers --- netbox/templates/dcim/poweroutlet_connect.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/netbox/templates/dcim/poweroutlet_connect.html b/netbox/templates/dcim/poweroutlet_connect.html index 4e6356cb1..01dbd5885 100644 --- a/netbox/templates/dcim/poweroutlet_connect.html +++ b/netbox/templates/dcim/poweroutlet_connect.html @@ -18,7 +18,9 @@
{% endif %}
-
Connect {{ poweroutlet.device }} {{ poweroutlet }}
+
+ + Connect {{ poweroutlet.device }} {{ poweroutlet }}