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

Merge v2.11.2

Browse Source
This commit is contained in:
jeremystretch
2021-04-27 14:05:38 -04:00
parent 368c2aac24 51f6d2f45e
commit 456ffb79ff
26 changed files with 138 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/templates/dcim/device/base.html
View File

@ -119,7 +119,7 @@
Device
</a>
</li>
{% with interface_count=object.vc_interfaces.count %}
{% with interface_count=object.interfaces_count %}
{% if interface_count %}
<li role="presentation" class="nav-item">
<a class="nav-link {% if active_tab == 'interfaces' %} active{% endif %}" href="{% url 'dcim:device_interfaces' pk=object.pk %}">Interfaces {% badge interface_count %}</a>

3
netbox/templates/dcim/trace/device.html
View File

@ -2,6 +2,9 @@
<strong><a href="{{ device.get_absolute_url }}">{{ device }}</a></strong><br />
{{ device.device_type.manufacturer }} {{ device.device_type }}<br />
<a href="{{ device.site.get_absolute_url }}">{{ device.site }}</a>
{% if device.location %}
/ <a href="{{ device.location.get_absolute_url }}">{{ device.location }}</a>
{% endif %}
{% if device.rack %}
/ <a href="{{ device.rack.get_absolute_url }}">{{ device.rack }}</a>
{% endif %}

5
netbox/templates/ipam/prefix_list.html
View File

@ -7,6 +7,11 @@
Max Length{% if "mask_length__lte" in request.GET %}: {{ request.GET.mask_length__lte }}{% endif %}
</button>
<ul class="dropdown-menu" aria-labelledby="max_length">
{% if request.GET.mask_length__lte %}
<li>
<a class="dropdown-item" href="{% url 'ipam:prefix_list' %}{% querystring request mask_length__lte=None page=1 %}">Clear</a>
</li>
{% endif %}
{% for i in "4,8,12,16,20,24,28,32,40,48,56,64"|split %}
<li><a class="dropdown-item" href="{% url 'ipam:prefix_list' %}{% querystring request mask_length__lte=i page=1 %}">
{{ i }} {% if request.GET.mask_length__lte == i %}<i class="mdi mdi-check-bold"></i>{% endif %}