X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fregistration_view.html;h=52cb402d95886ed00179fe5c4c1cd5788e6aecea;hb=0120bc491b3464f4981270a28ac153fa62f3b08b;hp=8ce5661cc6c5c389c2ce2bdf3807bc2b427655e8;hpb=922a08b7630080ff87367bd1071906ef8598b6ff;p=unfold.git

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 8ce5661c..52cb402d 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -1,16 +1,8 @@
 {% 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}}/js/jquery.validate.js"></script> 
-<script type="text/javascript" src="{{STATIC_URL}}/js/my_account.register.js"></script>
-{% endblock %}                              
-                                    
-{% block unfold1_main %}        
+{% block unfold_main %}        
 
-<div class="onelab-title well well-lg">
+<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>
@@ -24,79 +16,98 @@
 {% endif %}
    
 <div class="well">
-  <form class="cmxform form-horizontal" id="registrationForm" method="post" action="" enctype="multipart/form-data" role="form">
+ <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-md-4 control-label">First Name</label>
-      <div class="col-md-4">
-	<input type="text" name="firstname" class="required form-control" minlength="2" value="{{ firstname }}" placeholder="First Name" />
+      <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-md-4"> <p class="form-hint">Enter your first name</p> </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-md-4 control-label">Last Name</label>
-      <div class="col-md-4">
-	<input type="text" name="lastname" size="25" class="required form-control" minlength="2" value="{{ lastname }}" placeholder="Last Name" />
+      <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-md-4"><p class="form-hint">Enter your last name</p></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-md-4 control-label">Authority</label>
-      <div class="col-md-4">
-	<select id="auth_list" name="authority_hrn" size="1" class="required form-control">
+      <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.name}} ({{authority.authority_hrn}})</option>
+      <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-md-4"><p class="form-hint">Please select an authority responsible for vetting your account</p></div>
+      <div class="col-xs-6"><p class="form-hint">An authority responsible for vetting your account</p></div>
+    </div>
+
+	<!-- 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-md-4 control-label">Email</label>
-      <div class="col-md-4">
-	<input type="email" name="email" size="25"  class="required form-control" value="{{ email }}"/> 
+      <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-md-4"><p class="form-hint">Enter a valid email address</p></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-md-4 control-label">Password</label>
-      <div class="col-md-4">
-	<input type="password"  id="password" name="password"   class="required form-control" minlength="4" value="{{ password }}"/> 
+      <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-md-4"><p class="form-hint">Enter password</p></div>
+      <div class="col-xs-6"><p class="form-hint">Enter password</p></div>
     </div>
     <div class="form-group">
-      <label for="password" class="col-md-4 control-label">Confirm Password</label>
-      <div class="col-md-4">
-	<input type="password"  id="confirmpassword" name="confirmpassword"   minlength="4" class="required form-control" 
-	       value="" placeholder="Confirm Password"/>
+      <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-md-4"><p class="form-hint">Retype the password</p></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-md-4 control-label">My Keys</label>
-      <div class="col-md-4">
-	<select name="question" class="required form-control" id="question">        
+      <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-md-4"><p class="form-hint">Genkey: Account Delegation Automatic (Recommended)</p> </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-md-4 control-label">Upload public key</label>
-      <div class="col-md-4">
-	<input type="file" name="user_public_key" class="required" id="user_public_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-md-4"><p class="form-hint">Account Delegation: Manual (Advanced Users)</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">
-      <div class="col-md-offset-4 col-md-4">
-	<button class="submit btn btn-default" type="submit">Register</button>
-      </div>
+      <button class="submit btn btn-default col-xs-12" type="submit">Register</button>
+    </div>
     </div>
+  </fieldset>
   </form>  
 </div>