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 e1e56bc..18161b3 100644 (file)
--- a/plugins/resources_selected/templates/resources_selected.html
+++ b/plugins/resources_selected/templates/resources_selected.html
@@ -10,8 +10,8 @@
   </thead>
   <tbody></tbody>
 </table>
-<button type="button" id="{{domid}}__update"  class="btn btn-default">"Update"</button>
-<button type="button" id="{{domid}}__refresh"  class="btn btn-default">"Refresh"</button>
-<button type="button" id="{{domid}}__reset"  class="btn btn-default">"Reset"</button>
-<button type="button" id="{{domid}}__clear_annotations"  class="btn btn-default">"Clear Annotations"</button>
+<button type="button" id="{{domid}}__update"  class="btn btn-default">Update</button>
+<button type="button" id="{{domid}}__refresh"  class="btn btn-default">Refresh</button>
+<button type="button" id="{{domid}}__reset"  class="btn btn-default">Reset</button>
+<button type="button" id="{{domid}}__clear_annotations"  class="btn btn-default">Clear Annotations</button>
 

diff --git a/portal/forms.py b/portal/forms.py
index 109d966..07c25b4 100644 (file)
--- 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'}))