X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fregistration_view.html;h=78d60171e5963b64178e121444eeddbc1325af61;hb=d594647fe25a8c0b7b75259624c09a01f6661db5;hp=e1a14ba2ba9fdbc1bcf099821c2b0785a0e0fe15;hpb=9255d7cf07e0bc63646de305be50dadd9171b520;p=myslice.git

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index e1a14ba2..78d60171 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -6,7 +6,8 @@
 	<h1><img src="{{ STATIC_URL }}icons/user-xs.png" alt="User Registration" />User sign-up</h1>
 </div>
 <div class="row">
-  		<h3>Questions? <a href="/portal/contact" >Contact us</a></h3>
+		<p></p>
+  		<p><strong>Questions? <a href="/portal/contact" >Contact us.</a></strong></p>
 </div>
 {% if errors %}
 <ul>
@@ -15,31 +16,38 @@
   {% endfor %}
 </ul>
 {% endif %}
-   
+<div class="row"><div class="col-sm-12">
 <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:530px" 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>
+		<p></p>
+  		<input id="authority_hrn" name="authority_hrn" class="form-control" style="width:530px" value="{{ authority_hrn }}" 
+  		title="Choose your organization (company/university) from the list that apears when you click in the field and start to type.
+		 Use the arrow keys to scroll through the list; type part of the name to narrow down the list. If it is not in the list, 
+		please add it by clicking the add organization link below. We will send an email to the managers that we have on record for 
+		your organization, asking them to validate your sign-up request." required/>
+		<p></p>
+		<p>Organization not listed? <a href="/portal/join">Add organization now.</a></p>
 	</div>
 
 	<div class="row">
 	<div class="col-md-4">
-
-    <div class="form-group">
-		<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">
-		<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 }}" 
-		title="Your e-mail address will be your identifier for logging in. We contact you to verify your account and then, occasionally, for important issues."
-		placeholder="Email" required/>
-	</div>
-</div>	
+	
+	    <div class="form-group">
+			<label for="firstname" class="control-label">Personal information</label>
+			<p></p>
+			<input type="text" name="firstname" class="form-control" style="width:200px" minlength="2" value="{{ first_name }}" placeholder="First name" required />
+	    </div>
+	    <div class="form-group">
+			<input type="text" name="lastname" size="25" class="form-control" style="width:200px" minlength="2" value="{{ last_name }}" placeholder="Last name" required />
+	    </div>
+		<div class="form-group">
+	    	<input type="email" name="email" size="25"  class="form-control" style="width:200px" value="{{ email }}" 
+			title="Your e-mail address will be your identifier for logging in. We contact you to verify your account and then, occasionally, for important issues."
+			placeholder="Email" required/>
+		</div>
+	</div>	
 
 	<!-- LOGIN
 	TODO: Login should be suggested from user email or first/last name, and
@@ -53,40 +61,42 @@
       <div class="col-xs-6"><p class="form-hint">Enter your login</p></div>
     </div>
 	-->
-<div class="col-md-4">
-    <div class="form-group">
-      <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 }}" 
-		title="Your password allows you to log in to this portal."
-		placeholder="Password" required/>
-    </div>
-    <div class="form-group">
-		<input type="password"  id="confirmpassword" name="confirmpassword" style="width:200px"  minlength="4" class="form-control" value="" 
-			placeholder="Confirm Password" required/>
-    </div>
-    <div class="form-group">
-    	<!--<label for="question" class="control-label">Keys</label> -->
-		<select name="question" class="form-control" style="width:200px" id="key-policy" 
-			title="Your public/private key pair allows you to access the testbeds." required>        
-	  		<option value="generate">Generate my keys for me (recommended)</option>
-	  		<option value="upload">Upload my public key (advanced users only)</option>
-		</select>
-    </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" 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="col-md-4">
+	    <div class="form-group">
+	      <label for="password" class="control-label">Authentication</label>
+		  <p></p>	
+	      <input type="password"  id="password" name="password"   class="form-control" style="width:200px" minlength="4" value="{{ password }}" 
+			title="Your password allows you to log in to this portal."
+			placeholder="Password" required/>
+	    </div>
+	    <div class="form-group">
+			<input type="password"  id="confirmpassword" name="confirmpassword" style="width:200px"  minlength="4" class="form-control" value="" 
+				placeholder="Confirm password" required/>
+	    </div>
+	    <div class="form-group">
+	    	<!--<label for="question" class="control-label">Keys</label> -->
+			<select name="question" class="form-control" style="width:200px" id="key-policy" 
+				title="Your public/private key pair allows you to access the testbeds." required>        
+		  		<option value="generate">Generate my keys for me (recommended)</option>
+		  		<option value="upload">Upload my public key (advanced users only)</option>
+			</select>
+	    </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" 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 
+				<a href="http://trac.myslice.info/wiki/InstallSfa" target="_blank">delegate your public key to the portal.</a>
+			</div>
+	    </div>
 	</div>
 	</div>
 
 	<div class="form-group">
+		<p></p>
 		<input type="checkbox" name="agreement" value="agreement" required/> I agree to the 
-		<button class="btn btn-primary btn-xs" data-toggle="modal" data-target="#myModal">terms and conditions</button> 
+		<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#myModal">terms and conditions.</button> 
 	</div>
 	<!-- Modal - columns selector -->
 		<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -98,7 +108,7 @@
       				</div>
       				<div class="modal-body">
 						<p align="left">
-    					TERMS AND CONDITIONS
+						<a href="/portal/terms" target="_blank">TERMS AND CONDITIONS</a>
     					<br/>
     					for OneLab Basic level service
     					<br/>
@@ -214,8 +224,7 @@
     Users who seek such guarantees are invited to consider a higher level of service.
 </p>
 <h2 align="left">
-    <a name="_Toc261537715">2.3 Limited</a>
-    liability
+    2.3 Limitedliability
 </h2>
 <p align="left">
     In no event shall the partners of the OneLab consortium be liable to any user for any consequential, incidental, punitive, or lost profit damages, or for
@@ -457,9 +466,11 @@
 		</div>
 
     <div class="form-group" id="register">
-      <button class="submit btn btn-default" type="submit">Sign up</button>
+		<p></p>	
+    	<button class="submit btn btn-primary" type="submit">Sign up</button>
     </div>
 </form>  
+</div>
 <script>
 jQuery(document).ready(function(){
     var availableTags = [
@@ -488,6 +499,7 @@ jQuery(document).ready(function(){
       }
       //select: function( event, ui ) {console.log(jQuery(this))}
     });
+	jQuery('[title!=""]').qtip();
 });
 </script>
 {% endblock %}