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 branch 'develop' into 2921-tags-select2

Browse Source
This commit is contained in:
Saria Hajjar
2020-01-30 17:51:55 +00:00
parent 5879671971 923c2728b3
commit 52f7ef4864
38 changed files with 250 additions and 6429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/templates/dcim/cable_trace.html
View File

@@ -32,7 +32,7 @@
{% if cable.label %}<code>{{ cable.label }}</code>{% else %}Cable #{{ cable.pk }}{% endif %}
</a>
</h4>
<p><span class="label label-{% if cable.status %}success{% else %}info{% endif %}">{{ cable.get_status_display }}</span></p>
<p><span class="label label-{{ cable.get_status_class }}">{{ cable.get_status_display }}</span></p>
<p>{{ cable.get_type_display|default:"" }}</p>
{% if cable.length %}{{ cable.length }} {{ cable.get_length_unit_display }}{% endif %}
{% if cable.color %}

2
netbox/templates/dcim/inc/cable_toggle_buttons.html
View File

@@ -1,5 +1,5 @@
{% if perms.dcim.change_cable %}
{% if cable.status %}
{% if cable.status == 'connected' %}
<a href="#" class="btn btn-warning btn-xs cable-toggle connected" title="Mark planned" data="{{ cable.pk }}">
<i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>
</a>

2
netbox/templates/dcim/inc/consoleport.html
View File

@@ -1,4 +1,4 @@
<tr class="consoleport{% if cp.cable.status %} success{% elif cp.cable %} info{% endif %}">
<tr class="consoleport{% if cp.cable %} {{ cp.cable.get_status_class }}{% endif %}">
{# Name #}
<td>

2
netbox/templates/dcim/inc/consoleserverport.html
View File

@@ -1,6 +1,6 @@
{% load helpers %}
<tr class="consoleserverport{% if csp.cable.status %} success{% elif csp.cable %} info{% endif %}">
<tr class="consoleserverport{% if csp.cable %} {{ csp.cable.get_status_class }}{% endif %}">
{# Checkbox #}
{% if perms.dcim.change_consoleserverport or perms.dcim.delete_consoleserverport %}

2
netbox/templates/dcim/inc/frontport.html
View File

@@ -1,5 +1,5 @@
{% load helpers %}
<tr class="frontport{% if frontport.cable.status %} success{% elif frontport.cable %} info{% endif %}">
<tr class="frontport{% if frontport.cable %} {{ frontport.cable.get_status_class }}{% endif %}">
{# Checkbox #}
{% if perms.dcim.change_frontport or perms.dcim.delete_frontport %}

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

@@ -1,5 +1,5 @@
{% load helpers %}
<tr class="interface{% if not iface.enabled %} danger{% elif iface.cable.status %} success{% elif iface.cable %} info{% elif iface.is_virtual %} warning{% endif %}" id="interface_{{ iface.name }}">
<tr class="interface{% if not iface.enabled %} danger{% elif iface.cable %} {{ iface.cable.get_status_class }}{% elif iface.is_virtual %} warning{% endif %}" id="interface_{{ iface.name }}">
{# Checkbox #}
{% if perms.dcim.change_interface or perms.dcim.delete_interface %}

2
netbox/templates/dcim/inc/poweroutlet.html
View File

@@ -1,6 +1,6 @@
{% load helpers %}
<tr class="poweroutlet{% if po.cable.status %} success{% elif po.cable %} info{% endif %}">
<tr class="poweroutlet{% if po.cable %} {{ po.cable.get_status_class }}{% endif %}">
{# Checkbox #}
{% if perms.dcim.change_poweroutlet or perms.dcim.delete_poweroutlet %}

2
netbox/templates/dcim/inc/powerport.html
View File

@@ -1,4 +1,4 @@
<tr class="powerport{% if pp.cable.status %} success{% elif pp.cable %} info{% endif %}">
<tr class="powerport{% if pp.cable %} {{ pp.cable.get_status_class }}{% endif %}">
{# Name #}
<td>

2
netbox/templates/dcim/inc/rearport.html
View File

@@ -1,5 +1,5 @@
{% load helpers %}
<tr class="rearport{% if rearport.cable.status %} success{% elif rearport.cable %} info{% endif %}">
<tr class="rearport{% if rearport.cable %} {{ rearport.cable.get_status_class }}{% endif %}">
{# Checkbox #}
{% if perms.dcim.change_rearport or perms.dcim.delete_rearport %}

2
netbox/templates/ipam/ipaddress_edit.html
View File

@@ -61,7 +61,7 @@
{% render_field form.nat_device %}
</div>
<div class="tab-pane" id="search">
&nbsp;
{% render_field form.nat_vrf %}
</div>
</div>
{% render_field form.nat_inside %}

1
netbox/templates/virtualization/cluster_edit.html
View File

@@ -8,7 +8,6 @@
{% render_field form.name %}
{% render_field form.type %}
{% render_field form.group %}
{% render_field form.tenant %}
{% render_field form.site %}
</div>
</div>