mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Standardize & simplify tags panel inclusion

Browse Source
This commit is contained in:
jeremystretch
2021-10-21 11:23:31 -04:00
parent cfb3897047
commit 6f05f17c62
51 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/templates/circuits/circuit.html
View File

@ -65,7 +65,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:circuit_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
</div>

1
netbox/templates/circuits/circuittype.html
View File

@ -28,6 +28,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/circuits/provider.html
View File

@ -47,7 +47,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:provider_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/circuits/providernetwork.html
View File

@ -38,7 +38,7 @@
</div>
<div class="col col-md-6">
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='circuits:providernetwork_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/comments.html' %}
{% plugin_right_page object %}
</div>

2
netbox/templates/dcim/cable.html
View File

@ -64,7 +64,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:cable_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/consoleport.html
View File

@ -41,7 +41,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/consoleserverport.html
View File

@ -41,7 +41,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/device.html
View File

@ -221,7 +221,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:device_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
</div>

2
netbox/templates/dcim/devicebay.html
View File

@ -33,7 +33,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

1
netbox/templates/dcim/devicerole.html
View File

@ -58,6 +58,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/devicetype.html
View File

@ -88,7 +88,7 @@
</div>
<div class="col col-md-6">
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:devicetype_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/comments.html' %}
{% plugin_right_page object %}
</div>

2
netbox/templates/dcim/frontport.html
View File

@ -53,7 +53,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/interface.html
View File

@ -103,7 +103,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/inventoryitem.html
View File

@ -65,7 +65,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

1
netbox/templates/dcim/location.html
View File

@ -68,6 +68,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

1
netbox/templates/dcim/manufacturer.html
View File

@ -34,6 +34,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

1
netbox/templates/dcim/platform.html
View File

@ -55,6 +55,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/powerfeed.html
View File

@ -108,7 +108,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:powerfeed_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/poweroutlet.html
View File

@ -45,7 +45,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/powerpanel.html
View File

@ -39,7 +39,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:powerpanel_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/powerport.html
View File

@ -45,7 +45,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/rack.html
View File

@ -163,7 +163,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:rack_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/comments.html' %}
{% if power_feeds %}
<div class="card">

2
netbox/templates/dcim/rackreservation.html
View File

@ -84,7 +84,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:rackreservation_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-12 col-xl-7">

1
netbox/templates/dcim/rackrole.html
View File

@ -34,6 +34,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/dcim/rearport.html
View File

@ -47,7 +47,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

1
netbox/templates/dcim/region.html
View File

@ -45,6 +45,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/contacts.html' %}
{% plugin_left_page object %}

3
netbox/templates/dcim/site.html
View File

@ -169,7 +169,6 @@
<div class="float-end text-warning">
<i class="mdi mdi-alert" title="{{ deprecation_warning }}"></i>
</div>
<a href="tel:{{ object.contact_
<a href="mailto:{{ object.contact_email }}">{{ object.contact_email }}</a>
{% else %}
<span class="text-muted">&mdash;</span>
@ -181,7 +180,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:site_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
</div>

1
netbox/templates/dcim/sitegroup.html
View File

@ -45,6 +45,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/contacts.html' %}
{% plugin_left_page object %}

2
netbox/templates/dcim/virtualchassis.html
View File

@ -39,7 +39,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='dcim:virtualchassis_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-8">

11
netbox/templates/inc/panels/tags.html
View File

@ -1,11 +1,14 @@
{% load helpers %}
<div class="card">
<h5 class="card-header">
Tags
</h5>
<h5 class="card-header">Tags</h5>
<div class="card-body">
{% for tag in tags.all %} {% tag tag url %} {% empty %}
{% with url=object|validated_viewname:"list" %}
{% for tag in object.tags.all %}
{% tag tag url %}
{% empty %}
<span class="text-muted">No tags assigned</span>
{% endfor %}
{% endwith %}
</div>
</div>

2
netbox/templates/ipam/aggregate.html
View File

@ -65,7 +65,7 @@
</div>
<div class="col col-md-6">
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:aggregate_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_right_page object %}
</div>
</div>

2
netbox/templates/ipam/ipaddress.html
View File

@ -145,7 +145,7 @@
<div class="row my-3">
<div class="col col-md-4">
{% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:ipaddress_list' %}
{% include 'inc/panels/tags.html' %}
</div>
</div>

2
netbox/templates/ipam/iprange.html
View File

@ -82,7 +82,7 @@
{% plugin_left_page object %}
</div>
<div class="col col-md-6">
{% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:prefix_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
</div>

2
netbox/templates/ipam/prefix.html
View File

@ -122,7 +122,7 @@
</div>
<div class="col col-md-6">
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:prefix_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_right_page object %}
</div>
</div>

1
netbox/templates/ipam/rir.html
View File

@ -38,6 +38,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

1
netbox/templates/ipam/role.html
View File

@ -32,6 +32,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/ipam/routetarget.html
View File

@ -30,7 +30,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:routetarget_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% plugin_left_page object %}
</div>

2
netbox/templates/ipam/service.html
View File

@ -61,7 +61,7 @@
</div>
<div class="col col-md-6">
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:service_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_right_page object %}
</div>
</div>

2
netbox/templates/ipam/vlan.html
View File

@ -83,7 +83,7 @@
</div>
<div class="col col-md-6">
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:vlan_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_right_page object %}
</div>
</div>

1
netbox/templates/ipam/vlangroup.html
View File

@ -54,6 +54,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/ipam/vrf.html
View File

@ -60,7 +60,7 @@
{% plugin_left_page object %}
</div>
<div class="col col-md-6">
{% include 'inc/panels/tags.html' with tags=object.tags.all url='ipam:vrf_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/custom_fields.html' %}
{% plugin_right_page object %}
</div>

2
netbox/templates/tenancy/contact.html
View File

@ -60,7 +60,7 @@
</div>
<div class="col col-md-5">
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='tenancy:tenant_list' %}
{% include 'inc/panels/tags.html' %}
{% plugin_right_page object %}
</div>
</div>

1
netbox/templates/tenancy/contactgroup.html
View File

@ -45,6 +45,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

1
netbox/templates/tenancy/contactrole.html
View File

@ -30,6 +30,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/tenancy/tenant.html
View File

@ -36,7 +36,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='tenancy:tenant_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/comments.html' %}
{% include 'inc/panels/contacts.html' %}
{% plugin_left_page object %}

1
netbox/templates/tenancy/tenantgroup.html
View File

@ -45,6 +45,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/virtualization/cluster.html
View File

@ -61,7 +61,7 @@
</div>
<div class="col col-md-6">
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='virtualization:cluster_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/contacts.html' %}
{% plugin_right_page object %}
</div>

1
netbox/templates/virtualization/clustergroup.html
View File

@ -28,6 +28,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

1
netbox/templates/virtualization/clustertype.html
View File

@ -28,6 +28,7 @@
</table>
</div>
</div>
{% include 'inc/panels/tags.html' %}
{% plugin_left_page object %}
</div>
<div class="col col-md-6">

2
netbox/templates/virtualization/virtualmachine.html
View File

@ -90,7 +90,7 @@
</div>
</div>
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all url='virtualization:virtualmachine_list' %}
{% include 'inc/panels/tags.html' %}
{% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}
</div>

2
netbox/templates/virtualization/vminterface.html
View File

@ -70,7 +70,7 @@
</div>
<div class="col col-md-6">
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' with tags=object.tags.all %}
{% include 'inc/panels/tags.html' %}
{% plugin_right_page object %}
</div>
</div>