X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fforms.py;h=109d9669b2c6bd1a3c6168821155c0f46a5aa7a1;hb=d384e4b10bf9ba67f610bef72cf0e5b2dd747baf;hp=43be69826dc52898d4e84852d5bfdaca998e8a79;hpb=4ee78b17e6c8bb54fc94bcddd6b0abb3d8c1a0fc;p=myslice.git

diff --git a/portal/forms.py b/portal/forms.py
index 43be6982..109d9669 100644
--- a/portal/forms.py
+++ b/portal/forms.py
@@ -5,6 +5,7 @@
 #
 # Authors:
 #   Jordan Augé <jordan.auge@lip6.fr>
+#   Mohammed-Yasin Rahman <mohammed-yasin.rahman@lip6.fr>
 # Copyright 2013, UPMC Sorbonne Universités / LIP6
 #
 # This program is free software; you can redistribute it and/or modify it under
@@ -24,32 +25,67 @@ from django import forms
 from portal.models import PendingUser, PendingSlice
 #from crispy_forms.helper import FormHelper
 #from crispy_forms.layout import Submit
+from django.utils.translation import ugettext_lazy as _
 
-class UserRegisterForm(forms.ModelForm):
-# DEPRECATED #    def __init__(self, *args, **kwargs):
-# DEPRECATED #        self.helper = FormHelper()
-# DEPRECATED #        self.helper.form_tag = False
-# DEPRECATED #        #self.helper.form_id = 'id-exampleForm'
-# DEPRECATED #        self.helper.form_class = 'blueForms'
-# DEPRECATED #        self.helper.form_method = 'post'
-# DEPRECATED #        #self.helper.form_action = 'submit_survey'
-# DEPRECATED #        self.helper.add_input(Submit('submit', 'Submit'))
-# DEPRECATED #        super(RegisterUserForm, self).__init__(*args, **kwargs)
-
-    first_name = forms.CharField( widget=forms.TextInput )
-    last_name  = forms.CharField( widget=forms.TextInput )
-    email      = forms.CharField( widget=forms.TextInput )
-    password   = forms.CharField( widget=forms.PasswordInput )
-    password2  = forms.CharField( widget=forms.PasswordInput )
-    keypair    = forms.CharField( widget=forms.FileInput )
-    class Meta:
-        model = PendingUser
-
-class SliceRequestForm(forms.ModelForm):
-    slice_name = forms.CharField( widget=forms.TextInput )
-    class Meta:
-        model = PendingSlice
-
-# 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(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(widget=forms.TextInput(attrs={'class':'form-control'}))
+    authority_hrn = forms.ChoiceField(choices=[(1, 'un')],widget=forms.Select(attrs={'class':'form-control'}))
+    number_of_nodes  = forms.DecimalField(widget=forms.TextInput(attrs={'class':'form-control'}))
+    type_of_nodes = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'}))
+    purpose = forms.CharField(widget=forms.Textarea(attrs={'class':'form-control'}))
+    email = forms.EmailField(widget=forms.TextInput(attrs={'class':'form-control'}))
+    cc_myself = forms.BooleanField(required=False,widget=forms.CheckboxInput(attrs={'class':'form-control'}))
+
+    def __init__(self, *args, **kwargs):
+        initial =  kwargs.get('initial', {})
+        authority_hrn = initial.get('authority_hrn', None)
+
+        # set just the initial value
+        # in the real form needs something like this {'authority_hrn':'a'}
+        # but in this case you want {'authority_hrn':('a', 'letter_a')}
+        if authority_hrn:
+            kwargs['initial']['authority_hrn'] = authority_hrn[0]
+
+        # create the form
+        super(SliceRequestForm, self).__init__(*args, **kwargs)
+
+        # self.fields only exist after, so a double validation is needed
+        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)
+