Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --git a/portal/forms.py b/portal/forms.py
index 6210d9d..38293e4 100644 (file)
--- a/portal/forms.py
+++ b/portal/forms.py
@@ -69,21 +69,21 @@ def is_password_unusable(pw):
 #    cc_myself = forms.BooleanField(required=False)
 
 class ContactForm(forms.Form):
-    first_name = forms.RegexField(widget=forms.TextInput(attrs={'class':'form-control'}),
-                                regex=r'^[\w.@+-]+$',
-                                 max_length=30,
-                                 label=_("First name"),
-                                 error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
-    last_name = forms.RegexField(widget=forms.TextInput(attrs={'class':'form-control'}),
-                                regex=r'^[\w.@+-]+$',
-                                 max_length=30,
-                                 label=_("Last name"),
-                                 error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
-    authority = forms.RegexField(widget=forms.TextInput(attrs={'class':'form-control'}),
-                                regex=r'^[\w.@+-]+$',
-                                 max_length=30,
-                                 label=_("authority"),
-                                 error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
+   # first_name = forms.RegexField(widget=forms.TextInput(attrs={'class':'form-control'}),
+   #                             regex=r'^[\w.@+-]+$',
+   #                              max_length=30,
+   #                              label=_("First name"),
+   #                              error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
+   # last_name = forms.RegexField(widget=forms.TextInput(attrs={'class':'form-control'}),
+   #                             regex=r'^[\w.@+-]+$',
+   #                              max_length=30,
+   #                              label=_("Last name"),
+   #                              error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
+   # authority = forms.RegexField(widget=forms.TextInput(attrs={'class':'form-control'}),
+   #                             regex=r'^[\w.@+-]+$',
+   #                              max_length=30,
+   #                              label=_("authority"),
+   #                              error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")})
     email = forms.EmailField(widget=forms.TextInput(attrs={'class':'form-control'}))
     subject = forms.RegexField(widget=forms.TextInput(attrs={'class':'form-control'}),
                                 regex=r'^[\w.@+-]+$',

diff --git a/portal/templates/contact.html b/portal/templates/contact.html
index 722c29d..d9d2c51 100644 (file)
--- a/portal/templates/contact.html
+++ b/portal/templates/contact.html
@@ -24,8 +24,7 @@
 </div>
 
 <div class="row">
-       <div class="col-md-2"></div>
-       <div class="col-md-8">
+       <div class="col-md-4">
                <form role="form" method="post">
                {% csrf_token %}
                {% for field in form %}
@@ -34,7 +33,7 @@
                {{ field.errors }} {{ field }}
            </div>
            {% endfor %}
-               <button type="submit" class="btn btn-default">Create Ticket</button>
+               <button type="submit" class="btn btn-primary">Create Ticket</button>
                </form>
        </div>
 </div>