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

Merge branch 'develop' into develop-2.10

This commit is contained in:
Jeremy Stretch
2020-11-09 20:58:59 -05:00
13 changed files with 118 additions and 43 deletions

View File

@@ -1,5 +1,6 @@
{% extends 'base.html' %}
{% load helpers %}
{% load plugins %}
{% block header %}
<div class="row noprint">
@@ -12,6 +13,7 @@
</div>
</div>
<div class="pull-right noprint">
{% plugin_buttons vminterface %}
{% if perms.virtualization.change_vminterface %}
<a href="{% url 'virtualization:vminterface_edit' pk=vminterface.pk %}" class="btn btn-warning">
<span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
@@ -82,9 +84,11 @@
</tr>
</table>
</div>
{% plugin_left_page vminterface %}
</div>
<div class="col-md-6">
{% include 'extras/inc/tags_panel.html' with tags=vminterface.tags.all %}
{% plugin_right_page vminterface %}
</div>
</div>
<div class="row">
@@ -97,4 +101,9 @@
{% include 'panel_table.html' with table=vlan_table heading="VLANs" %}
</div>
</div>
<div class="row">
<div class="col-md-12">
{% plugin_full_width_page vminterface %}
</div>
</div>
{% endblock %}