django1.5 compatibility fixes

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

diff --git a/cas_provider/forms.py b/cas_provider/forms.py
index d9974a2..5ddb057 100644 (file)
--- a/cas_provider/forms.py
+++ b/cas_provider/forms.py
@@ -1,10 +1,17 @@
 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 models import LoginTicket
+import datetime

 
 
 class LoginForm(forms.Form):
     email = forms.CharField(widget=forms.TextInput(attrs={'autofocus': 'autofocus',
 
 
 class LoginForm(forms.Form):
     email = forms.CharField(widget=forms.TextInput(attrs={'autofocus': 'autofocus',

+                                                          'placeholder': 'Email',

                                                           'max_length': '255'}))
                                                           'max_length': '255'}))

-    password = forms.CharField(widget=forms.PasswordInput)
+    password = forms.CharField(widget=forms.PasswordInput(attrs={'placeholder': 'Password'}))

     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'}))
     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'}))


@@ -20,7 +27,7 @@ class LoginForm(forms.Form):
         remember = self.cleaned_data['remember_me']
         if not remember and self.request is not None:
             self.request.session.set_expiry(0)
         remember = self.cleaned_data['remember_me']
         if not remember and self.request is not None:
             self.request.session.set_expiry(0)

-            
+

 
 class MergeLoginForm(LoginForm):
     email = forms.CharField(max_length=255, widget=forms.HiddenInput)
 
 class MergeLoginForm(LoginForm):
     email = forms.CharField(max_length=255, widget=forms.HiddenInput)