NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-16 08:42:17 -06:00
Code Issues Actions 14 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

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

@@ -79,14 +79,6 @@
{% endif %}
</td>
</tr>
<tr>
<td>Created</td>
<td>{{ device.created }}</td>
</tr>
<tr>
<td>Last Updated</td>
<td>{{ device.last_updated }}</td>
</tr>
</table>
</div>
<div class="panel panel-default">
@@ -309,6 +301,7 @@
<div class="panel-body text-muted">None found</div>
{% endif %}
</div>
{% include 'inc/created_updated.html' with obj=device %}
</div>
<div class="col-md-6">
{% if device_bays or device.device_type.is_parent_device %}

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

@@ -130,14 +130,6 @@
<a href="{% url 'dcim:device_list' %}?rack_id={{ rack.id }}">{{ rack.devices.count }}</a>
</td>
</tr>
<tr>
<td>Created</td>
<td>{{ rack.created }}</td>
</tr>
<tr>
<td>Last Updated</td>
<td>{{ rack.last_updated }}</td>
</tr>
</table>
</div>
{% with rack.custom_fields as custom_fields %}
@@ -190,6 +182,7 @@
{% endif %}
</div>
</div>
{% include 'inc/created_updated.html' with obj=rack %}
</div>
<div class="row col-md-6">
<div class="col-md-6 col-sm-6 col-xs-12">

7
netbox/templates/dcim/rack_import.html
View File

@@ -53,6 +53,11 @@
<td>Name of tenant (optional)</td>
<td>Pied Piper</td>
</tr>
<tr>
<td>Role</td>
<td>Functional role (optional)</td>
<td>Compute</td>
</tr>
<tr>
<td>Type</td>
<td>Rack type (optional)</td>
@@ -71,7 +76,7 @@
</tbody>
</table>
<h4>Example</h4>
<pre>DC-4,Cage 1400,R101,J12.100,Pied Piper,4-post cabinet,19,42</pre>
<pre>DC-4,Cage 1400,R101,J12.100,Pied Piper,Compute,4-post cabinet,19,42</pre>
</div>
</div>
{% endblock %}

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

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