From 2b7a035352852f6ba9556cbb7e099c9a033576cb Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Wed, 28 May 2014 17:23:12 +0200
Subject: [PATCH] Registration Form: redesigned!

---
 portal/templates/registration_view.html | 60 +++++++++++++------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 5929f165..f32bb4c0 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -4,12 +4,12 @@
 
 <div class="row">
 	<div class="col-md-12">
-	<h1><img src="{{ STATIC_URL }}icons/user-xs.png" alt="User Registration" />Experimenter registration</h1>
+	<h1><img src="{{ STATIC_URL }}icons/user-xs.png" alt="User Registration" />User sign-up</h1>
 	</div>
 </div>
 <div class="row">
 	<div class="col-md-12">
-  		<h3>For First Line Support please <a href="/portal/contact" >Contact Support</a></h3>
+  		<h3>Questions? <a href="/portal/contact" >Contact us</a></h3>
 	</div>
 </div>
 {% if errors %}
@@ -25,19 +25,24 @@
 	<div class="col-md-8">
 	<form class="cmxform form-horizontal" id="registrationForm" method="post" enctype="multipart/form-data" role="form">
     {% csrf_token %}
+	<div class="form-group">
+  		<label for="authority_hrn" class="control-label">Organization</label>
+  		<input id="authority_hrn" name="authority_hrn" class="form-control" style="width:200px" value="{{ authority_hrn }}" required>
+  		<p class="help-block">Start typing to find the name of your organization (company or university).<br> If it is not in the list, <a href="/portal/join">please add it.</a></p>
+	</div>
+
     <div class="form-group">
-    	<label for="firstname" class="control-label">First Name</label>
-		<input type="text" name="firstname" class="form-control" minlength="2" value="{{ firstname }}" placeholder="First Name" required />
-    </div>
-    <div class="form-group">
-    	<label for="lastname" class="control-label">Last Name</label>
-		<input type="text" name="lastname" size="25" class="form-control" minlength="2" value="{{ lastname }}" placeholder="Last Name" required />
+		<label for="firstname" class="control-label">Personal Information</label>
+		<input type="text" name="firstname" class="form-control" style="width:200px" minlength="2" value="{{ firstname }}" placeholder="First Name" required />
     </div>
     <div class="form-group">
-      <label for="authority_hrn" class="control-label">Authority</label>
-      <input id="authority_hrn" name="authority_hrn" class="form-control" value="{{ authority_hrn }}" required>
-      <p class="help-block">An authority responsible for vetting your account</p>
+		<input type="text" name="lastname" size="25" class="form-control" style="width:200px" minlength="2" value="{{ lastname }}" placeholder="Last Name" required />
     </div>
+	<div class="form-group">
+    	<input type="email" name="email" size="25"  class="form-control" style="width:200px" value="{{ email }}" placeholder="Email" required/>
+		<p class="help-block">Your e-mail address will be your identifier for logging in.<br> We contact you to verify your account and then, occasionally, for important issues. </p>
+	</div>
+
 
 	<!-- LOGIN
 	TODO: Login should be suggested from user email or first/last name, and
@@ -53,36 +58,35 @@
 	-->
 
     <div class="form-group">
-    	<label for="email" class="control-label">Email</label>
-    	<input type="email" name="email" size="25"  class="form-control" value="{{ email }}" required/>
-    </div>
-    <div class="form-group">
-      <label for="password" class="control-label">Password</label>
-      <input type="password"  id="password" name="password"   class="form-control" minlength="4" value="{{ password }}" required/>
+      <label for="password" class="control-label">Authentication</label>
+      <input type="password"  id="password" name="password"   class="form-control" style="width:200px" minlength="4" value="{{ password }}" placeholder="Password" required/>
     </div>
     <div class="form-group">
-    	<label for="password" class="control-label">Confirm Password</label>
-		<input type="password"  id="confirmpassword" name="confirmpassword"   minlength="4" class="form-control" value="" placeholder="Confirm Password" required/>
+		<input type="password"  id="confirmpassword" name="confirmpassword" style="width:200px"  minlength="4" class="form-control" value="" placeholder="Confirm Password" required/>
+		<p class="help-block">Your password allows you to log in to this portal.</p>
     </div>
     <div class="form-group">
-    	<label for="question" class="control-label">My Keys</label>
-		<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>
+    	<!--<label for="question" class="control-label">Keys</label> -->
+		<select name="question" class="form-control" style="width:200px" id="key-policy" required>        
+	  		<option value="generate">Generate my keys for me (recommended)</option>
+	  		<option value="upload">Upload my public key (advanced users only)</option>
 		</select>
-      	<p class="help-block">Genkey: Account Delegation Automatic (Recommended)</p>
+		<p class="help-block">Your public/private key pair allows you to access the testbeds.</p>
     </div>
     <div class="form-group" style="display:none;" id="upload_key">
       	<label for="file" class="control-label">Upload public key</label>
-      	<input type="file" name="user_public_key" class="form-control" id="user_public_key" required>
+      	<input type="file" name="user_public_key" class="form-control" style="width:200px" id="user_public_key" required/>
       	<br />
 		<div class="alert alert-danger" id="pkey_del_msg">
-			Once your account is validated, you will have to delegate your credentials manually using SFA [Advanced users only]
+			In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to i
+			<a href="http://trac.myslice.info/wiki/InstallSfa" target="_blank">delegate your public key to the portal.</a>
 		</div>
-      	<p class="help-block">Account Delegation: Manual (Advanced Users)</p>
     </div>
+	<div class="form-group">
+		<input type="checkbox" required /> I agree to the terms and conditions.
+	</div>
     <div class="form-group" id="register">
-      <button class="submit btn btn-default" type="submit">Register</button>
+      <button class="submit btn btn-default" type="submit">Sign up</button>
     </div>
   </form>  
 </div>
-- 
2.43.0