NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Arranged object tags into a separate panel

Browse Source
This commit is contained in:
Jeremy Stretch 2018-07-10 10:48:33 -04:00
parent f2512c4fdc
commit 4802e516e5
28 changed files with 112 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,21 +123,12 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in circuit.tags.all %}
{% tag tag 'circuits:circuit_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
{% with circuit.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=circuit.tags.all url='circuits:circuit_list' %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>

12
netbox/templates/circuits/circuit_edit.html
View File

@ -38,18 +38,18 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
{% endblock %}
{% block javascript %}

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

@ -115,16 +115,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in provider.tags.all %}
{% tag tag 'circuits:provider_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
<tr>
<td>Circuits</td>
<td>
@ -136,6 +126,7 @@
{% with provider.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=provider.tags.all url='circuits:provider_list' %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>

12
netbox/templates/circuits/provider_edit.html
View File

@ -27,16 +27,16 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
{% endblock %}

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

@ -169,16 +169,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in device.tags.all %}
{% tag tag 'dcim:device_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
{% if vc_members %}
@ -295,6 +285,7 @@
{% with device.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=device.tags.all url='dcim:device_list' %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>

12
netbox/templates/dcim/device_edit.html
View File

@ -77,16 +77,16 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
{% endblock %}

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

@ -85,16 +85,6 @@
<td>Interface Ordering</td>
<td>{{ devicetype.get_interface_ordering_display }}</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in devicetype.tags.all %}
{% tag tag 'dcim:devicetype_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
<tr>
<td>Instances</td>
<td><a href="{% url 'dcim:device_list' %}?device_type_id={{ devicetype.pk }}">{{ devicetype.instances.count }}</a></td>
@ -171,6 +161,7 @@
{% with devicetype.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=devicetype.tags.all url='dcim:devicetype_list' %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>

12
netbox/templates/dcim/devicetype_edit.html
View File

@ -31,16 +31,16 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
{% endblock %}

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

@ -125,16 +125,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in rack.tags.all %}
{% tag tag 'dcim:rack_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
<tr>
<td>Devices</td>
<td>
@ -171,6 +161,19 @@
{% with rack.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=rack.tags.all url='dcim:rack_list' %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>
</div>
<div class="panel-body">
{% if rack.comments %}
{{ rack.comments|gfm }}
{% else %}
<span class="text-muted">None</span>
{% endif %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<strong>Non-Racked Devices</strong>
@ -212,18 +215,6 @@
</div>
{% endif %}
</div>
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>
</div>
<div class="panel-body">
{% if rack.comments %}
{{ rack.comments|gfm }}
{% else %}
<span class="text-muted">None</span>
{% endif %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<strong>Images</strong>

12
netbox/templates/dcim/rack_edit.html
View File

@ -37,16 +37,16 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
{% endblock %}

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

@ -145,16 +145,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in site.tags.all %}
{% tag tag 'dcim:site_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
<div class="panel panel-default">
@ -232,6 +222,7 @@
{% with site.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=site.tags.all url='dcim:site_list' %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>

12
netbox/templates/dcim/site_edit.html
View File

@ -42,16 +42,16 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
{% endblock %}

13
netbox/templates/extras/inc/tags_panel.html Normal file
View File

@ -0,0 +1,13 @@
{% load helpers %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Tags</strong>
</div>
<div class="panel-body">
{% for tag in tags %}
{% tag tag url %}
{% empty %}
<span class="text-muted">No tags assigned</span>
{% endfor %}
</div>
</div>

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

@ -93,16 +93,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in aggregate.tags.all %}
{% tag tag 'ipam:aggregate_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
</div>
@ -110,6 +100,7 @@
{% with aggregate.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=aggregate.tags.all url='ipam:aggregate_list' %}
</div>
</div>
<div class="row">

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

@ -145,21 +145,12 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in ipaddress.tags.all %}
{% tag tag 'ipam:ipaddress_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
{% with ipaddress.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=ipaddress.tags.all url='ipam:ipaddress_list' %}
</div>
<div class="col-md-8">
{% include 'panel_table.html' with table=parent_prefixes_table heading='Parent Prefixes' %}

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

@ -185,16 +185,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in prefix.tags.all %}
{% tag tag 'ipam:prefix_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
<tr>
<td>Utilization</td>
<td>{% utilization_graph prefix.get_utilization %}</td>
@ -204,7 +194,7 @@
{% with prefix.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
<br />
{% include 'extras/inc/tags_panel.html' with tags=prefix.tags.all url='ipam:prefix_list' %}
</div>
<div class="col-md-7">
{% if duplicate_prefix_table.rows %}

12
netbox/templates/ipam/prefix_edit.html
View File

@ -28,12 +28,6 @@
{% render_field form.tenant %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
{% if form.custom_fields %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Custom Fields</strong></div>
@ -42,4 +36,10 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
{% endblock %}

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

@ -137,21 +137,12 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in vlan.tags.all %}
{% tag tag 'ipam:vlan_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
{% with vlan.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=vlan.tags.all url='ipam:vlan_list' %}
</div>
<div class="col-md-6">
<div class="panel panel-default">

12
netbox/templates/ipam/vlan_edit.html
View File

@ -21,12 +21,6 @@
{% render_field form.tenant %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
{% if form.custom_fields %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Custom Fields</strong></div>
@ -35,4 +29,10 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
{% endblock %}

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

@ -89,22 +89,13 @@
<span class="text-muted">N/A</span>
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in vrf.tags.all %}
{% tag tag 'ipam:vrf_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
{% with vrf.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=vrf.tags.all url='ipam:vrf_list' %}
</div>
<div class="col-md-6">
<div class="panel panel-default">

12
netbox/templates/ipam/vrf_edit.html
View File

@ -18,12 +18,6 @@
{% render_field form.tenant %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
{% if form.custom_fields %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Custom Fields</strong></div>
@ -32,4 +26,10 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
{% endblock %}

11
netbox/templates/secrets/secret.html
View File

@ -67,18 +67,9 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in secret.tags.all %}
{% tag tag 'secrets:secret_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
{% include 'extras/inc/tags_panel.html' with tags=secret.tags.all url='secrets:secret_list' %}
</div>
<div class="col-md-6">
{% if secret|decryptable_by:request.user %}

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

@ -79,21 +79,12 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in tenant.tags.all %}
{% tag tag 'tenancy:tenant_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
{% with tenant.get_custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'extras/inc/tags_panel.html' with tags=tenant.tags.all url='tenancy:tenant_list' %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>

12
netbox/templates/tenancy/tenant_edit.html
View File

@ -20,16 +20,16 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
{% endblock %}

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

@ -87,16 +87,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in cluster.tags.all %}
{% tag tag 'virtualization:cluster_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
<tr>
<td>Virtual Machines</td>
<td><a href="{% url 'virtualization:virtualmachine_list' %}?cluster_id={{ cluster.pk }}">{{ cluster.virtual_machines.count }}</a></td>
@ -104,6 +94,7 @@
</table>
</div>
{% include 'inc/custom_fields_panel.html' with custom_fields=cluster.get_custom_fields %}
{% include 'extras/inc/tags_panel.html' with tags=cluster.tags.all url='virtualization:cluster_list' %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>

12
netbox/templates/virtualization/cluster_edit.html
View File

@ -19,16 +19,16 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
{% endblock %}

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

@ -135,19 +135,10 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tags</td>
<td>
{% for tag in virtualmachine.tags.all %}
{% tag tag 'virtualization:virtualmachine_list' %}
{% empty %}
<span class="text-muted">N/A</span>
{% endfor %}
</td>
</tr>
</table>
</div>
{% include 'inc/custom_fields_panel.html' with custom_fields=virtualmachine.get_custom_fields %}
{% include 'extras/inc/tags_panel.html' with tags=virtualmachine.tags.all url='virtualization:virtualmachine_list' %}
<div class="panel panel-default">
<div class="panel-heading">
<strong>Comments</strong>

12
netbox/templates/virtualization/virtualmachine_edit.html
View File

@ -48,16 +48,16 @@
</div>
</div>
{% endif %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tags</strong></div>
<div class="panel-body">
{% render_field form.tags %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Comments</strong></div>
<div class="panel-body">
{% render_field form.comments %}
</div>
</div>
{% endblock %}