NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-05 11:46:50 -06:00
Code Issues Actions 7 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 8541d6a031 98bb233a61
commit 79c943c5ea
1030 changed files with 94332 additions and 6656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
{% extends '_base.html' %}
{% load buttons %}
{% load custom_links %}
{% load helpers %}
@@ -25,17 +26,14 @@
</div>
</div>
<div class="pull-right noprint">
{% if perms.ipam.add_aggregate %}
{% clone_button aggregate %}
{% endif %}
{% if perms.ipam.change_aggregate %}
<a href="{% url 'ipam:aggregate_edit' pk=aggregate.pk %}" class="btn btn-warning">
<span class="fa fa-pencil" aria-hidden="true"></span>
Edit this aggregate
</a>
{% edit_button aggregate %}
{% endif %}
{% if perms.ipam.delete_aggregate %}
<a href="{% url 'ipam:aggregate_delete' pk=aggregate.pk %}" class="btn btn-danger">
<span class="fa fa-trash" aria-hidden="true"></span>
Delete this aggregate
</a>
{% delete_button aggregate %}
{% endif %}
</div>
<h1>{% block title %}{{ aggregate }}{% endblock %}</h1>

14
netbox/templates/ipam/ipaddress.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.ipam.add_ipaddress %}
{% clone_button ipaddress %}
{% endif %}
{% if perms.ipam.change_ipaddress %}
<a href="{% url 'ipam:ipaddress_edit' pk=ipaddress.pk %}" class="btn btn-warning">
<span class="fa fa-pencil" aria-hidden="true"></span>
Edit this IP
</a>
{%edit_button ipaddress %}
{% endif %}
{% if perms.ipam.delete_ipaddress %}
<a href="{% url 'ipam:ipaddress_delete' pk=ipaddress.pk %}" class="btn btn-danger">
<span class="fa fa-trash" aria-hidden="true"></span>
Delete this IP
</a>
{% delete_button ipaddress %}
{% endif %}
</div>
<h1>{% block title %}{{ ipaddress }}{% endblock %}</h1>

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

@@ -1,4 +1,5 @@
{% extends '_base.html' %}
{% load buttons %}
{% load custom_links %}
{% load helpers %}
@@ -38,17 +39,14 @@
Add an IP Address
</a>
{% endif %}
{% if perms.ipam.add_prefix %}
{% clone_button prefix %}
{% endif %}
{% if perms.ipam.change_prefix %}
<a href="{% url 'ipam:prefix_edit' pk=prefix.pk %}" class="btn btn-warning">
<span class="fa fa-pencil" aria-hidden="true"></span>
Edit this prefix
</a>
{% edit_button prefix %}
{% endif %}
{% if perms.ipam.delete_prefix %}
<a href="{% url 'ipam:prefix_delete' pk=prefix.pk %}" class="btn btn-danger">
<span class="fa fa-trash" aria-hidden="true"></span>
Delete this prefix
</a>
{% delete_button prefix %}
{% endif %}
</div>
<h1>{% block title %}{{ prefix }}{% endblock %}</h1>

17
netbox/templates/ipam/service.html
View File

@@ -1,4 +1,5 @@
{% extends '_base.html' %}
{% load buttons %}
{% load custom_links %}
{% load helpers %}
@@ -24,14 +25,14 @@
</form>
</div>
</div>
{% if perms.dcim.change_service %}
<div class="pull-right">
<a href="{% url 'ipam:service_edit' pk=service.pk %}" class="btn btn-warning">
<span class="fa fa-pencil" aria-hidden="true"></span>
Edit this service
</a>
</div>
{% endif %}
<div class="pull-right">
{% if perms.dcim.change_service %}
{% edit_button service %}
{% endif %}
{% if perms.dcim.delete_service %}
{% delete_button service %}
{% endif %}
</div>
<h1>{% block title %}{{ service }}{% endblock %}</h1>
{% include 'inc/created_updated.html' with obj=service %}
<div class="pull-right noprint">

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

@@ -1,4 +1,5 @@
{% extends '_base.html' %}
{% load buttons %}
{% load custom_links %}
{% load helpers %}
@@ -30,17 +31,14 @@
</div>
</div>
<div class="pull-right noprint">
{% if perms.ipam.add_vlan %}
{% clone_button vlan %}
{% endif %}
{% if perms.ipam.change_vlan %}
<a href="{% url 'ipam:vlan_edit' pk=vlan.pk %}" class="btn btn-warning">
<span class="fa fa-pencil" aria-hidden="true"></span>
Edit this VLAN
</a>
{% edit_button vlan %}
{% endif %}
{% if perms.ipam.delete_vlan %}
<a href="{% url 'ipam:vlan_delete' pk=vlan.pk %}" class="btn btn-danger">
<span class="fa fa-trash" aria-hidden="true"></span>
Delete this VLAN
</a>
{% delete_button vlan %}
{% endif %}
</div>
<h1>{% block title %}VLAN {{ vlan.display_name }}{% endblock %}</h1>

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

@@ -1,4 +1,5 @@
{% extends '_base.html' %}
{% load buttons %}
{% load custom_links %}
{% load helpers %}
@@ -24,17 +25,14 @@
</div>
</div>
<div class="pull-right noprint">
{% if perms.ipam.add_vrf %}
{% clone_button vrf %}
{% endif %}
{% if perms.ipam.change_vrf %}
<a href="{% url 'ipam:vrf_edit' pk=vrf.pk %}" class="btn btn-warning">
<span class="fa fa-pencil" aria-hidden="true"></span>
Edit this VRF
</a>
{% edit_button vrf %}
{% endif %}
{% if perms.ipam.delete_vrf %}
<a href="{% url 'ipam:vrf_delete' pk=vrf.pk %}" class="btn btn-danger">
<span class="fa fa-trash" aria-hidden="true"></span>
Delete this VRF
</a>
{% delete_button vrf %}
{% endif %}
</div>
<h1>{% block title %}VRF {{ vrf }}{% endblock %}</h1>