X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fonelab%2Fonelab_registration_view.html;h=7f1f81af7760c5cdb73064920ffb5a440824465b;hb=ff2d326c9f0ef02fd70e3b0c312d6ec5c5af0ca4;hp=17a76cf72d60d725516f1b09d73f8959d29d8b05;hpb=1b68666dd63a5eae6b2e6f8cc9de22c898388491;p=unfold.git

diff --git a/portal/templates/onelab/onelab_registration_view.html b/portal/templates/onelab/onelab_registration_view.html
index 17a76cf7..7f1f81af 100644
--- a/portal/templates/onelab/onelab_registration_view.html
+++ b/portal/templates/onelab/onelab_registration_view.html
@@ -9,32 +9,32 @@
 </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>
+		  {% for error in errors %}
+		  <li>{{ error }}</li>
+		  {% endfor %}
+		</ul>
+	</div>
+</div>
 {% endif %}
-
-
 <div class="row">
-	
 	<div class="col-md-12">
-			
 			<div class="form-group">
 				<form action="/register" class="cmxform form-horizontal" method="post" enctype="multipart/form-data">
+
 				{% 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>
@@ -102,8 +102,9 @@
 	<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. <br />
+	    	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>
 	</div>
@@ -113,11 +114,10 @@
 		<div class="form-group" id="register">
 			<p></p>	
 	    	<input class="submit btn btn-onelab" type="submit" value="Sign up" />
-
+	    	</form>
 	    </div>
 	</div>
 </div>
-</form>
 
 	<!-- Modal - columns selector -->
 <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -483,7 +483,7 @@
 
     
 <script>
-jQuery(document).ready(function(){
+$(document).ready(function(){
     var availableTags = [
     {% if authorities %}
         {% for authority in authorities %}
@@ -510,7 +510,7 @@ 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) {
@@ -524,9 +524,9 @@ jQuery(document).ready(function(){
       //select: function( event, ui ) {console.log(jQuery(this))}
     });
 	// for hover texts
-	jQuery('[title!=""]').qtip();
-	
-	$('form').submit(function() {
+	$('[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');