X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fonelab%2Fonelab_registration_view.html;h=ad725404fb2a2cf692c832c4a8833b6880433de0;hb=05de472ba9bb9187e02e8d6b406eb8fb16b542f0;hp=2efee42b5b4857e537072b6c6cd9861283756b25;hpb=ec5bde32fc8594f89a5b07035d39bffc4608cb0d;p=unfold.git

diff --git a/portal/templates/onelab/onelab_registration_view.html b/portal/templates/onelab/onelab_registration_view.html
index 2efee42b..ad725404 100644
--- a/portal/templates/onelab/onelab_registration_view.html
+++ b/portal/templates/onelab/onelab_registration_view.html
@@ -9,29 +9,31 @@
 </div>
 <div class="row">
 	<div class="col-md-12">
-  		<p><strong>Questions? <a href="/portal/contact" >Contact us.</a></strong></p>
+  		<p><strong>Questions? <a href="/contact" >Contact us.</a></strong></p>
   </div>
 </div>
 {% if errors %}
-<ul>
-  {% for error in errors %}
-  <li>{{ error }}</li>
-  {% endfor %}
-</ul>
+<div class="row">
+	<div class="col-md-12">
+		<ul class="error">
+		  {% for error in errors %}
+		  <li>{{ error | safe }}</li>
+		  {% endfor %}
+		</ul>
+	</div>
+</div>
 {% endif %}
+				<form action="/register" class="cmxform form-horizontal" method="post" enctype="multipart/form-data">
 <div class="row">
 	<div class="col-md-12">
-		
 			<div class="form-group">
-				<form class="cmxform form-horizontal" id="registrationForm" method="post" enctype="multipart/form-data" role="form">
-			{% csrf_token %}
+				{% csrf_token %}
 		  		<label for="authority_hrn" class="control-label">Organization</label>
 				<p></p>
 		  		<input id="authority_hrn" name="org_name" class="form-control" style="width:590px" value="{{ organization }}" 
 		  		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 request its addition by clicking the 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/>
+				 Use the arrow keys to scroll through the list; type part of the name to narrow down the list. 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">Request its addition now.</a></p>
 			</div>
@@ -52,45 +54,32 @@
 		<div class="form-group">
 	    	<input type="email" name="email" size="25"  class="form-control" style="width:350px" 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/>
+			placeholder="Email" required />
 		</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="col-md-6">
 	    <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:250px" minlength="4" value="{{ password }}" 
 			title="Your password allows you to log in to this portal."
-			placeholder="Password" required/>
+			placeholder="Password" required />
 	    </div>
 	    <div class="form-group">
 			<input type="password"  id="confirmpassword" name="confirmpassword" style="width:250px"  minlength="4" class="form-control" value="" 
-				placeholder="Confirm password" required/>
+				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:350px" id="key-policy" 
-				title="Your public/private key pair allows you to access the testbeds." required>        
+				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/>
+	      	<input type="file" name="user_public_key" class="form-control" style="width:200px" id="user_public_key" />
 	      	<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 
@@ -103,7 +92,7 @@
 	<div class="col-md-12">
 		<div class="form-group">
 			<p></p>
-			<input type="checkbox" name="agreement" value="agreement" required/>&nbsp;&nbsp; I agree to the 
+			<input type="checkbox" name="agreement" value="agreement" required />&nbsp;&nbsp; I agree to the 
 			<a href="#" data-toggle="modal" data-target="#myModal">terms and conditions.</a> 
 		</div>
 	</div>
@@ -112,26 +101,25 @@
 	<div class="col-md-10">
 		<div class="form-group" id="register">
 			<span class="glyphicon glyphicon-info-sign"></span> &nbsp;
-	    	If you are a <b>PlanetLab Europe</b> fill in this form using the same email address that you currently use for your PlanetLab Europe account,
-	    	your existing credentials will be used to validate your OneLab account.
+	    	If you are a <b>PlanetLab Europe</b> user, please fill in this form using the same email address that you
+	    	 currently use for your PlanetLab Europe account.
+	    	Your existing credentials will be used to validate your OneLab account.
 	    	Please be sure to specify a different password for your new OneLab account.
 	    </div>
-	</form> 
 	</div>
 </div>
 <div class="row">
 	<div class="col-md-12">
 		<div class="form-group" id="register">
 			<p></p>	
-	    	<button class="submit btn btn-onelab" type="submit">Sign up</button>
+	    	<input class="submit btn btn-onelab" type="submit" value="Sign up" />
+	    	</form>
 	    </div>
-	</form> 
 	</div>
 </div>
-	
-	
+
 	<!-- Modal - columns selector -->
-		<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   			<div class="modal-dialog">
     			<div class="modal-content">
       				<div class="modal-header">
@@ -483,31 +471,26 @@
 <p align="left">
     In the case of suspected illegal activity, OneLab management might need, without prior notice, to notify the relevant authorities.
 </p>
-<div>
-    <div>
-        <div id="_com_1">
-        </div>
-    </div>
-</div>
+
       				</div>
       				<div class="modal-footer">
         				<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
       				</div>
     			</div>
   			</div>
-		</div>
+</div>
 
     
 <script>
-jQuery(document).ready(function(){
+$(document).ready(function(){
     var availableTags = [
     {% if authorities %}
         {% for authority in authorities %}
             {% if authority.name %}
                 {value:"{{ authority.name }}",label:"{{authority.name}}"},
-			// to show only full name
-           // {% else %}
-           //     {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
+			// show hrn if we don't have the name
+            {% else %}
+                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
             {% endif %}
         {% endfor %}    
     {% else %}
@@ -526,21 +509,25 @@ jQuery(document).ready(function(){
 	return 0;
 	}); 
 	// auto-complete the form
-    jQuery( "#authority_hrn" ).autocomplete({
+    $( "#authority_hrn" ).autocomplete({
       source: availableTags,
       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))}
     });
-	// for hover texts
-	jQuery('[title!=""]').qtip();
+	$('[title!=""]').qtip();
+	$("form").validate();
+	$("form").submit(function() {
+		if ($('select option:selected').val() == 'upload') {
+			if ($('input[name=user_public_key]').val() == '') {
+				alert('Please specify the key file to upload');
+				return false;
+			}
+		}
+	});
 });
 </script>
 {% endblock %}