NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-21 04:42:22 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Standardized date/time displays; moved format declarations to configuration.py

Browse Source
This commit is contained in:
Jeremy Stretch
2016-06-22 13:22:59 -04:00
parent 5f0d52e59a
commit 8563e2aca3
8 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/netbox/configuration.example.py
View File

@@ -64,3 +64,12 @@ PAGINATE_COUNT = 50
# Time zone (default: UTC)
TIME_ZONE = 'UTC'
# Date/time formatting. See the following link for supported formats:
# https://docs.djangoproject.com/en/dev/ref/templates/builtins/#date
DATE_FORMAT = 'N j, Y'
SHORT_DATE_FORMAT = 'Y-m-d'
TIME_FORMAT = 'g:i a'
SHORT_TIME_FORMAT = 'H:i:s'
DATETIME_FORMAT = 'N j, Y g:i a'
SHORT_DATETIME_FORMAT = 'Y-m-d H:i'

15
netbox/netbox/settings.py
View File

@@ -29,9 +29,14 @@ PAGINATE_COUNT = getattr(configuration, 'PAGINATE_COUNT', 50)
NETBOX_USERNAME = getattr(configuration, 'NETBOX_USERNAME', '')
NETBOX_PASSWORD = getattr(configuration, 'NETBOX_PASSWORD', '')
TIME_ZONE = getattr(configuration, 'TIME_ZONE', 'UTC')
DATE_FORMAT = getattr(configuration, 'DATE_FORMAT', 'N j, Y')
SHORT_DATE_FORMAT = getattr(configuration, 'SHORT_DATE_FORMAT', 'Y-m-d')
TIME_FORMAT = getattr(configuration, 'TIME_FORMAT', 'g:i a')
SHORT_TIME_FORMAT = getattr(configuration, 'SHORT_TIME_FORMAT', 'H:i:s')
DATETIME_FORMAT = getattr(configuration, 'DATETIME_FORMAT', 'N j, Y g:i a')
SHORT_DATETIME_FORMAT = getattr(configuration, 'SHORT_DATETIME_FORMAT', 'Y-m-d H:i')
CSRF_TRUSTED_ORIGINS = ALLOWED_HOSTS
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
# Database
@@ -133,14 +138,6 @@ LOGIN_URL = '/login/'
LOGIN_REDIRECT_URL = '/'
LOGOUT_URL = '/logout/'
# Default time formats
DATE_FORMAT = 'N j, Y'
SHORT_DATE_FORMAT = 'Y-m-d'
TIME_FORMAT = 'g:i:s a'
SHORT_TIME_FORMAT = 'H:i:s'
DATETIME_FORMAT = 'N j, Y \a\t g:i a'
SHORT_DATETIME_FORMAT = 'Y-m-d H:i'
# Secrets
SECRETS_MIN_PUBKEY_SIZE = 2048

2
netbox/templates/home.html
View File

@@ -149,7 +149,7 @@
{% for a in recent_activity %}
<div class="list-group-item">
{{ a.icon }} {{ a.message|safe }}<br />
<small class="text-muted">{{ a.user }} - {{ a.time|date:"Y-m-d H:i" }}</small>
<small class="text-muted">{{ a.user }} - {{ a.time|date:'SHORT_DATETIME_FORMAT' }}</small>
</div>
{% endfor %}
</div>

2
netbox/templates/ipam/aggregate.html
View File

@@ -49,7 +49,7 @@
<td>Date Added</td>
<td>
{% if aggregate.date_added %}
<span>{{ aggregate.date_added|date }}</span>
<span>{{ aggregate.date_added }}</span>
{% else %}
<span class="text-muted">Not defined</span>
{% endif %}

6
netbox/templates/secrets/secret.html
View File

@@ -57,11 +57,11 @@
</tr>
<tr>
<td>Created</td>
<td>{{ secret.created|date }}</td>
<td>{{ secret.created }}</td>
</tr>
<tr>
<td>Last Modified</td>
<td>{{ secret.last_modified|date:'DATETIME_FORMAT' }}</td>
<td>Last Updated</td>
<td>{{ secret.last_updated }}</td>
</tr>
</table>
</div>

2
netbox/templates/users/profile.html
View File

@@ -21,7 +21,7 @@
<small class="text-muted">Email</small>
<h5>{{ request.user.email }}</h5>
<small class="text-muted">Registered</small>
<h5>{{ request.user.date_joined|date }}</h5>
<h5>{{ request.user.date_joined }}</h5>
<small class="text-muted">Groups</small>
<h5>{{ request.user.groups.all|join:', ' }}</h5>
<small class="text-muted">Admin access</small>

2
netbox/templates/users/recent_activity.html
View File

@@ -24,7 +24,7 @@
<tbody>
{% for action in recent_activity %}
<tr>
<td>{{ action.time|date:"Y-m-d H:i" }}</td>
<td>{{ action.time|date:'SHORT_DATETIME_FORMAT' }}</td>
<td>{{ action.icon }} {{ action.message|safe }}</td>
</tr>
{% endfor %}