From: Yasin Date: Wed, 11 Jun 2014 17:06:18 +0000 (+0200) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~68 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=299cc74138342ebb5c10409babe39364f989c7b2;hp=9e2d1ca41dd8a9e076ecaff432f8ebe8578ee2c5;p=unfold.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/portal/forms.py b/portal/forms.py index 38293e4e..ecd2e6c6 100644 --- a/portal/forms.py +++ b/portal/forms.py @@ -86,12 +86,12 @@ class ContactForm(forms.Form): # 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.@+-]+$', + regex=r'^[\w+\s\w+]+$', max_length=100, label=_("subject"), error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) description = forms.RegexField(widget=forms.Textarea(attrs={'class':'form-control'}), - regex=r'^[\w.@+-]+$', + regex=r'^[\w+\s\w+]+$', label=_("description"), error_messages={'invalid': _("This value may contain only letters, numbers and @/./+/-/_ characters.")}) cc_myself = forms.BooleanField(required=False,widget=forms.CheckboxInput(attrs={'class':'form-control'})) diff --git a/portal/templates/_widget-login-user.html b/portal/templates/_widget-login-user.html index 9e248875..4c3fd159 100644 --- a/portal/templates/_widget-login-user.html +++ b/portal/templates/_widget-login-user.html @@ -20,7 +20,7 @@    |   Can't access your account?
- Try or Sign Up + Don't have an account? Sign up now
diff --git a/portal/templates/fed4fire/fed4fire__widget-login.html b/portal/templates/fed4fire/fed4fire__widget-login.html deleted file mode 100644 index db7245cd..00000000 --- a/portal/templates/fed4fire/fed4fire__widget-login.html +++ /dev/null @@ -1,26 +0,0 @@ -
- {% if state %} - {{ state }} - {% endif %} -
- {% csrf_token %} - {% if next %} - - {% endif %} -
- - -
-
- - -
- - -
-
diff --git a/portal/templates/fed4fire/fed4fire_home-view.html b/portal/templates/fed4fire/fed4fire_home-view.html index 424677c9..1b4549de 100644 --- a/portal/templates/fed4fire/fed4fire_home-view.html +++ b/portal/templates/fed4fire/fed4fire_home-view.html @@ -84,6 +84,9 @@

A wide variety of world class testbeds available through your one account.

+

+ Want to learn more? +

diff --git a/portal/templates/fed4fire/fed4fire_registration_view.html b/portal/templates/fed4fire/fed4fire_registration_view.html new file mode 100644 index 00000000..3afdae21 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_registration_view.html @@ -0,0 +1,151 @@ +{% extends "layout.html" %} + +{% block content %} + +
+

User RegistrationUser sign-up

+
+
+

+

Questions? Contact us.

+
+{% if errors %} +
    + {% for error in errors %} +
  • {{ error }}
    • + {% endfor %} +
+{% endif %} +
+
+{% csrf_token %} +
+ +

+ +

If your organization does not deploy a Fed4FIRE authority itself,
you can use the default one called "fed4fire".

+
+ +
+
+ +
+ +

+ +
+
+ +
+
+ +
+
+ + +
+
+ +

+ +
+
+ +
+
+ + +
+ +
+
+ +
+

+ I agree to the + +
+ + + +
+

+ +
+
+
+ +{% endblock %} + diff --git a/portal/templates/fed4fire/fed4fire_widget-topmenu.html b/portal/templates/fed4fire/fed4fire_widget-topmenu.html index 74edfdc9..1dde7689 100644 --- a/portal/templates/fed4fire/fed4fire_widget-topmenu.html +++ b/portal/templates/fed4fire/fed4fire_widget-topmenu.html @@ -2,7 +2,7 @@