git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
[myslice.git]
/
portal
/
templates
/
registration_view.html
diff --git
a/portal/templates/registration_view.html
b/portal/templates/registration_view.html
index
f40b831
..
2589961
100644
(file)
--- a/
portal/templates/registration_view.html
+++ b/
portal/templates/registration_view.html
@@
-1,7
+1,9
@@
{% extends "layout-unfold1.html" %}
{% extends "layout-unfold1.html" %}
-{% block head %}
-<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/register.css" />
+{% block head %}
+<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 %}
@@
-9,24
+11,24
@@
{% block unfold1_main %}
{% block unfold1_main %}
-
{% if errors %}
{% if errors %}
-
<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}}" />
@@
-75,23
+77,27
@@
<p class="hint">Retype the password</p>
</div>
<div class="field">
<p class="hint">Retype the password</p>
</div>
<div class="field">
- <label for="question">My
Public Key
</label>
+ <label for="question">My
Keys
</label>
<select name="question" class="required" id="question">
<option value="generate">Generate key pairs for me </option>
<option value="upload">Upload my public key </option>
<select name="question" class="required" id="question">
<option value="generate">Generate key pairs for me </option>
<option value="upload">Upload my public key </option>
- </select>
+ </select>
+ <p class="hint">Account Delegation: Automatic (Recommended)</p>
<?php echo $errFile; ?>
</div>
<div class="field" style="display:none;" id="upload_key">
<label for="file">Upload public key</label>
<input type="file" name="user_public_key" class="required" id="user_public_key"/>
<?php echo $errFile; ?>
</div>
<div class="field" style="display:none;" id="upload_key">
<label for="file">Upload public key</label>
<input type="file" name="user_public_key" class="required" id="user_public_key"/>
- <p class="hint">Upload a valid public key</p>
+ <p class="hint">Account Delegation: Manual (Advanced Users)</p>
+ <p class="warning" id="pkey_del_msg">Once your account is validated, you have to delegate your credentials manually using SFA [Advanced users only]</p>
+
</div>
</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>
+</div>
{% endblock %}
{% endblock %}