starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-27 11:17:27 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge v2.11.8 changes

Browse Source
This commit is contained in:
jeremystretch
2021-07-06 12:10:29 -04:00
parent 57fc6efd4c c585175214
commit 88e382e7a1
40 changed files with 264 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@
<td>
{% if object.time_zone %}
{{ object.time_zone }} (UTC {{ object.time_zone|tzoffset }})<br />
<small class="text-muted">Site time: {% timezone object.time_zone %}{% now "SHORT_DATETIME_FORMAT" %}{% endtimezone %}</small>
<small class="text-muted">Site time: {% timezone object.time_zone %}{% annotated_now %}{% endtimezone %}</small>
{% else %}
<span class="text-muted">&mdash;</span>
{% endif %}