NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 00:28:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

correct indentations

Browse Source
This commit is contained in:
gorban 2020-02-17 16:26:47 +03:00
parent e04c0473b1
commit f5089333d3
2 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/templates/dcim/device.html
View File

@ -571,8 +571,6 @@
<button class="btn btn-default btn-xs toggle-ips" selected="selected"> <button class="btn btn-default btn-xs toggle-ips" selected="selected">
<span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show IPs <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show IPs
</button> </button>
{# </div>#}
{# <div class="pull-right noprint">#}
<button class="btn btn-default btn-xs toggle-vlans" selected="selected"> <button class="btn btn-default btn-xs toggle-vlans" selected="selected">
<span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show VLANs <span class="glyphicon glyphicon-check" aria-hidden="true"></span> Show VLANs
</button> </button>
@ -590,8 +588,6 @@
<th>Name</th> <th>Name</th>
<th>LAG</th> <th>LAG</th>
<th>Description</th> <th>Description</th>
{# <th>Tagged VLANs</th>#}
{# <th>Untagged VLAN</th>#}
<th>MTU</th> <th>MTU</th>
<th>Mode</th> <th>Mode</th>
<th>Cable</th> <th>Cable</th>

36
netbox/templates/dcim/inc/interface.html
View File

@ -213,7 +213,7 @@
<a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a> <a href="{% url 'ipam:ipaddress' pk=ip.pk %}">{{ ip }}</a>
</td> </td>
{# Primary/status/role#} {# Primary/status/role#}
<td> <td>
{% if device.primary_ip4 == ip or device.primary_ip6 == ip %} {% if device.primary_ip4 == ip or device.primary_ip6 == ip %}
<span class="label label-success">Primary</span> <span class="label label-success">Primary</span>
@ -224,7 +224,7 @@
{% endif %} {% endif %}
</td> </td>
{# VRF#} {#VRF#}
<td> <td>
{% if ip.vrf %} {% if ip.vrf %}
<a href="{% url 'ipam:vrf' pk=ip.vrf.pk %}" title="{{ ip.vrf.rd }}">{{ ip.vrf.name }}</a> <a href="{% url 'ipam:vrf' pk=ip.vrf.pk %}" title="{{ ip.vrf.rd }}">{{ ip.vrf.name }}</a>
@ -233,7 +233,7 @@
{% endif %} {% endif %}
</td> </td>
{# Description#} {#Description#}
<td> <td>
{% if ip.description %} {% if ip.description %}
{{ ip.description }} {{ ip.description }}
@ -242,7 +242,7 @@
{% endif %} {% endif %}
</td> </td>
{# Buttons#} {#Buttons#}
<td class="text-right text-nowrap noprint"> <td class="text-right text-nowrap noprint">
{% if perms.ipam.change_ipaddress %} {% if perms.ipam.change_ipaddress %}
<a href="{% url 'ipam:ipaddress_edit' pk=ip.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-info btn-xs"> <a href="{% url 'ipam:ipaddress_edit' pk=ip.pk %}?return_url={{ device.get_absolute_url }}" class="btn btn-info btn-xs">
@ -266,12 +266,12 @@
{% if iface.untagged_vlan or iface.tagged_vlans.all %} {% if iface.untagged_vlan or iface.tagged_vlans.all %}
<tr> <tr>
{# Placeholder#} {#Placeholder#}
{% if perms.dcim.change_interface or perms.dcim.delete_interface %} {% if perms.dcim.change_interface or perms.dcim.delete_interface %}
<td class="vlans"></td> <td class="vlans"></td>
{% endif %} {% endif %}
{# VLAN table #} {#VLAN table#}
<td class="vlans" colspan="9" style="padding: 0"> <td class="vlans" colspan="9" style="padding: 0">
<table class="table table-condensed interface-ips"> <table class="table table-condensed interface-ips">
<thead> <thead>
@ -284,54 +284,54 @@
</tr> </tr>
</thead> </thead>
<tr> <tr>
{# Untagged VLAN #} {#Untagged VLAN#}
{% if iface.untagged_vlan %} {% if iface.untagged_vlan %}
{# VLAN ID #} {#VLAN ID#}
<td> <td>
<a href="{% url 'ipam:vlan' iface.untagged_vlan.id %}">{{ iface.untagged_vlan.vid }}</a> <a href="{% url 'ipam:vlan' iface.untagged_vlan.id %}">{{ iface.untagged_vlan.vid }}</a>
</td> </td>
{# VLAN tag #} {#VLAN tag#}
<td> <td>
<span class="text-danger"> <span class="text-danger">
<li class="fa fa-close"></li> <li class="fa fa-close"></li>
</span> </span>
</td> </td>
{# VLAN status #} {#VLAN status#}
<td> <td>
<span class="label label-primary" <span class="label label-primary"
style="text-transform: capitalize">{{ iface.untagged_vlan.status }}</span> style="text-transform: capitalize">{{ iface.untagged_vlan.status }}</span>
</td> </td>
{# VLAN name #} {#VLAN name#}
<td>{{ iface.untagged_vlan.name }}</td> <td>{{ iface.untagged_vlan.name }}</td>
{# VLAN description #} {#VLAN description#}
<td>{{ iface.untagged_vlan.description }}</td> <td>{{ iface.untagged_vlan.description }}</td>
{% endif %} {% endif %}
</tr> </tr>
{# Tagged VLANs #} {#Tagged VLANs#}
{% if iface.tagged_vlans.all %} {% if iface.tagged_vlans.all %}
{% for tag in iface.tagged_vlans.all %} {% for tag in iface.tagged_vlans.all %}
<tr> <tr>
{# VLAN ID #} {#VLAN ID#}
<td> <td>
<a href="{% url 'ipam:vlan' tag.id %}">{{ tag.vid }}</a> <a href="{% url 'ipam:vlan' tag.id %}">{{ tag.vid }}</a>
</td> </td>
{# VLAN tag #} {#VLAN tag#}
<td> <td>
<span class="text-success"> <span class="text-success">
<li class="fa fa-check"></li> <li class="fa fa-check"></li>
</span> </span>
</td> </td>
{# VLAN status #} {#VLAN status#}
<td> <td>
<span class="label label-primary" <span class="label label-primary"
style="text-transform: capitalize">{{ tag.status }}</span> style="text-transform: capitalize">{{ tag.status }}</span>
</td> </td>
{# VLAN name #} {#VLAN name#}
<td>{{ tag.name }}</td> <td>{{ tag.name }}</td>
{# VLAN description #} {#VLAN description#}
<td>{{ tag.description }}</td> <td>{{ tag.description }}</td>
</tr> </tr>
{% endfor %} {% endfor %}