From: Thierry Parmentelat Date: Mon, 9 Sep 2013 08:52:59 +0000 (+0200) Subject: various cleanups and tweaks X-Git-Tag: myslice-0.2-1~2 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=0098d38aa259c2aeeac53c5fc0a91acefa8f0ee7 various cleanups and tweaks created an embryo of onelab.css from register.css (now renamed registration.css) --- diff --git a/auth/css/login.css b/auth/css/login.css index 11444f7f..0d0ba19c 100644 --- a/auth/css/login.css +++ b/auth/css/login.css @@ -1,3 +1,7 @@ +p.login-status { + font-weight: bold; +} + p.login { font-style: italic; } diff --git a/auth/templates/widget-login.html b/auth/templates/widget-login.html index 80578e5e..b79e33ff 100644 --- a/auth/templates/widget-login.html +++ b/auth/templates/widget-login.html @@ -1,14 +1,16 @@ {% insert_str prelude 'css/login.css' %}

{{ state }}

+
{% csrf_token %} {% if next %} {% endif %} - +
- +
+
diff --git a/plugins/form/static/css/form.css b/plugins/form/static/css/form.css index e8f79e20..89fd941b 100644 --- a/plugins/form/static/css/form.css +++ b/plugins/form/static/css/form.css @@ -1,5 +1,4 @@ #commentForm { - margin:0 auto; width:800px; padding:10px; @@ -7,33 +6,35 @@ overflow:auto; } input { - border:2px solid #456879; - height: 22px; - width: 200px; - font-size: 10px; + border:2px solid #456879; + height: 22px; + width: 200px; + font-size: 10px; } label { - float: left; - font-weight: bold; - text-align: right; - margin-right: 20px; - width: 200px; - display: inline-block; + float: left; + font-weight: bold; + text-align: right; + margin-right: 20px; + width: 200px; + display: inline-block; } - -label.error { float: none; color: red; padding-left: .5em; vertical-align: top; font-size: 12px; } - +label.error { + float: none; + color: red; + padding-left: .5em; + vertical-align: top; + font-size: 12px; +} p { -/*border-bottom:1px solid #B7DDF2;*/ -color:#666666; -font-size:10px; -margin-bottom:20px; -padding-bottom:10px; + /*border-bottom:1px solid #B7DDF2;*/ + color:#666666; + font-size:10px; + margin-bottom:20px; + padding-bottom:10px; } - - legend { position: relative; top: -2px; @@ -53,16 +54,16 @@ textarea:focus, input:focus { } .required{ -font-size:12pt; + font-size:12pt; } .submit { -/* float:right; */ -text-align: center; -margin-top: 15px; -margin-left: 180px; + /* float:right; */ + text-align: center; + margin-top: 15px; + margin-left: 180px; } .field { -padding:2px; + padding:2px; } .hint{ display:none; @@ -79,4 +80,3 @@ padding:2px; -webkit-border-radius: 7px; border-radius: 7px; } - diff --git a/portal/contactview.py b/portal/contactview.py index de6a3178..0b459a3a 100644 --- a/portal/contactview.py +++ b/portal/contactview.py @@ -28,7 +28,8 @@ class ContactView (View): recipients.append(email) from django.core.mail import send_mail - send_mail("Onelab user submitted a query ", [first_name,last_name,affiliation,subject,message], email, recipients) + send_mail("Onelab user %s submitted a query "%email, + [first_name,last_name,affiliation,subject,message], email, recipients) return render(request,'contact_sent.html') # Redirect after POST else: return self._display (request, form) diff --git a/portal/homeview.py b/portal/homeview.py index f5735ab4..a66cd36d 100644 --- a/portal/homeview.py +++ b/portal/homeview.py @@ -43,6 +43,6 @@ class HomeView (View): env['username']=the_user(request) env['topmenu_items'] = topmenu_items('', request) if state: env['state'] = state - elif not env['username']: env['state'] = "Please log in below..." + elif not env['username']: env['state'] = "Please sign in" return render_to_response('home-view.html',env, context_instance=RequestContext(request)) diff --git a/portal/registrationview.py b/portal/registrationview.py index 60749695..e85d44ff 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -116,7 +116,7 @@ class RegistrationView (View): recipients.append(ctx['email']) msg = render_to_string('user_request_email.txt', ctx) - send_mail("Onelab New User request submitted", msg, email, recipients) + send_mail("Onelab New User request for %s submitted"%email, msg, email, recipients) return render(request, 'user_register_complete.html') diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css new file mode 100644 index 00000000..70418c0b --- /dev/null +++ b/portal/static/css/onelab.css @@ -0,0 +1,16 @@ +/* Thierry's Note +it seems to me that most of the stuff here is not register-related, +but general-purpose settings for an openlab style +I've started to move over such stuff in onelab.css +feel free to add to this collection +*/ + +/* these in general are div.well */ +div.onelab-title{ + margin-top:20px; + margin-bottom:20px; + text-align: center; + border: 1px solid #61210B; + background-color: #e0f0f0; +} + diff --git a/portal/static/css/register.css b/portal/static/css/registration.css similarity index 53% rename from portal/static/css/register.css rename to portal/static/css/registration.css index 4cb80799..958f26f6 100644 --- a/portal/static/css/register.css +++ b/portal/static/css/registration.css @@ -1,44 +1,50 @@ +/* Thierry's Note +it seems to me that most of the stuff here is not register-related, +but general-purpose settings for an openlab style +I've started to move over such stuff in onelab.css +feel free to add to this collection +*/ #commentForm { - margin:0 auto; width:800px; padding:10px; font-size:12pt; overflow:auto; - } +} +#register { + text-align: center; +} +/* input { - /*border:2px solid #456879;*/ - height: 22px; - width: 200px; - /* font-size: 10px; */ - } + height: 22px; + width: 200px; +} +*/ +/* + border:2px solid #456879; + font-size: 10px; +*/ label { - float: left; - font-weight: bold; - text-align: right; - margin-right: 20px; - width: 200px; - display: inline-block; + float: left; + font-weight: bold; + text-align: right; + margin-right: 20px; + width: 200px; + display: inline-block; } -.OneLabTitle{ - padding-top: 12px; - background-color: #C1DAD7; - border: 1px solid #61210B; - text-align: center; -} -.fed4fireTitle{ - padding-top: 12px; - background-color: orange; - border: 1px solid #61210B; - text-align: center; +label.error { + float: none; + color: red; + padding-left: .5em; + vertical-align: + top; + font-size: 12px; } -label.error { float: none; color: red; padding-left: .5em; vertical-align: top; font-size: 12px; } - p { -/*border-bottom:1px solid #B7DDF2;*/ -color:#666666; + color:#666666; +/* border-bottom:1px solid #B7DDF2; */ /* font-size:10px; */ /* margin-bottom:20px; */ /* padding-bottom:10px; */ @@ -64,21 +70,22 @@ textarea:focus, input:focus { border: 2px solid #900; } -.required{ -font-size:12pt; +.required { + font-size:12pt; } -.submit { -/* float:right; */ -text-align: center; -margin-top: 15px; -margin-left: 250px; +/* + .submit { + text-align: center; + margin-top: 15px; + margin-left: 250px; } +*/ .field { -padding:10px; + padding:10px; } -.hint{ +.hint { display:none; - } +} .field:hover .hint { position: absolute; display: block; @@ -90,8 +97,4 @@ padding:10px; -moz-border-radius: 7px; -webkit-border-radius: 7px; border-radius: 7px; - } - - - - +} diff --git a/portal/templates/contact.html b/portal/templates/contact.html index 6630f23f..bd374157 100644 --- a/portal/templates/contact.html +++ b/portal/templates/contact.html @@ -1,5 +1,4 @@ {% extends "layout-unfold1.html" %} -{% load i18n %} {% block head %} {{ wizard.form.media }} @@ -7,19 +6,24 @@ {% block unfold1_main %} - -
{% csrf_token %} -
-
-

Onelab Support

-

If you have already registered then send an e-mail or visit us

+ + + +
+

Onelab Support

+

If you have already registered, then please send an e-mail + or visit us

+
+{% csrf_token %} +
{{ form.as_p }}

- +

+
{% endblock %} diff --git a/portal/templates/home-view.html b/portal/templates/home-view.html index 42265a59..5072e525 100644 --- a/portal/templates/home-view.html +++ b/portal/templates/home-view.html @@ -7,14 +7,15 @@ {% endblock unfold2_margin %} {% block unfold2_main %} - -
-
-

Welcome to the OneLab portal !

-

New to OneLab? Please register or learn more about the project.

-
-

-

+ + + +

+

Welcome to the OneLab portal !

+

New to OneLab? Please register or learn more about the project.

+
+
+

Experimentally-driven research is key to success in exploring the possible futures of the Internet. The OneLab initiative provides an open, general-purpose, shared experimental facility, both large-scale and @@ -23,8 +24,7 @@ the performance of their solutions. Based on the results of several different European and national projects, OneLab offers access to a range of tools and testbeds including PlanetLab Europe, the NITOS wireless testbed, and other federated testbeds. -

-
+

This UI server is connected to the manifold backend running at {{ manifold_url }}.

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html index f40b831a..7e1c1d7b 100644 --- a/portal/templates/registration_view.html +++ b/portal/templates/registration_view.html @@ -1,7 +1,9 @@ {% extends "layout-unfold1.html" %} {% block head %} - + + + {% endblock %} @@ -9,24 +11,24 @@ {% block unfold1_main %} - {% if errors %} -
    - {% for error in errors %} -
  • {{ error }}
    • - {% endfor %} -
- {% endif %} +
    + {% for error in errors %} +
  • {{ error }}
    • + {% endfor %} +
+{% endif %} +
+

OneLab Experimenter Registration

+

For First Line Support please Contact Support

+
+ +
{% csrf_token %}
-
-

OneLab Experimenter Registration

-

For First Line Support please Contact Support

-
-
@@ -87,11 +89,12 @@

Upload a valid public key

-
- +
+
+
{% endblock %} diff --git a/portal/templates/slice_request.html b/portal/templates/slice_request.html index acaf2df2..175863cd 100644 --- a/portal/templates/slice_request.html +++ b/portal/templates/slice_request.html @@ -7,18 +7,19 @@ {% block unfold1_main %} - + + + -
{% csrf_token %} - -
-

Request a Slice

+
+

Request a Slice

+
+{% csrf_token %} {{ form.as_p }} -

- -

+ +
{% endblock %} diff --git a/portal/templates/user_register.html b/portal/templates/user_register.html index dda88f8e..baa56675 100644 --- a/portal/templates/user_register.html +++ b/portal/templates/user_register.html @@ -1,5 +1,4 @@ {% extends "layout-unfold1.html" %} -{% load i18n %} {% block head %} {{ wizard.form.media }} @@ -10,11 +9,13 @@

User registration

-{% if envoi %}Votre message a bien été envoyé !{% endif %} +{% if envoi %}Your registration message has been sent !{% endif %} +
{% csrf_token %} {{ form.as_p }}
+
{% endblock %} diff --git a/views/css/layout-unfold2.css b/views/css/layout-unfold2.css index d91775c4..93466432 100644 --- a/views/css/layout-unfold2.css +++ b/views/css/layout-unfold2.css @@ -3,5 +3,5 @@ } #unfold2-margin { padding: 10; - background-color: #fff2ff; +# background-color: #fff2ff; }