NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-25 14:47:46 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'develop' into 2921-tags-select2

Browse Source
This commit is contained in:
Saria Hajjar
2020-01-16 15:33:42 +00:00
parent e10333bf2b 3eb2d45e8d
commit 2949bfaaa7
1030 changed files with 94332 additions and 6656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
{% extends '_base.html' %}
{% load buttons %}
{% load custom_links %}
{% load helpers %}
@@ -27,17 +28,14 @@
</div>
</div>
<div class="pull-right noprint">
{% if perms.virtualization.add_cluster %}
{% clone_button cluster %}
{% endif %}
{% if perms.virtualization.change_cluster %}
<a href="{% url 'virtualization:cluster_edit' pk=cluster.pk %}" class="btn btn-warning">
<span class="fa fa-pencil" aria-hidden="true"></span>
Edit this cluster
</a>
{% edit_button cluster %}
{% endif %}
{% if perms.virtualization.delete_cluster %}
<a href="{% url 'virtualization:cluster_delete' pk=cluster.pk %}" class="btn btn-danger">
<span class="fa fa-trash" aria-hidden="true"></span>
Delete this cluster
</a>
{% delete_button cluster %}
{% endif %}
</div>
<h1>{% block title %}{{ cluster }}{% endblock %}</h1>
@@ -83,6 +81,16 @@
{% endif %}
</td>
</tr>
<tr>
<td>Tenant</td>
<td>
{% if cluster.tenant %}
<a href="{{ cluster.tenant.get_absolute_url }}">{{ cluster.tenant }}</a>
{% else %}
<span class="text-muted">None</span>
{% endif %}
</td>
</tr>
<tr>
<td>Site</td>
<td>

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

@@ -8,9 +8,17 @@
{% render_field form.name %}
{% render_field form.type %}
{% render_field form.group %}
{% render_field form.tenant %}
{% render_field form.site %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading"><strong>Tenancy</strong></div>
<div class="panel-body">
{% render_field form.tenant_group %}
{% render_field form.tenant %}
</div>
</div>
{% if form.custom_fields %}
<div class="panel panel-default">
<div class="panel-heading"><strong>Custom Fields</strong></div>

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

@@ -1,4 +1,5 @@
{% extends '_base.html' %}
{% load buttons %}
{% load custom_links %}
{% load static %}
{% load helpers %}
@@ -27,17 +28,14 @@
</div>
</div>
<div class="pull-right noprint">
{% if perms.virtualization.add_virtualmachine %}
{% clone_button virtualmachine %}
{% endif %}
{% if perms.virtualization.change_virtualmachine %}
<a href="{% url 'virtualization:virtualmachine_edit' pk=virtualmachine.pk %}" class="btn btn-warning">
<span class="fa fa-pencil"></span>
Edit this VM
</a>
{% edit_button virtualmachine %}
{% endif %}
{% if perms.virtualization.delete_virtualmachine %}
<a href="{% url 'virtualization:virtualmachine_delete' pk=virtualmachine.pk %}" class="btn btn-danger">
<span class="fa fa-trash"></span>
Delete this VM
</a>
{% delete_button virtualmachine %}
{% endif %}
</div>
<h1>{% block title %}{{ virtualmachine }}{% endblock %}</h1>