(wip)

[myslice.git] / portal / forms.py

diff --git a/portal/forms.py b/portal/forms.py
index 075f942..9bcf8fa 100644 (file)
--- a/portal/forms.py
+++ b/portal/forms.py
@@ -64,27 +64,27 @@ class SliceRequestForm(forms.Form):
 
     slice_name = forms.CharField(
         widget=forms.TextInput(attrs={'class':'form-control'}), 
-        help_text="Enter a name for the slice you wish to create")
+        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 = "Please select an authority responsible for vetting your slice")
+        help_text = "An authority responsible for vetting your slice")
     number_of_nodes = forms.DecimalField(
         widget    = forms.TextInput(attrs={'class':'form-control'}),
-        help_text = "Enter the number of nodes you expect to request (informative only)")
+        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 = "Enter the type of nodes you expect to request (informative only)")
+        help_text = "The type of nodes you expect to request (informative)")
     purpose = forms.CharField(
         widget    = forms.Textarea(attrs={'class':'form-control'}),
-        help_text = "Enter the purpose of your experiment (informative only)")
+        help_text = "The purpose of your experiment (informative)")
     email = forms.EmailField(
         widget    = forms.TextInput(attrs={'class':'form-control'}),
-        help_text = "Enter your email address")
+        help_text = "Your email address")
     cc_myself = forms.BooleanField(
         widget    = forms.CheckboxInput(attrs={'class':'form-control'}),
         required  = False,
-        help_text = "Please indicate whether you would like to be CC'ed to the request email")
+        help_text = "If you'd like to be cc'ed on the request email")
 
     def __init__(self, *args, **kwargs):
         initial =  kwargs.get('initial', {})
@@ -103,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")