Skip to content
Snippets Groups Projects
Commit ff338d04 authored by David Schmitz's avatar David Schmitz
Browse files

route_detail view: add info about current TZ

parent ff53c7b1
No related branches found
No related tags found
No related merge requests found
...@@ -823,7 +823,12 @@ def routedetails(request, route_slug): ...@@ -823,7 +823,12 @@ def routedetails(request, route_slug):
route = get_object_or_404(Route, name=route_slug) route = get_object_or_404(Route, name=route_slug)
#return render(request, 'flowspy/route_details.html', {'route': route}) #return render(request, 'flowspy/route_details.html', {'route': route})
now = datetime.datetime.now() now = datetime.datetime.now()
return render(request, 'flowspy/route_details.html', {'route': route, 'mytime': now, 'route_comments_len' : len(str(route.comments)) }) return render(request, 'flowspy/route_details.html', {
'route': route,
'mytime': now,
'tz' : settings.TIME_ZONE,
'route_comments_len' : len(str(route.comments))
})
@login_required @login_required
def routestats(request, route_slug): def routestats(request, route_slug):
......
...@@ -398,6 +398,10 @@ msgstr "Τελευταία 10" ...@@ -398,6 +398,10 @@ msgstr "Τελευταία 10"
msgid "Last update" msgid "Last update"
msgstr "Ενημερώθηκε" msgstr "Ενημερώθηκε"
#: templates/dashboard.html:66
msgid "Last rule edit"
msgstr "Ενημερώθηκε"
#: templates/dashboard.html:66 #: templates/dashboard.html:66
msgid "by" msgid "by"
msgstr "από" msgstr "από"
......
...@@ -22,7 +22,7 @@ function myreloadPage() { ...@@ -22,7 +22,7 @@ function myreloadPage() {
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div> <div>
<i class="fa fa-pencil-square-o"></i> {% trans "Last update" %}: {{route.last_updated}} {% trans "by" %} {{route.applier}} <i class="fa fa-pencil-square-o"></i> {% trans "Last rule edit" %}: {{route.last_updated}} {% trans "by" %} {{route.applier}}
</div> </div>
<div> <div>
<h2>{% trans 'About' %}</h2> <h2>{% trans 'About' %}</h2>
...@@ -81,7 +81,7 @@ function myreloadPage() { ...@@ -81,7 +81,7 @@ function myreloadPage() {
</div> </div>
<div> <div>
<h2>Statistics</h2> <h2>Statistics</h2>
<div>(current System time: {{ mytime|date:'Y-m-d H:i' }}, active rules will be updated every 5 minutes)</div> <div>(all times are in {{ tz }}; current System time: {{ mytime|date:'Y-m-d H:i' }}, active rules will be updated every 5 minutes)</div>
<div><span id="traffic-plot-loading">(Loading data...)</span> <div><span id="traffic-plot-loading">(Loading data...)</span>
<h3>Number of packets (absolute)</h3> <h3>Number of packets (absolute)</h3>
<div><canvas id="traffic-plot-pkts-abs" width=200 height=200></canvas></div> <div><canvas id="traffic-plot-pkts-abs" width=200 height=200></canvas></div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment