platforms page has only enabled platforms, manifoldproxy modified to use admin connex...

[myslice.git] / portal / forms.py

diff --git a/portal/forms.py b/portal/forms.py
index 513b952..fb920c7 100644 (file)
--- 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
@@ -41,21 +42,28 @@ class UserRegisterForm(forms.Form): # Not ModelForm
     """
     required_css_class = 'required'
     
-    first_name = forms.RegexField(regex=r'^[\w.@+-]+$',
+    first_name = forms.RegexField(regex=r'^[\w+\s.@+-]+$',
                                  max_length=30,
                                  label=_("First name"),
                                  error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
-    last_name = forms.RegexField(regex=r'^[\w.@+-]+$',
+    last_name = forms.RegexField(regex=r'^[\w+\s.@+-]+$',
                                  max_length=30,
                                  label=_("Last name"),
                                  error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
+    affiliation = forms.RegexField(regex=r'^[\w+\s.@+-]+$',
+                             max_length=30,
+                             label=_("Affiliation"),
+                             error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
+
     email = forms.EmailField(label=_("E-mail"))
     password1 = forms.CharField(widget=forms.PasswordInput,
                                 label=_("Password"))
     password2 = forms.CharField(widget=forms.PasswordInput,
                                 label=_("Password (again)"))
     keypair    = forms.CharField( widget=forms.FileInput )
-
+   
+    #my_keypairs = forms.ChoiceField(widget = forms.Select(), 
+    #             choices = ([('1','generate'), ('2','upload')])) 
     tos = forms.BooleanField(widget=forms.CheckboxInput,
                              label=_(u'I have read and agree to the Terms of Service'),
                              error_messages={'required': _("You must agree to the terms to register")})
@@ -106,3 +114,22 @@ class SliceRequestForm(forms.ModelForm):
 # DEPRECATED #class RegisterUserStep2Form(forms.ModelForm):
 # DEPRECATED #    class Meta:
 # DEPRECATED #        model = PendingUser
+
+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 SliceRequestForm(forms.Form):
+    slice_name = forms.CharField()
+    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)
+
+