Merge branch 'master' into rwd

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

diff --git a/apps/wolnelektury_core/views.py b/apps/wolnelektury_core/views.py
index 37df778..77cd016 100644 (file)
--- a/apps/wolnelektury_core/views.py
+++ b/apps/wolnelektury_core/views.py
@@ -16,11 +16,12 @@ from django.conf import settings
 from ajaxable.utils import AjaxableFormView
 from catalogue.models import Book
 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))
 
     return render_to_response("main_page.html", locals(),
         context_instance=RequestContext(request))
@@ -53,6 +54,7 @@ class RegisterFormView(AjaxableFormView):
     submit = _('Register')
     ajax_redirect = True
     form_prefix = 'register'
+    honeypot = True
 
     def __call__(self, request):
         if request.user.is_authenticated():
@@ -87,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):