fnp
/
django-cas-provider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of https://github.com/ryanbagwell/django-cas-provider into...
[django-cas-provider.git]
/
cas_provider
/
forms.py
diff --git
a/cas_provider/forms.py
b/cas_provider/forms.py
index
d9974a2
..
e4df105
100644
(file)
--- a/
cas_provider/forms.py
+++ b/
cas_provider/forms.py
@@
-1,13
+1,15
@@
+from __future__ import unicode_literals
+
from django import forms
from django import forms
+from django.utils.translation import ugettext_lazy as _
class LoginForm(forms.Form):
class LoginForm(forms.Form):
- email = forms.CharField(widget=forms.TextInput(attrs={'autofocus': 'autofocus',
- 'max_length': '255'}))
- password = forms.CharField(widget=forms.PasswordInput)
+ username = forms.CharField(widget=forms.TextInput(attrs={'autofocus': 'autofocus',
+ 'max_length': '255'}),
+ label=_('Username'))
+ password = forms.CharField(widget=forms.PasswordInput(), label=_('Password'))
service = forms.CharField(widget=forms.HiddenInput, required=False)
service = forms.CharField(widget=forms.HiddenInput, required=False)
- remember_me = forms.BooleanField(required=False, label="Keep me signed in",
- widget=forms.CheckboxInput(attrs={'class': 'remember_me'}))
def __init__(self, *args, **kwargs):
# renew = kwargs.pop('renew', None)
def __init__(self, *args, **kwargs):
# renew = kwargs.pop('renew', None)
@@
-16,11
+18,7
@@
class LoginForm(forms.Form):
super(LoginForm, self).__init__(*args, **kwargs)
self.request = request
super(LoginForm, self).__init__(*args, **kwargs)
self.request = request
- def clean_remember_me(self):
- remember = self.cleaned_data['remember_me']
- if not remember and self.request is not None:
- self.request.session.set_expiry(0)
-
class MergeLoginForm(LoginForm):
class MergeLoginForm(LoginForm):
- email = forms.CharField(max_length=255, widget=forms.HiddenInput)
+ username = forms.CharField(max_length=255, widget=forms.HiddenInput,
+ label=_('Username'))