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

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
Download Patch File Download Diff File Expand all files Collapse all files

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 %}