From efd6a77495dc7d01d9d5d620a9c7ca67c1d2431f Mon Sep 17 00:00:00 2001
From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Thu, 15 Jan 2015 17:37:41 +0100
Subject: [PATCH] fixed layout

---
 .../onelab/onelab_registration_view.html      | 67 ++++++++++---------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/portal/templates/onelab/onelab_registration_view.html b/portal/templates/onelab/onelab_registration_view.html
index 703b4af4..b7645700 100644
--- a/portal/templates/onelab/onelab_registration_view.html
+++ b/portal/templates/onelab/onelab_registration_view.html
@@ -7,11 +7,6 @@
 	<h1><img src="{{ STATIC_URL }}icons/user-xs.png" alt="User Registration" />User sign-up</h1>
 	</div>
 </div>
-<div class="row">
-	<div class="col-md-12">
-  		<p><strong>Questions? <a href="/contact" >Contact us.</a></strong></p>
-  </div>
-</div>
 {% if errors %}
 <div class="row">
 	<div class="col-md-12">
@@ -25,8 +20,8 @@
 {% 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">
+	<div class="col-md-6">
+	    <div>
 				{% csrf_token %}
 		  		<label for="authority_hrn" class="control-label">Organization</label>
 				<p></p>
@@ -58,48 +53,52 @@
                 </div>
 				<p></p>
 				<p>Organization not listed? <a href="/portal/join">Request its addition now.</a></p>
-			</div>
+		</div>
 	</div>
+	<div class="col-md-6">
+        <h4>
+            Questions? <a href="/contact" >Contact us.</a>
+       </h4>
+  </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>	
+		</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 />
-	    </div>
-	    <div class="form-group">
+	    </p>
+	    <p>
 			<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">
+	    </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 />
@@ -112,29 +111,31 @@
 </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>
 <div class="row">
 	<div class="col-md-10">
-		<div class="form-group" id="register">
+		<div id="register">
+		    <p>
 			<span class="glyphicon glyphicon-info-sign"></span> &nbsp;
 	    	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.
+	    	</p>
 	    </div>
 	</div>
 </div>
 <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>
-- 
2.47.0