Merge remote-tracking branch 'gstrat/elep' into elep

[django-cas-provider.git] / cas_provider / forms.py

diff --git a/cas_provider/forms.py b/cas_provider/forms.py
index 5ddb057..7f3d5b6 100644 (file)
--- a/cas_provider/forms.py
+++ b/cas_provider/forms.py
@@ -1,20 +1,13 @@
 from django import forms
 from django import forms

-from django.conf import settings
-from django.contrib.auth import authenticate
-from django.forms import ValidationError

 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext_lazy as _

-from models import LoginTicket
-import datetime

 
 
 class LoginForm(forms.Form):
 
 
 class LoginForm(forms.Form):

-    email = forms.CharField(widget=forms.TextInput(attrs={'autofocus': 'autofocus',
-                                                          'placeholder': 'Email',
-                                                          'max_length': '255'}))
-    password = forms.CharField(widget=forms.PasswordInput(attrs={'placeholder': 'Password'}))
+    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)


@@ -23,11 +16,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'))