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

[wolnelektury.git] / wolnelektury / views.py

diff --git a/wolnelektury/views.py b/wolnelektury/views.py
index 3fa4337..555b732 100755 (executable)
--- a/wolnelektury/views.py
+++ b/wolnelektury/views.py
@@ -11,8 +11,10 @@ from django.utils.http import urlquote_plus
 from django.utils.translation import ugettext_lazy as _
 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
 
 
 def main_page(request):
@@ -24,9 +26,10 @@ 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
 
     def __call__(self, request):
         if request.user.is_authenticated():
@@ -39,9 +42,11 @@ class LoginFormView(AjaxableFormView):
 
 class RegisterFormView(AjaxableFormView):
     form_class = UserCreationForm
-    #template = "auth/register.html"
+    placeholdize = True
     title = _('Register')
     submit = _('Register')
+    ajax_redirect = True
+    form_prefix = 'register'
 
     def __call__(self, request):
         if request.user.is_authenticated():
@@ -49,7 +54,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']
@@ -57,6 +62,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):
+        return {
+            "register_form": placeholdized(UserCreationForm(prefix='register')),
+            "register_submit": _('Register'),
+        }
+
+
 @never_cache
 def logout_then_redirect(request):
     auth.logout(request)
@@ -77,7 +93,7 @@ def publish_plan(request):
     if plan is None:
         plan = []
         try:
-            feed = feedparser.parse('http://localhost:8000/documents/track/editor-proofreading/')
+            feed = feedparser.parse(settings.PUBLISH_PLAN_FEED)
         except:
             pass
         else: