X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fregistration_view.html;h=ee6c0d47d518376acd813f7ea9fe9e3f4e9b7973;hb=594732ab461c6a75a8778f41724f4224839b26a6;hp=3cdbecf3148dca2d2999cc2e958e20890ce0b610;hpb=c92bdf384d06da6780b776652e94ce5afed75127;p=myslice.git

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 3cdbecf3..ee6c0d47 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -3,11 +3,14 @@
 {% block content %}        
 
 <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">
-		<p></p>
+	<div class="col-md-12">
   		<p><strong>Questions? <a href="/portal/contact" >Contact us.</a></strong></p>
+  </div>
 </div>
 {% if errors %}
 <ul>
@@ -16,34 +19,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>
-		<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/>
-		<p></p>
-		<p>Organization not listed? <a href="/portal/join">Request its addition now.</a></p>
+<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 %}
+		  		<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/>
+				<p></p>
+				<p>Organization not listed? <a href="/portal/join">Request its addition now.</a></p>
+			</div>
 	</div>
+</div>
 
-	<div class="row">
-	<div class="col-md-4">
+<div class="row">
+	<div class="col-md-6">
 	
 	    <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 />
+			<input type="text" name="firstname" class="form-control" style="width:350px" 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 />
+			<input type="text" name="lastname" size="25" class="form-control" style="width:350px" 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 }}" 
+	    	<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/>
 		</div>
@@ -61,21 +68,21 @@
       <div class="col-xs-6"><p class="form-hint">Enter your login</p></div>
     </div>
 	-->
-	<div class="col-md-4">
+	<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:200px" minlength="4" value="{{ password }}" 
+	      <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/>
 	    </div>
 	    <div class="form-group">
-			<input type="password"  id="confirmpassword" name="confirmpassword" style="width:200px"  minlength="4" class="form-control" value="" 
+			<input type="password"  id="confirmpassword" name="confirmpassword" style="width:250px"  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" 
+			<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>        
 		  		<option value="generate">Generate my keys for me (recommended)</option>
 		  		<option value="upload">Upload my public key (advanced users only)</option>
@@ -91,13 +98,27 @@
 			</div>
 	    </div>
 	</div>
+</div>
+<div class="row">
+	<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 
+			<a href="#" data-toggle="modal" data-target="#myModal">terms and conditions.</a> 
+		</div>
 	</div>
-
-	<div class="form-group">
-		<p></p>
-		<input type="checkbox" name="agreement" value="agreement" required/> I agree to the 
-		<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#myModal">terms and conditions.</button> 
+</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>
+	    </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-dialog">
@@ -465,12 +486,7 @@
   			</div>
 		</div>
 
-    <div class="form-group" id="register">
-		<p></p>	
-    	<button class="submit btn btn-primary" type="submit">Sign up</button>
-    </div>
-</form>  
-</div>
+    
 <script>
 jQuery(document).ready(function(){
     var availableTags = [
@@ -478,15 +494,29 @@ jQuery(document).ready(function(){
         {% 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}}"},
+            {% else %}
+                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
             {% endif %}
         {% endfor %}    
     {% else %}
         {value:"",label:"No authority found !!!"}
     {% endif %}
     ];
+
+    console.log(availableTags);
+
+	// sorting the list
+	availableTags.sort(function(a,b){
+		var nameA=a.value.toLowerCase(), nameB=b.value.toLowerCase();
+		if (nameA < nameB) {
+    		return -1;
+		}
+		if (nameA > nameB) {
+    		return 1;
+		}
+	return 0;
+	}); 
+	// auto-complete the form
     jQuery( "#authority_hrn" ).autocomplete({
       source: availableTags,
       minLength: 0,