X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fregistration_view.html;h=ec90abf9e18ac550f89ddbd840f3ae008bf7ccee;hb=197e6f2843398a696d18f4eb0e13b7fa52d8fece;hp=8ad3bf522c44af512bc050b8180bb845534f0d1f;hpb=8ab8c97ea4aecad8a74af3577115f4064dda362a;p=unfold.git

diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 8ad3bf52..ec90abf9 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -12,6 +12,7 @@
   		<p><strong>Questions? <a href="/contact" >Contact us.</a></strong></p>
   </div>
 </div>
+
 {% if errors %}
 <div class="row">
 	<div class="col-md-12">
@@ -23,10 +24,10 @@
 	</div>
 </div>
 {% endif %}
-				<form action="/register" class="cmxform form-horizontal" method="post" enctype="multipart/form-data">
+<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">
+	<div class="col-md-6">
+	    <div>
 				{% csrf_token %}
 		  		<label for="authority_hrn" class="control-label">Organization</label>
 				<p></p>
@@ -35,63 +36,63 @@
 		  		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. 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>
+                    <option value="">select an organization</option>
                 {% if authorities %}
                     {% for authority in authorities %}
                         {% if authority.name %}
-                            <option value="{{ authority.authority_hrn }}">{{authority.name}}</option>
+                                <option value="{{ authority.authority_hrn }}">{{authority.shortname}} - {{authority.name}}</option>
                         {% else %}
                             <option value="{{ authority.authority_hrn }}">{{authority.authority_hrn}}</option>
                         {% endif %}
-                    {% endfor %}    
+                    {% endfor %}               
                 {% else %}
                     <option value:"">No authority found !!!</option>
                 {% endif %}
                 </select>
                 </div>
 				<p></p>
-				<p>Organization not listed? <a href="/portal/join">Request its addition now.</a></p>
-			</div>
+                {% include theme|add:"_authority_notListed.html" %}
+		</div>
 	</div>
 </div>
 
 <div class="row">
 	<div class="col-md-6">
-	
-	    <div class="form-group">
+	   <p>
 			<label for="firstname" class="control-label">Personal information</label>
-			<p></p>
+	   </p>
+	   <p>
 			<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">
+	    </p>
+	    <p>
 			<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: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>
+	    </p>
+		<p>
+	    	<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 />
+		</p>
 	</div>	
 
 	<div class="col-md-6">
-	    <div class="form-group">
+	    <p>
 	      <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 }}" 
+		</p>	
+		<p>
+	      <input type="password"  id="password" name="password"   class="form-control" style="width:250px" minlength="8" 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:250px"  minlength="4" class="form-control" value="" 
+	    </p>
+	    <p>
+			<input type="password"  id="confirmpassword" name="confirmpassword" style="width:250px"  minlength="8" class="form-control" value="" 
 				placeholder="Confirm password" required />
-	    </div>
-	    <div class="form-group">
+	    </p>
+	    <p>
 			<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>
 			</select>
-	    </div>
-	    <div class="form-group" style="display:none;" id="upload_key">
+	    </p>
+	    <div 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" />
 	      	<br />
@@ -104,18 +105,19 @@
 </div>
 <div class="row">
 	<div class="col-md-12">
-		<div class="form-group">
-			<p></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>
+		</p>
 	</div>
 </div>
+{% include theme|add:"_register_info.html" %}
 <div class="row">
 	<div class="col-md-12">
-		<div class="form-group" id="register">
-			<p></p>	
+		<div id="register">
+			<p>
 	    	<input class="submit btn btn-onelab" type="submit" value="Sign up" />
+	    	</p>
 	    	</form>
 	    </div>
 	</div>
@@ -130,10 +132,7 @@
         					<h4 class="modal-title" id="myModalLabel">Terms & Conditions</h4>
       				</div>
       				<div class="modal-body">
-						<p align="left">
-							To be added soon.
-						</p>
-
+                    {% include theme|add:"_terms_and_conditions.html" %}
       				</div>
       				<div class="modal-footer">
         				<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -141,38 +140,19 @@
     			</div>
   			</div>
 </div>
-
     
 <script>
 $(document).ready(function(){
-    var availableTags = [
-    {% if authorities %}
-        {% for authority in authorities %}
-            {% if authority.name %}
-                {value:"{{ authority.authority_hrn }}",label:"{{authority.name}}"},
-			// show hrn if we don't have the name
-            {% else %}
-                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
-            {% endif %}
-        {% endfor %}    
-    {% else %}
-        {value:"",label:"No authority found !!!"}
-    {% endif %}
-    ];
-	// 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("#org_name").combobox();
+    
+    {% if theme == 'fed4fire' %}
+    //setting the default value in the org_list
+    var temp="fed4fire.global"; 
+    $("#org_name").val(temp);
+    {% endif %}
+
 	$('[title!=""]').qtip();
 	$("form").validate();
 	$("form").submit(function() {
@@ -186,4 +166,3 @@ $(document).ready(function(){
 });
 </script>
 {% endblock %}
-