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

Merged develop

Browse Source
This commit is contained in:
Jeremy Stretch
2016-08-22 15:49:41 -04:00
parent f0a85b1dd3 14a908bf66
commit faed3c1314
23 changed files with 53 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/templates/circuits/circuit.html
View File

@@ -95,26 +95,16 @@
<tr>
<td>Commit Rate</td>
<td>
{% if circuit.commit_speed %}
{{ circuit.commit_speed_human }}
{% if circuit.commit_rate %}
{{ circuit.commit_rate_human }}
{% else %}
<span class="text-muted">N/A</span>
{% endif %}
</td>
</tr>
<tr>
<td>Created</td>
<td>{{ circuit.created }}</td>
</tr>
<tr>
<td>Last Updated</td>
<td>{{ circuit.last_updated }}</td>
</tr>
</table>
</div>
{% with circuit.custom_fields as custom_fields %}
{% include 'inc/custom_fields_panel.html' %}
{% endwith %}
{% include 'inc/created_updated.html' with obj=circuit %}
</div>
<div class="col-md-6">
<div class="panel panel-default">

9
netbox/templates/circuits/provider.html
View File

@@ -103,14 +103,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Created</td>
<td>{{ provider.created }}</td>
</tr>
<tr>
<td>Last Updated</td>
<td>{{ provider.last_updated }}</td>
</tr>
</table>
</div>
{% with provider.custom_fields as custom_fields %}
@@ -128,6 +120,7 @@
{% endif %}
</div>
</div>
{% include 'inc/created_updated.html' with obj=provider %}
</div>
<div class="col-md-6">
<div class="panel panel-default">