starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-23 01:08:45 +02:00
Code Issues 273 Packages Projects Releases 10 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/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">