From: Thierry Parmentelat Date: Thu, 26 Sep 2013 16:13:27 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice X-Git-Tag: myslice-0.2-5~85 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d198acb2fec56c29975fbe7ecf593777791feb97;hp=91744ef8420e44ced5ca0f1238d670933e702bec;p=unfold.git Merge branch 'master' of ssh://git.onelab.eu/git/myslice --- diff --git a/plugins/resources_selected/templates/resources_selected.html b/plugins/resources_selected/templates/resources_selected.html index e1e56bcb..18161b31 100644 --- a/plugins/resources_selected/templates/resources_selected.html +++ b/plugins/resources_selected/templates/resources_selected.html @@ -10,8 +10,8 @@ - - - - + + + + diff --git a/portal/forms.py b/portal/forms.py index 109d9669..07c25b49 100644 --- a/portal/forms.py +++ b/portal/forms.py @@ -62,7 +62,8 @@ class SliceRequestForm(forms.Form): # email = forms.EmailField() # cc_myself = forms.BooleanField(required=False) - slice_name = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'})) + slice_name = forms.CharField(widget=forms.TextInput(attrs={'class':'form-control'}), + help_text="This shows up as a hint") 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'}))