diff --git a/rowers/templates/racelist.html b/rowers/templates/racelist.html
index 02e999a0..75e584c1 100644
--- a/rowers/templates/racelist.html
+++ b/rowers/templates/racelist.html
@@ -16,12 +16,12 @@
{% for race in races %}
- | {{ race.startdate }} |
+ {{ race.startdate|date:"Y-m-d" }} |
{% if race.registration_closure %}
- {{ race.registration_closure }}
+ {{ race.registration_closure|date:"Y-m-d H:i e" }}
{% else %}
- {{ race.startdate }} {{ race.start_time }}
+ {{ race.startdate|date:"Y-m-d" }} {{ race.start_time }}
{% endif %}
|
{{ race.name }} |
@@ -42,7 +42,7 @@
{% elif race|can_submit:rower %}
{% elif race|future_registered:rower %}
-
+
{% elif race|past_not_registered:rower %}
{% else %}
diff --git a/rowers/templates/virtualevent.html b/rowers/templates/virtualevent.html
index 5b9edac9..d97b12a7 100644
--- a/rowers/templates/virtualevent.html
+++ b/rowers/templates/virtualevent.html
@@ -2,6 +2,7 @@
{% load staticfiles %}
{% load rowerfilters %}
{% load leaflet_tags %}
+{% load tz %}
{% block meta %}
{% leaflet_js %}
@@ -83,6 +84,7 @@
{% endif %}
+ {% localtime off %}
Race Information
@@ -99,7 +101,7 @@
Indoor Race | To be rowed on a Concept2 ergometer |
- | Time Zone | {{ race.timezone }} |
+ Event Time Zone | {{ race.timezone }} |
{% endif %}
@@ -108,18 +110,28 @@
| {{ race.sessionvalue }} {{ race.sessionunit }}
|
+
+ | Date | {{ race.startdate|date:"Y-m-d" }} |
+
+
+ | Race Window | {{ race.startdate|date:"Y-m-d" }} {{ race.start_time|time:"H:i e" }} to {{ race.enddate|date:"Y-m-d" }} {{ race.end_time|time:"H:i e" }} ({{ race.timezone }}) |
+
| Registration closure |
- {{ race.registration_closure }} |
+
+ {% with tz=race.timezone %}
+ {{ race.registration_closure|timezone:tz |date:"Y-m-d H:i e" }}
+ {% endwith %}
+ |
- | Date | {{ race.startdate }} |
-
-
- | Race Window | {{ race.startdate }} {{ race.start_time }} to {{ race.enddate }} {{ race.end_time }} |
-
-
- | Results Submission Deadline | {{ race.evaluation_closure }} |
+
+ Results Submission Deadline
+ |
+
+ {% with tz=race.timezone %}
+ {{ race.evaluation_closure|timezone:tz |date:"Y-m-d H:i e" }}
+ {% endwith %} |
| Organizer | {{ race.manager.first_name }} {{ race.manager.last_name }} |
@@ -137,6 +149,7 @@
+ {% endlocaltime %}
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index a60603cc..7783f2ac 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -211,7 +211,7 @@ def course_edit_view(request,id=0):
}
)
-@login_required()
+#@login_required()
def course_view(request,id=0):
try:
course = GeoCourse.objects.get(id=id)