From 6a9f26a68d9749c0aef5bd466d81c9155ea7f886 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 14 Dec 2016 17:09:33 -0500 Subject: [PATCH] Cleaned up attribute tables --- netbox/project-static/css/base.css | 5 ++++- netbox/templates/circuits/circuit.html | 2 +- netbox/templates/circuits/inc/circuit_termination.html | 2 +- netbox/templates/circuits/provider.html | 2 +- netbox/templates/dcim/device.html | 4 ++-- netbox/templates/dcim/device_inventory.html | 2 +- netbox/templates/dcim/devicetype.html | 2 +- netbox/templates/dcim/rack.html | 2 +- netbox/templates/dcim/site.html | 2 +- netbox/templates/inc/custom_fields_panel.html | 2 +- netbox/templates/ipam/aggregate.html | 2 +- netbox/templates/ipam/ipaddress.html | 2 +- netbox/templates/ipam/prefix.html | 2 +- netbox/templates/ipam/vlan.html | 2 +- netbox/templates/ipam/vrf.html | 2 +- netbox/templates/tenancy/tenant.html | 2 +- 16 files changed, 20 insertions(+), 17 deletions(-) diff --git a/netbox/project-static/css/base.css b/netbox/project-static/css/base.css index 8503f465e..4f569edea 100644 --- a/netbox/project-static/css/base.css +++ b/netbox/project-static/css/base.css @@ -89,6 +89,9 @@ th.pk, td.pk { tfoot td { font-weight: bold; } +table.attr-table td:nth-child(1) { + width: 25%; +} /* Paginator */ div.paginator { @@ -327,4 +330,4 @@ td .progress { } textarea { font-family: Consolas, Lucida Console, monospace; -} +} \ No newline at end of file diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html index 92aa4e09e..5591c64b9 100644 --- a/netbox/templates/circuits/circuit.html +++ b/netbox/templates/circuits/circuit.html @@ -47,7 +47,7 @@
Circuit
- +
Provider diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html index 7be5e4df4..7c641975c 100644 --- a/netbox/templates/circuits/inc/circuit_termination.html +++ b/netbox/templates/circuits/inc/circuit_termination.html @@ -23,7 +23,7 @@ Termination - {{ side }} Side {% if termination %} - +
Site diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html index aff57abed..c9c8b9742 100644 --- a/netbox/templates/circuits/provider.html +++ b/netbox/templates/circuits/provider.html @@ -53,7 +53,7 @@
Provider
- +
ASN diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html index f3158b98c..71b9b175b 100644 --- a/netbox/templates/dcim/device.html +++ b/netbox/templates/dcim/device.html @@ -13,7 +13,7 @@
Device
- +
Tenant @@ -85,7 +85,7 @@
Management
- +
Role diff --git a/netbox/templates/dcim/device_inventory.html b/netbox/templates/dcim/device_inventory.html index 0642f2859..48e29f7cb 100644 --- a/netbox/templates/dcim/device_inventory.html +++ b/netbox/templates/dcim/device_inventory.html @@ -10,7 +10,7 @@
Chassis
- +
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html index 0492bd2cc..7f9cc39dc 100644 --- a/netbox/templates/dcim/devicetype.html +++ b/netbox/templates/dcim/devicetype.html @@ -39,7 +39,7 @@
Chassis
-
Model {{ device.device_type.full_name }}
+
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html index 6d6fe0020..2d0e065fd 100644 --- a/netbox/templates/dcim/rack.html +++ b/netbox/templates/dcim/rack.html @@ -60,7 +60,7 @@
Rack
-
Manufacturer {{ devicetype.manufacturer }}
+
Site diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html index 3cf9e9f43..e1b582dd2 100644 --- a/netbox/templates/dcim/site.html +++ b/netbox/templates/dcim/site.html @@ -54,7 +54,7 @@
Site
- +
Tenant diff --git a/netbox/templates/inc/custom_fields_panel.html b/netbox/templates/inc/custom_fields_panel.html index a185a2ae7..2ed10ee4d 100644 --- a/netbox/templates/inc/custom_fields_panel.html +++ b/netbox/templates/inc/custom_fields_panel.html @@ -3,7 +3,7 @@
Custom Fields
- +
{% for field, value in custom_fields.items %} diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html index b15c18808..b814ea25b 100644 --- a/netbox/templates/ipam/aggregate.html +++ b/netbox/templates/ipam/aggregate.html @@ -47,7 +47,7 @@
Aggregate
-
{{ field }}
+
diff --git a/netbox/templates/ipam/ipaddress.html b/netbox/templates/ipam/ipaddress.html index a998f3238..c4ed601c6 100644 --- a/netbox/templates/ipam/ipaddress.html +++ b/netbox/templates/ipam/ipaddress.html @@ -49,7 +49,7 @@
IP Address
-
Family {{ aggregate.get_family_display }}
+
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html index e8ce68090..2245eb4be 100644 --- a/netbox/templates/ipam/prefix.html +++ b/netbox/templates/ipam/prefix.html @@ -11,7 +11,7 @@
Prefix
-
Family {{ ipaddress.get_family_display }}
+
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html index e8f645e46..3d81392e0 100644 --- a/netbox/templates/ipam/vlan.html +++ b/netbox/templates/ipam/vlan.html @@ -50,7 +50,7 @@
VLAN
-
Family {{ prefix.get_family_display }}
+
diff --git a/netbox/templates/ipam/vrf.html b/netbox/templates/ipam/vrf.html index f301e617b..9dbae8ab9 100644 --- a/netbox/templates/ipam/vrf.html +++ b/netbox/templates/ipam/vrf.html @@ -46,7 +46,7 @@
VRF
-
Site {{ vlan.site }}
+
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html index e241d1e57..bc00e399e 100644 --- a/netbox/templates/tenancy/tenant.html +++ b/netbox/templates/tenancy/tenant.html @@ -49,7 +49,7 @@
Tenant
-
Route Distinguisher {{ vrf.rd }}
+
Group