Merge branch 'pretty' of https://github.com/fnp/wolnelektury into pretty

[wolnelektury.git] / wolnelektury / views.py

diff --git a/wolnelektury/views.py b/wolnelektury/views.py
index c594732..bcead03 100755 (executable)
--- a/wolnelektury/views.py
+++ b/wolnelektury/views.py
@@ -14,10 +14,12 @@ from django.views.decorators.cache import never_cache
 from django.conf import settings
 from ajaxable.utils import AjaxableFormView
 from catalogue.models import Book
+from ajaxable.utils import placeholdized
 
 
+@never_cache
 def main_page(request):
-    last_published = Book.objects.exclude(html_file='').order_by('-created_at')[:4]
+    last_published = Book.objects.filter(parent=None).order_by('-created_at')[:4]
 
     return render_to_response("main_page.html", locals(),
         context_instance=RequestContext(request))
@@ -25,6 +27,8 @@ def main_page(request):
 
 class LoginFormView(AjaxableFormView):
     form_class = AuthenticationForm
+    template = "auth/login.html"
+    placeholdize = True
     title = _('Sign in')
     submit = _('Sign in')
     ajax_redirect = True
@@ -40,9 +44,11 @@ class LoginFormView(AjaxableFormView):
 
 class RegisterFormView(AjaxableFormView):
     form_class = UserCreationForm
+    placeholdize = True
     title = _('Register')
     submit = _('Register')
     ajax_redirect = True
+    form_prefix = 'register'
 
     def __call__(self, request):
         if request.user.is_authenticated():
@@ -50,7 +56,7 @@ class RegisterFormView(AjaxableFormView):
         return super(RegisterFormView, self).__call__(request)
 
     def success(self, form, request):
-        user = form.save()
+        form.save()
         user = auth.authenticate(
             username=form.cleaned_data['username'],
             password=form.cleaned_data['password1']
@@ -58,6 +64,17 @@ class RegisterFormView(AjaxableFormView):
         auth.login(request, user)
 
 
+class LoginRegisterFormView(LoginFormView):
+    template = 'auth/login_register.html'
+    title = _('You have to be logged in to continue')
+
+    def extra_context(self, request, obj):
+        return {
+            "register_form": placeholdized(UserCreationForm(prefix='register')),
+            "register_submit": _('Register'),
+        }
+
+
 @never_cache
 def logout_then_redirect(request):
     auth.logout(request)
@@ -83,7 +100,6 @@ def publish_plan(request):
             pass
         else:
             for i in range(len(feed['entries'])):
-                print i
                 plan.append({
                     'title': feed['entries'][i].title,
                     'link': feed['entries'][i].link,