created an embryo of onelab.css from register.css (now renamed registration.css)
14 files changed:
+p.login-status {
+ font-weight: bold;
+}
+
p.login {
font-style: italic;
}
p.login {
font-style: italic;
}
{% insert_str prelude 'css/login.css' %}
<p class='login-status'> {{ state }} </p>
<!--<a href="/" alt="Home"><img class="logo" src="{{ STATIC_URL }}img/myslice-logo.png" alt="MySlice" /></a>-->
{% insert_str prelude 'css/login.css' %}
<p class='login-status'> {{ state }} </p>
<!--<a href="/" alt="Home"><img class="logo" src="{{ STATIC_URL }}img/myslice-logo.png" alt="MySlice" /></a>-->
+<div class='well well-lg'>
<form action="/login/" method="post">
{% csrf_token %}
{% if next %}
<input type="hidden" name="next" value="{{ next }}" />
{% endif %}
<form action="/login/" method="post">
{% csrf_token %}
{% if next %}
<input type="hidden" name="next" value="{{ next }}" />
{% endif %}
- <p class='login'>username</p>
+ <p class='login'>Username</p>
<input class='login' type="text" name="username" value="{{ username}}" /><br />
<input class='login' type="text" name="username" value="{{ username}}" /><br />
- <p class='login'>password</p>
+ <p class='login'>Password</p>
<input class='login' type="password" name="password" value="" /><br />
<input type="submit" value="Log In" />
</form>
<input class='login' type="password" name="password" value="" /><br />
<input type="submit" value="Log In" />
</form>
margin:0 auto;
width:800px;
padding:10px;
margin:0 auto;
width:800px;
padding:10px;
- border:2px solid #456879;
- height: 22px;
- width: 200px;
- font-size: 10px;
+ border:2px solid #456879;
+ height: 22px;
+ width: 200px;
+ font-size: 10px;
- 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;
+}
-/*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;
legend {
position: relative;
top: -2px;
-/* float:right; */
-text-align: center;
-margin-top: 15px;
-margin-left: 180px;
+ /* float:right; */
+ text-align: center;
+ margin-top: 15px;
+ margin-left: 180px;
-webkit-border-radius: 7px;
border-radius: 7px;
}
-webkit-border-radius: 7px;
border-radius: 7px;
}
recipients.append(email)
from django.core.mail import send_mail
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)
return render(request,'contact_sent.html') # Redirect after POST
else:
return self._display (request, form)
env['username']=the_user(request)
env['topmenu_items'] = topmenu_items('', request)
if state: env['state'] = state
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))
return render_to_response('home-view.html',env, context_instance=RequestContext(request))
recipients.append(ctx['email'])
msg = render_to_string('user_request_email.txt', ctx)
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')
return render(request, 'user_register_complete.html')
--- /dev/null
+/* 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;
+}
+
+/* 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
+*/
margin:0 auto;
width:800px;
padding:10px;
font-size:12pt;
overflow:auto;
margin:0 auto;
width:800px;
padding:10px;
font-size:12pt;
overflow:auto;
+}
+#register {
+ text-align: center;
+}
+/*
- /*border:2px solid #456879;*/
- height: 22px;
- width: 200px;
- /* font-size: 10px; */
- }
+ height: 22px;
+ width: 200px;
+}
+*/
+/*
+ border:2px solid #456879;
+ font-size: 10px;
+*/
- 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; }
-
-/*border-bottom:1px solid #B7DDF2;*/
-color:#666666;
+ color:#666666;
+/* border-bottom:1px solid #B7DDF2; */
/* font-size:10px; */
/* margin-bottom:20px; */
/* padding-bottom:10px; */
/* font-size:10px; */
/* margin-bottom:20px; */
/* padding-bottom:10px; */
border: 2px solid #900;
}
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:hover .hint {
position: absolute;
display: block;
.field:hover .hint {
position: absolute;
display: block;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
border-radius: 7px;
-moz-border-radius: 7px;
-webkit-border-radius: 7px;
border-radius: 7px;
{% extends "layout-unfold1.html" %}
{% extends "layout-unfold1.html" %}
{% block head %}
{{ wizard.form.media }}
{% block head %}
{{ wizard.form.media }}
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/register.css" />
-<form class="cmxform" id="commentForm" action="#" method="post">{% csrf_token %}
-<fieldset>
-<div class="OneLabTitle" style="margin-bottom:20px;">
- <h2>Onelab Support</h2>
- <h4>If you have already registered then send an <a href="mailto:support@myslice.info"> e-mail </a> or <a href="http://trac.myslice.info/" >visit us</a></h4>
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
+<!-- xxx ideally only onelab.css but ... xxx -->
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
+<div class="onelab-title well well-lg">
+ <h2>Onelab Support</h2>
+ <h4>If you have already registered, then please <a href="mailto:support@myslice.info">send an e-mail</a>
+ or <a href="http://trac.myslice.info/" >visit us</a></h4>
+<div class='well'>
+<form class="cmxform" id="commentForm" action="#" method="post">{% csrf_token %}
+<fieldset>
{{ form.as_p }}
<p style="text-align: center;width: 80%;">
{{ form.as_p }}
<p style="text-align: center;width: 80%;">
- <input type="submit" value="Submit" />
+ <input class="btn" type="submit" value="Submit" />
{% endblock unfold2_margin %}
{% block unfold2_main %}
{% endblock unfold2_margin %}
{% block unfold2_main %}
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/register.css" />
-<div style='padding: 20px;'>
- <div class='OneLabTitle'>
- <h2 style="font-weight: bold;">Welcome to the OneLab portal !</h2>
- <h3>New to OneLab? Please <a href="/portal/register">register</a> or learn more about <a href="http://www.onelab.eu/" target="_blank">the project</a>.</h3>
- </div>
-<p/>
- <p>
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
+<!-- xxx ideally only onelab.css but ... xxx -->
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
+<div class='well well-lg onelab-title'>
+ <h2 style="font-weight: bold;">Welcome to the OneLab portal !</h2>
+ <h4>New to OneLab? Please <a href="/portal/register">register</a> or learn more about <a href="http://www.onelab.eu/" target="_blank">the project</a>.</h3>
+</div>
+<div class='well'>
+<p>
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
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
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.
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.
- </p>
- <div class="item-separator"></div>
<p>This UI server is connected to the manifold backend running at <code>{{ manifold_url }}</code>.</p>
</div>
<p>This UI server is connected to the manifold backend running at <code>{{ manifold_url }}</code>.</p>
</div>
{% extends "layout-unfold1.html" %}
{% block head %}
{% extends "layout-unfold1.html" %}
{% block head %}
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/register.css" />
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
+<!-- xxx ideally only onelab.css but ... xxx -->
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
<script type="text/javascript" src="{{STATIC_URL}}/jquery.validate.js"></script>
<script type="text/javascript" src="{{STATIC_URL}}/my_account.register.js"></script>
{% endblock %}
<script type="text/javascript" src="{{STATIC_URL}}/jquery.validate.js"></script>
<script type="text/javascript" src="{{STATIC_URL}}/my_account.register.js"></script>
{% endblock %}
- <ul>
- {% for error in errors %}
- <li>{{ error }}</li>
- {% endfor %}
- </ul>
- {% endif %}
+<ul>
+ {% for error in errors %}
+ <li>{{ error }}</li>
+ {% endfor %}
+</ul>
+{% endif %}
+<div class="onelab-title well well-lg">
+ <h2>OneLab Experimenter Registration</h2>
+ <h4>For First Line Support please <a href="/portal/contact" >Contact Support</a></h3>
+</div>
+
+<div class="well">
<form class="cmxform" id="commentForm" method="post" action="" enctype="multipart/form-data" >
{% csrf_token %}
<fieldset>
<form class="cmxform" id="commentForm" method="post" action="" enctype="multipart/form-data" >
{% csrf_token %}
<fieldset>
- <div class="OneLabTitle">
- <h2>OneLab Experimenter Registration</h2>
- <h3>For First Line Support please <a href="/portal/contact" >Contact Support</a></h3>
- </div>
-
<div class="field">
<label for="cname">First Name</label>
<input type="text" id="firstname" name="firstname" size="25" class="required" minlength="2" value="{{ firstname}}" />
<div class="field">
<label for="cname">First Name</label>
<input type="text" id="firstname" name="firstname" size="25" class="required" minlength="2" value="{{ firstname}}" />
<input type="file" name="user_public_key" class="required" id="user_public_key"/>
<p class="hint">Upload a valid public key</p>
</div>
<input type="file" name="user_public_key" class="required" id="user_public_key"/>
<p class="hint">Upload a valid public key</p>
</div>
- <div class="field">
- <input class="submit" type="submit" name="submit" value="Register"/>
+ <div class="field" id="register">
+ <input class="submit btn" type="submit" name="submit" value="Register"/>
</div>
</fieldset>
</form>
</div>
</fieldset>
</form>
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/register.css" />
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
+<!-- xxx ideally only onelab.css but ... xxx -->
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
-<form id="commentForm" action="" method="post">{% csrf_token %}
-
-<div class="OneLabTitle" style="margin-bottom:20px;">
- <h2>Request a Slice</h2>
+<div class="onelab-title well well-lg">
+ <h2>Request a Slice</h2>
+<div class='well'>
+<form id="commentForm" action="" method="post">{% csrf_token %}
-<p style="text-align: center;width: 80%;">
- <input type="submit" value="Submit" />
-</p>
+<input class="btn" type="submit" value="Submit" />
{% extends "layout-unfold1.html" %}
{% extends "layout-unfold1.html" %}
{% block head %}
{{ wizard.form.media }}
{% block head %}
{{ wizard.form.media }}
<h1>User registration</h1>
<h1>User registration</h1>
-{% if envoi %}Votre message a bien été envoyé !{% endif %}
+{% if envoi %}Your registration message has been sent !{% endif %}
<form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Submit" />
</form>
<form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Submit" />
</form>
}
#unfold2-margin {
padding: 10;
}
#unfold2-margin {
padding: 10;
- background-color: #fff2ff;
+# background-color: #fff2ff;