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

Introduced a placeholder template filter

Browse Source
This commit is contained in:
Jeremy Stretch
2018-11-05 13:00:46 -05:00
parent 53b6a07a41
commit 045856c9ac
23 changed files with 75 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@
</tr>
<tr>
<td>Label</td>
<td>{% if cable.label %}{{ cable.label }}{% else %}<span class="text-muted">N/A</span>{% endif %}</td>
<td>{{ cable.labe|placeholder }}</td>
</tr>
<tr>
<td>Color</td>
@@ -69,7 +69,7 @@
{% if cable.length %}
{{ cable.length }} {{ cable.get_length_unit_display }}
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>

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

@@ -142,7 +142,7 @@
{% elif device.rack and device.device_type.u_height %}
<span class="label label-warning">Not racked</span>
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>
@@ -168,23 +168,11 @@
</tr>
<tr>
<td>Serial Number</td>
<td>
{% if device.serial %}
<span>{{ device.serial }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td><span>{{ device.serial|placeholder }}</span></td>
</tr>
<tr>
<td>Asset Tag</td>
<td>
{% if device.asset_tag %}
<span>{{ device.asset_tag }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td><span>{{ device.asset_tag|placeholder }}</span></td>
</tr>
</table>
</div>
@@ -266,7 +254,7 @@
<span>(NAT: {{ device.primary_ip4.nat_outside.address.ip }})</span>
{% endif %}
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>
@@ -281,7 +269,7 @@
<span>(NAT: {{ device.primary_ip6.nat_outside.address.ip }})</span>
{% endif %}
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>

17
netbox/templates/dcim/device_inventory.html
View File

@@ -1,4 +1,5 @@
{% extends 'dcim/device.html' %}
{% load helpers %}
{% block title %}{{ device }} - Inventory{% endblock %}
@@ -16,23 +17,11 @@
</tr>
<tr>
<td>Serial Number</td>
<td>
{% if device.serial %}
<span>{{ device.serial }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td><span>{{ device.serial|placeholder }}</span></td>
</tr>
<tr>
<td>Asset Tag</td>
<td>
{% if device.asset_tag %}
<span>{{ device.asset_tag }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td><span>{{ device.asset_tag|placeholder }}</span></td>
</tr>
</table>
</div>

10
netbox/templates/dcim/devicetype.html
View File

@@ -74,13 +74,7 @@
</tr>
<tr>
<td>Part Number</td>
<td>
{% if devicetype.part_number %}
{{ devicetype.part_number }}
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ devicetype.part_number|placeholder }}</td>
</tr>
<tr>
<td>Height (U)</td>
@@ -104,7 +98,7 @@
{% elif devicetype.subdevice_role == False %}
<label class="label label-info">Child</label>
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>

48
netbox/templates/dcim/interface.html
View File

@@ -82,33 +82,15 @@
</tr>
<tr>
<td>Description</td>
<td>
{% if interface.description %}
<span>{{ interface.description }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ interface.description|placeholder }} </td>
</tr>
<tr>
<td>MTU</td>
<td>
{% if interface.mtu %}
<span>{{ interface.mtu }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ interface.mtu|placeholder }}</td>
</tr>
<tr>
<td>MAC Address</td>
<td>
{% if interface.mac_address %}
<span>{{ interface.mac_address }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ interface.mac_address|placeholder }}</span></td>
</tr>
<tr>
<td>802.1Q Mode</td>
@@ -165,33 +147,15 @@
</tr>
<tr>
<td>Description</td>
<td>
{% if connected_interface.description %}
<span>{{ connected_interface.description }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ connected_interface.description|placeholder }}</td>
</tr>
<tr>
<td>MTU</td>
<td>
{% if connected_interface.mtu %}
<span>{{ connected_interface.mtu }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ connected_interface.mtu|placeholder }}</td>
</tr>
<tr>
<td>MAC Address</td>
<td>
{% if connected_interface.mac_address %}
<span>{{ connected_interface.mac_address }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ connected_interface.mac_address|placeholder }}</td>
</tr>
<tr>
<td>802.1Q Mode</td>

26
netbox/templates/dcim/rack.html
View File

@@ -83,13 +83,7 @@
</tr>
<tr>
<td>Facility ID</td>
<td>
{% if rack.facility_id %}
<span>{{ rack.facility_id }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ rack.facility_id|placeholder }}</td>
</tr>
<tr>
<td>Tenant</td>
@@ -123,23 +117,11 @@
</tr>
<tr>
<td>Serial Number</td>
<td>
{% if rack.serial %}
<span>{{ rack.serial }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ rack.serial|placeholder }}</td>
</tr>
<tr>
<td>Asset Tag</td>
<td>
{% if rack.asset_tag %}
<span>{{ rack.asset_tag }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ rack.asset_tag|placeholder }}</td>
</tr>
<tr>
<td>Devices</td>
@@ -231,7 +213,7 @@
{% if device.parent_bay %}
<a href="{{ device.parent_bay.device.get_absolute_url }}">{{ device.parent_bay }}</a>
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>

50
netbox/templates/dcim/site.html
View File

@@ -106,23 +106,11 @@
</tr>
<tr>
<td>Facility</td>
<td>
{% if site.facility %}
{{ site.facility }}
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ site.facility|placeholder }}</td>
</tr>
<tr>
<td>AS Number</td>
<td>
{% if site.asn %}
{{ site.asn }}
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ site.asn|placeholder }}</td>
</tr>
<tr>
<td>Time Zone</td>
@@ -131,19 +119,13 @@
{{ site.time_zone }} (UTC {{ site.time_zone|tzoffset }})<br />
<small class="text-muted">Site time: {% timezone site.time_zone %}{% now "SHORT_DATETIME_FORMAT" %}{% endtimezone %}</small>
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>
<tr>
<td>Description</td>
<td>
{% if site.description %}
{{ site.description }}
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ site.description|placeholder }}</td>
</tr>
</table>
</div>
@@ -163,19 +145,13 @@
</div>
<span>{{ site.physical_address|linebreaksbr }}</span>
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>
<tr>
<td>Shipping Address</td>
<td>
{% if site.shipping_address %}
<span>{{ site.shipping_address|linebreaksbr }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ site.shipping_address|linebreaksbr|placeholder }}</td>
</tr>
<tr>
<td>GPS Coordinates</td>
@@ -188,19 +164,13 @@
</div>
<span>{{ site.latitude }}, {{ site.longitude }}</span>
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>
<tr>
<td>Contact Name</td>
<td>
{% if site.contact_name %}
<span>{{ site.contact_name }}</span>
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>{{ site.contact_name|placeholder }}</td>
</tr>
<tr>
<td>Contact Phone</td>
@@ -208,7 +178,7 @@
{% if site.contact_phone %}
<a href="tel:{{ site.contact_phone }}">{{ site.contact_phone }}</a>
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>
@@ -218,7 +188,7 @@
{% if site.contact_email %}
<a href="mailto:{{ site.contact_email }}">{{ site.contact_email }}</a>
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>

11
netbox/templates/dcim/virtualchassis_edit.html
View File

@@ -1,4 +1,5 @@
{% extends '_base.html' %}
{% load helpers %}
{% load form_helpers %}
{% block content %}
@@ -52,16 +53,10 @@
{% if device.rack %}
{{ device.rack }} / {{ device.position }}
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
<td>
{% if device.serial %}
{{ device.serial }}
{% else %}
<span class="text-muted">N/A</span>
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
<td>{{ device.serial|placeholder }}</td>
<td>
{{ form.vc_position }}
{% if form.vc_position.errors %}