include onelab_marko in all views
[myslice.git] / portal / forms.py
index 7abc0e4..9bcf8fa 100644 (file)
@@ -27,111 +27,64 @@ from portal.models import PendingUser, PendingSlice
 #from crispy_forms.layout import Submit
 from django.utils.translation import ugettext_lazy as _
 
-# DEPRECATED # class UserRegisterForm(forms.Form): # Not ModelForm
-# DEPRECATED #     """
-# DEPRECATED #     Form for registering a new user account.
-# DEPRECATED #     
-# DEPRECATED #     Validates that the requested username is not already in use, and
-# DEPRECATED #     requires the password to be entered twice to catch typos.
-# DEPRECATED #     
-# DEPRECATED #     Subclasses should feel free to add any additional validation they
-# DEPRECATED #     need, but should avoid defining a ``save()`` method -- the actual
-# DEPRECATED #     saving of collected user data is delegated to the active
-# DEPRECATED #     registration backend.
-# DEPRECATED # 
-# DEPRECATED #     """
-# DEPRECATED #     required_css_class = 'required'
-# DEPRECATED #     
-# DEPRECATED #     first_name = forms.RegexField(regex=r'^[\w+\s.@+-]+$',
-# DEPRECATED #                                  max_length=30,
-# DEPRECATED #                                  label=_("First name"),
-# DEPRECATED #                                  error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
-# DEPRECATED #     last_name = forms.RegexField(regex=r'^[\w+\s.@+-]+$',
-# DEPRECATED #                                  max_length=30,
-# DEPRECATED #                                  label=_("Last name"),
-# DEPRECATED #                                  error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
-# DEPRECATED #     affiliation = forms.RegexField(regex=r'^[\w+\s.@+-]+$',
-# DEPRECATED #                              max_length=30,
-# DEPRECATED #                              label=_("Affiliation"),
-# DEPRECATED #                              error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
-# DEPRECATED # 
-# DEPRECATED #     email = forms.EmailField(label=_("E-mail"))
-# DEPRECATED #     password1 = forms.CharField(widget=forms.PasswordInput,
-# DEPRECATED #                                 label=_("Password"))
-# DEPRECATED #     password2 = forms.CharField(widget=forms.PasswordInput,
-# DEPRECATED #                                 label=_("Password (again)"))
-# DEPRECATED #     keypair    = forms.CharField( widget=forms.FileInput )
-# DEPRECATED #    
-# DEPRECATED #     #my_keypairs = forms.ChoiceField(widget = forms.Select(), 
-# DEPRECATED #     #             choices = ([('1','generate'), ('2','upload')])) 
-# DEPRECATED #     tos = forms.BooleanField(widget=forms.CheckboxInput,
-# DEPRECATED #                              label=_(u'I have read and agree to the Terms of Service'),
-# DEPRECATED #                              error_messages={'required': _("You must agree to the terms to register")})
-# DEPRECATED # 
-# DEPRECATED # #    def clean_username(self):
-# DEPRECATED # #        """
-# DEPRECATED # #        Validate that the username is alphanumeric and is not already
-# DEPRECATED # #        in use.
-# DEPRECATED # #        
-# DEPRECATED # #        """
-# DEPRECATED # #        existing = User.objects.filter(username__iexact=self.cleaned_data['username'])
-# DEPRECATED # #        if existing.exists():
-# DEPRECATED # #            raise forms.ValidationError(_("A user with that username already exists."))
-# DEPRECATED # #        else:
-# DEPRECATED # #            return self.cleaned_data['username']
-# DEPRECATED # 
-# DEPRECATED #     def clean_email(self):
-# DEPRECATED #         """
-# DEPRECATED #         Validate that the supplied email address is unique for the
-# DEPRECATED #         site.
-# DEPRECATED #         
-# DEPRECATED #         """
-# DEPRECATED #         if PendingUser.objects.filter(email__iexact=self.cleaned_data['email']):
-# DEPRECATED #             raise forms.ValidationError(_("This email address is already in use. Please supply a different email address."))
-# DEPRECATED #         return self.cleaned_data['email']
-# DEPRECATED # 
-# DEPRECATED #     def clean(self):
-# DEPRECATED #         """
-# DEPRECATED #         Verifiy that the values entered into the two password fields
-# DEPRECATED #         match. Note that an error here will end up in
-# DEPRECATED #         ``non_field_errors()`` because it doesn't apply to a single
-# DEPRECATED #         field.
-# DEPRECATED #         
-# DEPRECATED #         """
-# DEPRECATED #         if 'password1' in self.cleaned_data and 'password2' in self.cleaned_data:
-# DEPRECATED #             if self.cleaned_data['password1'] != self.cleaned_data['password2']:
-# DEPRECATED #                 raise forms.ValidationError(_("The two password fields didn't match."))
-# DEPRECATED #         return self.cleaned_data
-# DEPRECATED # 
-# DEPRECATED #    class Meta:
-# DEPRECATED #        model = PendingUser
-# DEPRECATED #
-# DEPRECATED #class SliceRequestForm(forms.ModelForm):
-# DEPRECATED #    slice_name = forms.CharField( widget=forms.TextInput )
-# DEPRECATED #    class Meta:
-# DEPRECATED #        model = PendingSlice
-# DEPRECATED #
-# DEPRECATED #class RegisterUserStep2Form(forms.ModelForm):
-# DEPRECATED #    class Meta:
-# DEPRECATED #        model = PendingUser
+# xxx painful, but... 
+# bootstrap3 requires the <input> fields to be tagged class='form-control'
+# my first idea was to add this in the view template of course, BUT
+# I can't find a way to access the 'type=' value for a given field
+# I've looked rather deeply out there but to no avail so far
+# so as we have a demo coming up soon, and until we can come with a less intrusive way to handle this...
+# 
+# initial version was
+#class ContactForm(forms.Form):
+#    first_name = forms.CharField()
+#    last_name = forms.CharField()
+#    affiliation = forms.CharField()
+#    subject = forms.CharField(max_length=100)
+#    message = forms.CharField(widget=forms.Textarea)
+#    email = forms.EmailField()
+#    cc_myself = forms.BooleanField(required=False)
 
 class ContactForm(forms.Form):
-    first_name = forms.CharField()
-    last_name = forms.CharField()
-    affiliation = forms.CharField()
-    subject = forms.CharField(max_length=100)
-    message = forms.CharField(widget=forms.Textarea)
-    email = forms.EmailField()
-    cc_myself = forms.BooleanField(required=False)
+    first_name = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'}))
+    last_name = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'}))
+    affiliation = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'}))
+    email = forms.EmailField(widget=forms.TextInput(attrs={'class':'form-control'}))
+    subject = forms.CharField(max_length=100,widget=forms.TextInput(attrs={'class':'form-control'}))
+    message = forms.CharField(widget=forms.Textarea(attrs={'class':'form-control'}))
+    cc_myself = forms.BooleanField(required=False,widget=forms.CheckboxInput(attrs={'class':'form-control'}))
 
 class SliceRequestForm(forms.Form):
-    slice_name = forms.CharField()
-    authority_hrn = forms.ChoiceField(choices=[(1, 'un')])
-    number_of_nodes  = forms.DecimalField()
-    type_of_nodes = forms.CharField()
-    purpose = forms.CharField(widget=forms.Textarea)
-    email = forms.EmailField()
-    cc_myself = forms.BooleanField(required=False)
+#    slice_name = forms.CharField()
+#    authority_hrn = forms.ChoiceField(choices=[(1, 'un')])
+#    number_of_nodes  = forms.DecimalField()
+#    type_of_nodes = forms.CharField()
+#    purpose = forms.CharField(widget=forms.Textarea)
+#    email = forms.EmailField()
+#    cc_myself = forms.BooleanField(required=False)
+
+    slice_name = forms.CharField(
+        widget=forms.TextInput(attrs={'class':'form-control'}), 
+        help_text="The name for the slice you wish to create")
+    authority_hrn = forms.ChoiceField(
+        widget    = forms.Select(attrs={'class':'form-control'}),
+        choices   = [],
+        help_text = "An authority responsible for vetting your slice")
+    number_of_nodes = forms.DecimalField(
+        widget    = forms.TextInput(attrs={'class':'form-control'}),
+        help_text = "The number of nodes you expect to request (informative)")
+    type_of_nodes = forms.CharField(
+        widget    = forms.TextInput(attrs={'class':'form-control'}),
+        help_text = "The type of nodes you expect to request (informative)")
+    purpose = forms.CharField(
+        widget    = forms.Textarea(attrs={'class':'form-control'}),
+        help_text = "The purpose of your experiment (informative)")
+    email = forms.EmailField(
+        widget    = forms.TextInput(attrs={'class':'form-control'}),
+        help_text = "Your email address")
+    cc_myself = forms.BooleanField(
+        widget    = forms.CheckboxInput(attrs={'class':'form-control'}),
+        required  = False,
+        help_text = "If you'd like to be cc'ed on the request email")
 
     def __init__(self, *args, **kwargs):
         initial =  kwargs.get('initial', {})
@@ -150,5 +103,8 @@ class SliceRequestForm(forms.Form):
         if authority_hrn:# and authority_hrn[0] not in (c[0] for c in authority_hrn):
             # XXX This does not work, the choicefield is not updated...
             #self.fields['authority_hrn'].choices.extend(authority_hrn)
-            self.fields['authority_hrn'] = forms.ChoiceField( choices=authority_hrn)
+            self.fields['authority_hrn'] = forms.ChoiceField(
+                widget    = forms.Select(attrs={'class':'form-control'}),
+                choices   = authority_hrn,
+                help_text = "An authority responsible for vetting your slice")