fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
scripts to make localization pack.
[wolnelektury.git]
/
wolnelektury
/
views.py
diff --git
a/wolnelektury/views.py
b/wolnelektury/views.py
index
8732079
..
361ec37
100755
(executable)
--- a/
wolnelektury/views.py
+++ b/
wolnelektury/views.py
@@
-14,8
+14,10
@@
from django.views.decorators.cache import never_cache
from django.conf import settings
from ajaxable.utils import AjaxableFormView
from catalogue.models import Book
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]
def main_page(request):
last_published = Book.objects.exclude(html_file='').order_by('-created_at')[:4]
@@
-25,6
+27,7
@@
def main_page(request):
class LoginFormView(AjaxableFormView):
form_class = AuthenticationForm
class LoginFormView(AjaxableFormView):
form_class = AuthenticationForm
+ placeholdize = True
title = _('Sign in')
submit = _('Sign in')
ajax_redirect = True
title = _('Sign in')
submit = _('Sign in')
ajax_redirect = True
@@
-40,6
+43,7
@@
class LoginFormView(AjaxableFormView):
class RegisterFormView(AjaxableFormView):
form_class = UserCreationForm
class RegisterFormView(AjaxableFormView):
form_class = UserCreationForm
+ placeholdize = True
title = _('Register')
submit = _('Register')
ajax_redirect = True
title = _('Register')
submit = _('Register')
ajax_redirect = True
@@
-51,7
+55,7
@@
class RegisterFormView(AjaxableFormView):
return super(RegisterFormView, self).__call__(request)
def success(self, form, request):
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']
user = auth.authenticate(
username=form.cleaned_data['username'],
password=form.cleaned_data['password1']
@@
-61,10
+65,11
@@
class RegisterFormView(AjaxableFormView):
class LoginRegisterFormView(LoginFormView):
template = 'auth/login_register.html'
class LoginRegisterFormView(LoginFormView):
template = 'auth/login_register.html'
+ title = _('You have to be logged in to continue')
- def extra_context(self):
+ def extra_context(self
, request, obj
):
return {
return {
- "register_form":
UserCreationForm(prefix='register'
),
+ "register_form":
placeholdized(UserCreationForm(prefix='register')
),
"register_submit": _('Register'),
}
"register_submit": _('Register'),
}
@@
-94,7
+99,6
@@
def publish_plan(request):
pass
else:
for i in range(len(feed['entries'])):
pass
else:
for i in range(len(feed['entries'])):
- print i
plan.append({
'title': feed['entries'][i].title,
'link': feed['entries'][i].link,
plan.append({
'title': feed['entries'][i].title,
'link': feed['entries'][i].link,