Merge branch 'develop' into feature

This commit is contained in:
jeremystretch
2021-05-04 14:25:53 -04:00
53 changed files with 1172 additions and 1309 deletions

View File

@@ -10,6 +10,15 @@
<li class="breadcrumb-item">{{ object }}</li>
{% endblock %}
{% block buttons %}
{% if perms.ipam.add_vlan %}
<a href="{% url 'ipam:vlan_add' %}?group={{ object.pk }}" class="btn btn-success">
<span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add VLAN
</a>
{% endif %}
{{ block.super }}
{% endblock %}
{% block content %}
<div class="row mb-3">
<div class="col col-md-6">