X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fregistration_view.html;h=b7846e9203834246965601b432625e93a5dfb763;hb=3534bc6490b2b72a1afa0ab578d989b4cf1d5df0;hp=7bf479176143af6eb6bb517f14743037014e09af;hpb=7581e01d79eabd6ec8bae602e51d97978e9041d6;p=unfold.git

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 7bf47917..b7846e92 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -1,12 +1,17 @@
-{% extends "layout-unfold1.html" %}
+{% extends "layout.html" %}
 
-{% block unfold_main %}        
+{% block content %}        
 
-<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 class="row">
+	<div class="col-md-12">
+	<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>Questions? <a href="/portal/contact" >Contact us</a></h3>
+	</div>
 </div>
-
 {% if errors %}
 <ul>
   {% for error in errors %}
@@ -15,33 +20,29 @@
 </ul>
 {% endif %}
    
-<div class="well">
- <form class="cmxform form-horizontal" id="registrationForm" method="post" action="" enctype="multipart/form-data" role="form">
-    <fieldset>
+<div class="row">
+	<div class="col-md-2"></div>
+	<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="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>
+		<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="auth_list" class="col-xs-2 control-label">Authority</label>
-      <div class="col-xs-4">
-        <div class="ui-widget">
-            <input id="auth_list" class="form-control" required>
-        </div>
-     </div>
-      <div class="col-xs-6"><p class="form-hint">An authority responsible for vetting your account</p></div>
+		<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
@@ -57,50 +58,36 @@
 	-->
 
     <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>
+      <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="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>
+		<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="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>
+    	<!--<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">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="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>
+      	<label for="file" class="control-label">Upload public key</label>
+      	<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">
+			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>
     </div>
+	<div class="form-group">
+		<input type="checkbox" name="agreement" value="agreement" required/> I agree to the terms and conditions 
+	</div>
     <div class="form-group" id="register">
-      <button class="submit btn btn-default col-xs-12" type="submit">Register</button>
-    </div>
+      <button class="submit btn btn-default" type="submit">Sign up</button>
     </div>
-  </fieldset>
   </form>  
 </div>
 <script>
@@ -108,15 +95,28 @@ jQuery(document).ready(function(){
     var availableTags = [
     {% if authorities %}
         {% for authority in authorities %}
-        {value:"{{ authority.authority_hrn }}",label:"{{authority.name}}"},
+            {% if authority.name %}
+                {value:"{{ authority.authority_hrn }}",label:"{{authority.name}}"},
+            {% else %}
+                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
+            {% endif %}
         {% endfor %}    
     {% else %}
         {value:"",label:"No authority found !!!"}
     {% endif %}
     ];
-    $( "#auth_list" ).autocomplete({
+    jQuery( "#authority_hrn" ).autocomplete({
       source: availableTags,
-      select: function( event, ui ) {console.log(jQuery(this))}
+      minLength: 0,
+      change: function (event, ui) {
+          if(!ui.item){
+              //http://api.jqueryui.com/autocomplete/#event-change -
+              // The item selected from the menu, if any. Otherwise the property is null
+              //so clear the item for force selection
+              jQuery("#authority_hrn").val("");
+          }
+      }
+      //select: function( event, ui ) {console.log(jQuery(this))}
     });
 });
 </script>