NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-02-05 23:06:25 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

#3979: UI cleanup

Browse Source
This commit is contained in:
jeremystretch
2021-10-15 12:24:07 -04:00
parent 075f4907ef
commit 717fd760df
7 changed files with 124 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox/templates/dcim/interface.html
+97 -31
View File
@@ -217,8 +217,29 @@
<th scope="row">Wireless Link</th>
<td>
<a href="{{ object.wireless_link.get_absolute_url }}">{{ object.wireless_link }}</a>
<a href="{% url 'dcim:interface_trace' pk=object.pk %}" class="btn btn-primary btn-sm lh-1" title="Trace">
<i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
</a>
</td>
</tr>
{% with peer_interface=object.connected_endpoint %}
<tr>
<th scope="row">Device</th>
<td>
<a href="{{ peer_interface.device.get_absolute_url }}">{{ peer_interface.device }}</a>
</td>
</tr>
<tr>
<th scope="row">Name</th>
<td>
<a href="{{ peer_interface.get_absolute_url }}">{{ peer_interface }}</a>
</td>
</tr>
<tr>
<th scope="row">Type</th>
<td>{{ peer_interface.get_type_display }}</td>
</tr>
{% endwith %}
</table>
{% else %}
<div class="text-muted">
@@ -267,36 +288,73 @@
<div class="card">
<h5 class="card-header">Wireless</h5>
<div class="card-body">
<table class="table table-hover">
<tr>
<th scope="row">Role</th>
<td>{{ object.get_rf_role_display|placeholder }}</td>
</tr>
<tr>
<th scope="row">Channel</th>
<td>{{ object.get_rf_channel_display|placeholder }}</td>
</tr>
<tr>
<th scope="row">Channel Frequency</th>
<td>
{% if object.rf_channel_frequency %}
{{ object.rf_channel_frequency|simplify_decimal }} MHz
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>
<tr>
<th scope="row">Channel Width</th>
<td>
{% if object.rf_channel_width %}
{{ object.rf_channel_width|simplify_decimal }} MHz
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
</tr>
</table>
{% with peer=object.connected_endpoint %}
<table class="table table-hover">
<thead>
<tr>
<th></th>
<th>Local</th>
{% if peer %}
<th>Peer</th>
{% endif %}
</tr>
</thead>
<tr>
<th scope="row">Role</th>
<td>{{ object.get_rf_role_display|placeholder }}</td>
{% if peer %}
<td>{{ peer.get_rf_role_display|placeholder }}</td>
{% endif %}
</tr>
<tr>
<th scope="row">Channel</th>
<td>{{ object.get_rf_channel_display|placeholder }}</td>
{% if peer %}
<td{% if peer.rf_channel != object.rf_channel %} class="text-danger"{% endif %}>
{{ peer.get_rf_channel_display|placeholder }}
</td>
{% endif %}
</tr>
<tr>
<th scope="row">Channel Frequency</th>
<td>
{% if object.rf_channel_frequency %}
{{ object.rf_channel_frequency|simplify_decimal }} MHz
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
{% if peer %}
<td{% if peer.rf_channel_frequency != object.rf_channel_frequency %} class="text-danger"{% endif %}>
{% if peer.rf_channel_frequency %}
{{ peer.rf_channel_frequency|simplify_decimal }} MHz
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
{% endif %}
</tr>
<tr>
<th scope="row">Channel Width</th>
<td>
{% if object.rf_channel_width %}
{{ object.rf_channel_width|simplify_decimal }} MHz
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
{% if peer %}
<td{% if peer.rf_channel_width != object.rf_channel_width %} class="text-danger"{% endif %}>
{% if peer.rf_channel_width %}
{{ peer.rf_channel_width|simplify_decimal }} MHz
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}
</td>
{% endif %}
</tr>
</table>
{% endwith %}
</div>
</div>
<div class="card">
@@ -305,12 +363,20 @@
<table class="table table-hover table-headings">
<thead>
<tr>
<th>Group</th>
<th>SSID</th>
</tr>
</thead>
<tbody>
{% for wlan in object.wlans.all %}
{% for wlan in object.wireless_lans.all %}
<tr>
<td>
{% if wlan.group %}
<a href="{{ wlan.group.get_absolute_url }}">{{ wlan.group }}</a>
{% else %}
&mdash;
{% endif %}
</td>
<td>
<a href="{{ wlan.get_absolute_url }}">{{ wlan.ssid }}</a>
</td>