{% extends "layout-unfold1.html" %}
-{% 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 %}
-
-{% block unfold1_main %}
+{% block unfold_main %}
+<div class="onelab-title well-lg">
+ <h2>OneLab Experimenter Registration</h2>
+ <h4>For First Line Support please <a href="/portal/contact" >Contact Support</a></h3>
+</div>
{% if errors %}
<ul>
{% 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>
- <div class="field">
- <label for="cname">First Name</label>
- <input type="text" id="firstname" name="firstname" size="25" class="required" minlength="2" value="{{ firstname}}" />
- <p class="hint">Enter your first name</p>
- <?php echo $errfName;?>
- </div>
- <div class="field">
- <label for="lname">Last Name</label>
- <input type="text" id="lastname" name="lastname" size="25" class="required" minlength="2" value="{{ lastname }}"/>
- <p class="hint">Enter your last name</p>
- <?php echo $errlName;?>
- </div>
- <!-- DEPRECATED
- <div class="field">
- <label for="aff_list">Affiliation</label>
- <input type="text" id="aff_list" name="affiliation" size="25" class="required" value="{{ affiliation }}"/>
- <p class="hint">Enter your Institution name</p>
- <?php echo $erraffiliation;?>
- </div>
- -->
- <div class="field">
- <label for="auth_list">Authority</label>
- <select id="auth_list" name="authority_hrn" size="1" class="required">
- {% for authority in authorities %}
- <option value="{{ authority.authority_hrn }}"/>{{authority.name}} ({{authority.authority_hrn}})</option>
- {% endfor %}
- </select>
- <p class="hint">Please select an authority responsible for vetting your account</p>
- </div>
+ <form class="cmxform form-horizontal" id="registrationForm" method="post" action="" enctype="multipart/form-data" role="form">
+ <fieldset>
+ {% csrf_token %}
+ <div class="form-group">
+ <label for="firstname" class="col-xs-2 control-label">First Name</label>
+ <div class="col-xs-4">
+ <input type="text" name="firstname" class="form-control" minlength="2" value="{{ firstname }}" placeholder="First Name" required />
+ </div>
+ <div class="col-xs-6"> <p class="form-hint">Enter your first name</p> </div>
+ </div>
+ <div class="form-group">
+ <label for="lastname" class="col-xs-2 control-label">Last Name</label>
+ <div class="col-xs-4">
+ <input type="text" name="lastname" size="25" class="form-control" minlength="2" value="{{ lastname }}" placeholder="Last Name" required />
+ </div>
+ <div class="col-xs-6"><p class="form-hint">Enter your last name</p></div>
+ </div>
+ <div class="form-group">
+ <label for="auth_list" class="col-xs-2 control-label">Authority</label>
+ <div class="col-xs-4">
+ <select id="auth_list" name="authority_hrn" size="1" class="form-control" required>
+ {% if authorities %}
+ {% for authority in authorities %}
+ <option value="{{ authority.authority_hrn }}"/>{{authority.authority_hrn}}</option>
+ <!-- <option value="{{ authority.authority_hrn }}">{{authority.name}} ({{authority.authority_hrn}})</option> -->
+ {% endfor %}
+ {% else %} <!-- should not happen -->
+ <option value="test">No authority found !!! </option>
+ {% endif %}
+ </select>
+ </div>
+ <div class="col-xs-6"><p class="form-hint">An authority responsible for vetting your account</p></div>
+ </div>
- <div class="field">
- <label for="cemail">Email</label>
- <input type="text" id="email" name="email" size="25" class="required email" value="{{ email }}"/>
- <p class="hint">Enter a valid email address</p>
- <?php echo $errEmail; ?>
- </div>
- <div class="field">
- <label for="password">Password</label>
- <input type="password" id="password" name="password" class="required" minlength="4" value="{{ password }}"/>
- <p class="hint">Enter password</p>
- <?php //echo $errPass;?>
- </div>
- <div class="field">
- <label for="password">Confirm Password</label>
- <input type="password" id="confirmpassword" name="confirmpassword" minlength="4" class="required" value=""/>
- <p class="hint">Retype the password</p>
- </div>
- <div class="field">
- <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>
- <p class="hint">Genkey: 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"/>
- <p class="hint">Account Delegation: Manual (Advanced Users)</p>
- <p class="warning" id="pkey_del_msg">Once your account is validated, you will have to delegate your credentials manually using SFA [Advanced users only]</p>
-
- </div>
- <div class="field" id="register">
- <input class="submit btn" type="submit" name="submit" value="Register"/>
- </div>
- </fieldset>
-</form>
+ <!-- LOGIN
+ TODO: Login should be suggested from user email or first/last name, and
+ checked for existence. In addition, the full HRN should be shown to the
+ user.
+ -->
+ <div class="form-group">
+ <label for="login" class="col-xs-2 control-label">Login</label>
+ <div class="col-xs-4">
+ <input type="text" name="login" size="25" class="form-control" minlength="2" value="{{ login }}" placeholder="Login" required />
+ </div>
+ <div class="col-xs-6"><p class="form-hint">Enter your login</p></div>
+ </div>
+
+ <div class="form-group">
+ <label for="email" class="col-xs-2 control-label">Email</label>
+ <div class="col-xs-4">
+ <input type="email" name="email" size="25" class="form-control" value="{{ email }}" required/>
+ </div>
+ <div class="col-xs-6"><p class="form-hint">Enter a valid email address</p></div>
+ </div>
+ <div class="form-group">
+ <label for="password" class="col-xs-2 control-label">Password</label>
+ <div class="col-xs-4">
+ <input type="password" id="password" name="password" class="form-control" minlength="4" value="{{ password }}" required/>
+ </div>
+ <div class="col-xs-6"><p class="form-hint">Enter password</p></div>
+ </div>
+ <div class="form-group">
+ <label for="password" class="col-xs-2 control-label">Confirm Password</label>
+ <div class="col-xs-4">
+ <input type="password" id="confirmpassword" name="confirmpassword" minlength="4" class="form-control"
+ value="" placeholder="Confirm Password" required/>
+ </div>
+ <div class="col-xs-6"><p class="form-hint">Retype the password</p></div>
+ </div>
+ <div class="form-group">
+ <label for="question" class="col-xs-2 control-label">My Keys</label>
+ <div class="col-xs-4">
+ <select name="question" class="form-control" id="key-policy" required>
+ <option value="generate">Generate key pairs for me </option>
+ <option value="upload">Upload my public key </option>
+ </select>
+ </div>
+ <div class="col-xs-6"><p class="form-hint">Genkey: Account Delegation Automatic (Recommended)</p> </div>
+ </div>
+ <div class="form-group" style="display:none;" id="upload_key">
+ <label for="file" class="col-xs-2 control-label">Upload public key</label>
+ <div class="col-xs-4">
+ <input type="file" name="user_public_key" class="form-control" id="user_public_key" required/>
+ <p class="warning" id="pkey_del_msg">Once your account is validated, you will have to delegate your credentials manually using SFA [Advanced users only]</p>
+ </div>
+ <div class="col-xs-6"><p class="form-hint">Account Delegation: Manual (Advanced Users)</p></div>
+ </div>
+ <div class="form-group" id="register">
+ <button class="submit btn btn-default col-xs-12" type="submit">Register</button>
+ </div>
+ </div>
+ </fieldset>
+ </form>
</div>
{% endblock %}