Merge branch 'obrazy' into rwd

[wolnelektury.git] / apps / wolnelektury_core / views.py

diff --git a/apps/wolnelektury_core/views.py b/apps/wolnelektury_core/views.py
index f62a142..77cd016 100644 (file)
--- a/apps/wolnelektury_core/views.py
+++ b/apps/wolnelektury_core/views.py
@@ -19,7 +19,6 @@ from ajaxable.utils import placeholdized
 from social.templatetags.social_tags import choose_cite
 
 
-@never_cache
 def main_page(request):
     last_published = Book.objects.filter(parent=None).order_by('-created_at')[:4]
     cite = choose_cite(RequestContext(request))
@@ -90,11 +89,12 @@ def logout_then_redirect(request):
     return HttpResponseRedirect(urlquote_plus(request.GET.get('next', '/'), safe='/?='))
 
 
+@never_cache
 def clock(request):
-    """ Provides server time for jquery.countdown,
+    """ Provides server UTC time for jquery.countdown,
     in a format suitable for Date.parse()
     """
-    return HttpResponse(datetime.now().strftime('%Y/%m/%d %H:%M:%S'))
+    return HttpResponse(datetime.utcnow().strftime('%Y/%m/%d %H:%M:%S UTC'))
 
 
 def publish_plan(request):