spacecruft
/
satnogs-network
1
0
Fork 0
Code Releases Activity

Fix timeframe annotations for future scheduled observations 

Fixes #472.
environments/stage/deployments/135
Fabian P. Schmidt 2018-07-16 21:35:17 +02:00
parent 14b68f6b89
commit c1f56da5af
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
network/settings.py
View File

@ -16,6 +16,7 @@ DJANGO_APPS = (
'django.contrib.messages', 'django.contrib.messages',
'django.contrib.staticfiles', 'django.contrib.staticfiles',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.humanize',
) )
THIRD_PARTY_APPS = ( THIRD_PARTY_APPS = (
'avatar', 'avatar',

5
network/templates/base/observations.html
View File

@ -1,6 +1,7 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load tags %} {% load tags %}
{% load staticfiles %} {% load staticfiles %}
{% load humanize %}
{% block title %} - Observations{% endblock %} {% block title %} - Observations{% endblock %}
@ -180,11 +181,11 @@
</span> </span>
</td> </td>
<td> <td>
<span data-toggle="tooltip" data-placement="bottom" title="{{ observation.start|timesince }} ago"> <span data-toggle="tooltip" data-placement="bottom" title="{{ observation.start|naturaltime }}">
<span class="datetime-date">{{ observation.start|date:"Y-m-d" }}</span> <span class="datetime-date">{{ observation.start|date:"Y-m-d" }}</span>
<span class="datetime-time">{{ observation.start|date:"H:i:s" }}</span><br> <span class="datetime-time">{{ observation.start|date:"H:i:s" }}</span><br>
</span> </span>
<span data-toggle="tooltip" data-placement="bottom" title="{{ observation.end|timesince }} ago"> <span data-toggle="tooltip" data-placement="bottom" title="{{ observation.end|naturaltime }}">
<span class="datetime-date">{{ observation.end|date:"Y-m-d" }}</span> <span class="datetime-date">{{ observation.end|date:"Y-m-d" }}</span>
<span class="datetime-time">{{ observation.end|date:"H:i:s" }}</span> <span class="datetime-time">{{ observation.end|date:"H:i:s" }}</span>
</span> </span>