X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fjoin_view.html;h=8d1577ba84999cafee269e82c4e8d848885eb2e9;hb=9255d7cf07e0bc63646de305be50dadd9171b520;hp=576458adefa3dcf14a0638d714460596ddc0dee0;hpb=d251934bd71c678f552dc9a1d49c3f8efe102e1e;p=unfold.git

diff --git a/portal/templates/join_view.html b/portal/templates/join_view.html
index 576458ad..8d1577ba 100644
--- a/portal/templates/join_view.html
+++ b/portal/templates/join_view.html
@@ -4,17 +4,25 @@
 
 
 <div class="row">
-	<h1><img src="{{ STATIC_URL }}img/icon_testbed_small.png" alt="Join Federation" /> Join the OneLab Federation</h1>
+	<div class="col-md-12">
+	<h1><img src="{{ STATIC_URL }}icons/testbed-xs.png" alt="Join Federation" /> Add organization</h1>
+	</div>
 </div>
 <div class="row">
-	
-	<p>
-	OneLab welcomes companies, universities, and research laboratories to join the OneLab Federation of Testbeds. <br>
-	We are supported by the European Commision through its 7th Framework Programs and FIRE initiative (Future Internet Research and Experimentation), as well as by other national and international funding initiatives.
-	</p>
+	<div class="col-md-12">
+  		<h3>Questions? <a href="/portal/contact" >Contact us</a></h3>
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-12">
+	<h3>
+	Please provide information about your organization and designate a manager (you or another person) from your organization. <br>
+	</h3>
 	<p>
-	If you wish to become a new member of OneLab Federation, you should first consult the Membership Agreement.
+	OneLab is open to enterprise, to scientific researchers, and to educators. We grant manager access to people in positions of responsibility (e.g., executives, professors, senior researchers), and delegate to these managers the right to grant standard user access to other people in their organizations.
 	</p>
+	</div>
 </div>
 
 {% if errors %}
@@ -26,138 +34,84 @@
     </ul>
 </div>
 {% endif %}
-  
+<form id="joinForm" method="post">
 <div class="row">
-  <form action="" id="joinForm" method="post">
+  
   {% csrf_token %}
-    <fieldset>
-      <table>
-        <tr><td colspan="2"><h4>Site Information</h4></td></tr>
-        <tr>
-          <th><label for="site_name">Site name: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="site_name" name="site_name" value="{{ site_name }}" size="20" maxlength="40" class="form-control" required> </td>
-        </tr>
-       <tr>
-          <th><label for="root_authority_hrn">Root authority: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td> 
-               <select id="root_authority_hrn" name="root_authority_hrn" class="form-control" required>
-               {% if root_authorities %}
-                    {% for root_auth in root_authorities %}
-               <option>{{ root_auth.authority_hrn }}</option>
-                    {% endfor %}
-               {% endif %}
-               </select>
-<!--
+  <div class="col-md-4">
+  	<h3>Organization</h3>
+  	
+  	<div class="form-group">
+    	<input type="text" id="site_name" name="site_name" value="{{ site_name }}"  style="width:200px" placeholder="Name of organization"maxlength="40" class="form-control" required>
+    </div>
+	<!--<div class="form-group">
+    	<label for="root_authority_hrn">Root authority:</label>
+	    <select id="root_authority_hrn" name="root_authority_hrn" class="form-control" required>
+		   {% if root_authorities %}
+		        {% for root_auth in root_authorities %}
+		   <option>{{ root_auth.authority_hrn }}</option>
+		        {% endfor %}
+		   {% endif %}
+		</select> 
                <div class="ui-widget">
                    <input id="root_authority_hrn" name="root_authority_hrn" class="form-control" value="{{ root_authority_hrn }}" required>
                </div>
--->
-          </td>
-        </tr>
-        <tr>
-          <th><label for="site_authority">Site authority: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="site_authority" name="site_authority" value="{{ site_authority }}" size="10" maxlength="16" class="form-control" required> </td>
-        </tr>
-        <tr>
-          <th><label for="site_abbreviated_name">Abbreviated name: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="site_abbreviated_name" name="site_abbreviated_name" value="{{ site_abbreviated_name }}" size="20" maxlength="40" class="form-control" required> </td>
-        </tr>
-        <tr>
-          <th><label for="site_url">URL: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="site_url" name="site_url" value="{{ site_url }}" size="30" maxlength="128" class="form-control" required> </td>
-        </tr>
-        <tr>
-          <th><label for="site_latitude">Latitude: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="site_latitude" name="site_latitude" value="{{ site_latitude }}" size="10" maxlength="10" class="form-control" required> </td>
-        </tr>
-        <tr>
-          <th><label for="site_longitude">Longitude: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="site_longitude" name="site_longitude" value="{{ site_longitude }}" size="10" maxlength="10" class="form-control" required> </td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr><td colspan="2"><h4>Principal Investigator Information</h4></td></tr>
-        <tr>
-          <th><label for="pi_first_name">PI First Name: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="pi_first_name" name="pi_first_name" value="{{ pi_first_name }}" size="20" maxlength="20" class="form-control" required> </td>
-        </tr>
-        <tr>
-          <th><label for="pi_last_name">PI Last Name: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="pi_last_name" name="pi_last_name" value="{{ pi_last_name }}" size="20" maxlength="20" class="form-control" required> </td>
-        </tr>
+
+	</div> -->
+	<div class="form-group">
+    	<input type="text" id="address_city" name="address_city" value="{{ address_city }}" style="width:200px" placeholder="City" maxlength="20" class="form-control">
+  	</div>
+	<div class="form-group">   
+    	<input type="text" id="address_country" name="address_country" value="{{ address_country }}" style="width:200px" placeholder="Country" maxlength="20" class="form-control">
+	</div>
+
+	<div class="form-group">  
+        <input type="text" id="site_abbreviated_name" name="site_abbreviated_name" value="{{ site_abbreviated_name }}" style="width:200px" 
+		title="Maximum eight characters, joined, all lower case. Example: 'upmc' for Université Pierre et Marie Curie. This will be used by the system as an identifier for the organization." placeholder="Short name" maxlength="8" class="form-control" required>
+    </div>
+	<div class="form-group">  
+        <input type="text" id="site_url" name="site_url" value="{{ site_url }}" style="width:200px" placeholder="http://" maxlength="128" class="form-control" required>
+    </div>
+  </div>
+  
+  <div class="col-md-4">
+  	<h3>Manager</h3>
+
+	<div class="form-group">
+    	<input type="text" id="pi_first_name" name="pi_first_name" value="{{ pi_first_name }}" style="width:200px" placeholder="First name" maxlength="20" class="form-control" required>
+    </div>
+	<div class="form-group">    
+		<input type="text" id="pi_last_name" name="pi_last_name" value="{{ pi_last_name }}" style="width:200px" placeholder="Last name" maxlength="20" class="form-control" required>
 <!--
         <tr>
           <th><label class="" for="pi_title">PI Title: </label></th>
-          <td><input type="text" id="pi_title" name="pi_title" value="{{ pi_title }}" size="6" maxlength="6" class="form-text "> </td>
+          <td><input type="text" id="pi_title" name="pi_title" value="{{ pi_title }}" size="6" maxlength="6" class="form-control "> </td>
         </tr>
 -->
-        <tr>
-          <th><label for="pi_phone">PI Phone: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="pi_phone" name="pi_phone" value="{{ pi_phone }}" size="20" maxlength="20" class="form-control" required> </td>
-        </tr>
-        <tr>
-          <th><label for="pi_email">PI email: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="text" id="pi_email" name="pi_email" value="{{ pi_email }}" size="20" maxlength="40" class="form-control" required> </td>
-        </tr>
-        <tr>
-          <th><label for="pi_password">PI password: <span class="form-required" title="This field is required.">*</span></label></th>
-          <td><input type="password" id="pi_password" name="pi_password" value="" size="20" maxlength="20" class="form-control" required> </td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr><td colspan="2"><h4>Postal address</h4></td></tr>
-        <tr>
-          <th><label class="" for="address_line1">Address: </label></th>
-          <td><input type="text" id="address_line1" name="address_line1" value="{{ address_line1 }}" size="30" maxlength="40" class="form-text"> </td>
-        </tr>
-        <tr>
-          <th><label class="" for="address_line2">Address (2): </label></th>
-          <td><input type="text" id="address_line2" name="address_line2" value="{{ address_line2 }}" size="30" maxlength="40" class="form-text"> </td>
-        </tr>
-        <tr>
-          <th><label class="" for="address_line3">Address (3): </label></th>
-          <td><input type="text" id="address_line3" name="address_line3" value="{{ address_line3 }}" size="30" maxlength="40" class="form-text"> </td>
-        </tr>
-        <tr>
-          <th><label class="" for="address_city">City: </label></th>
-          <td><input type="text" id="address_city" name="address_city" value="{{ address_city }}" size="20" maxlength="20" class="form-text"> </td>
-        </tr>
-        <tr>
-          <th><label class="" for="address_postalcode">Postal Code: </label></th>
-          <td><input type="text" id="address_postalcode" name="address_postalcode" value="{{ address_postalcode }}" size="10" maxlength="10" class="form-text"> </td>
-        </tr>
-        <tr>
-          <th><label class="" for="address_state">State: </label></th>
-          <td><input type="text" id="address_state" name="address_state" value="{{ address_state }}" size="20" maxlength="20" class="form-text"> </td>
-        </tr>
-        <tr>
-          <th><label class="" for="address_country">Country: </label></th>
-          <td><input type="text" id="address_country" name="address_country" value="{{ address_country }}" size="20" maxlength="20" class="form-text "> </td>
-        </tr>
-        <tr><td colspan="2">&nbsp;</td></tr>
-        <tr><td colspan="2" style="text-align:center"><input type="submit" name="op" value="Register" class="form-submit"></td></tr>
-      </table>
-    </fieldset>
-  </form>
-</div>
+	</div>
+	<div class="form-group">
+    	<input type="email" id="pi_email" name="pi_email" value="{{ pi_email }}" style="width:200px" 
+		title="We may e-mail the manager as part of the validation process, and in case any issues arise with the use of the system."
+		placeholder="Email" maxlength="40" class="form-control" required>
+	</div>
+	<div class="form-group">
+    	<input type="tel" id="pi_phone" name="pi_phone" value="{{ pi_phone }}" 
+		title="We may phone the manager as part of the validation process, and in case any issues arise with the use of the system."
+		style="width:200px" placeholder="Phone number"  maxlength="20" class="form-control" required>
+    </div>
+	<div class="form-group">
+  		<input type="password"  id="password" name="pi_password"   class="form-control" style="width:200px" minlength="4" value="{{ password }}" placeholder="Password" required/>
+	</div>
+	<div class="form-group">
+    	<input type="password"  id="confirmpassword" name="confirmpassword" style="width:200px"  minlength="4" class="form-control" value="" placeholder="Confirm Password" required/>
+	</div>
 
-<div class="row">
-	<p>
-A membership agreement document will be sent to your email address as a PDF file.
-</p><p>
-Please print and sign a copy of the agreement and send it to:
-</p><p>
-Ciro Scognamiglio<br>
-UPMC - LIP6<br>
-Campus Jussieu<br>
-Couloir 26-00, bureau 102<br>
-Boite courrier 169<br>
-4 place Jussieu<br>
-F-75252 PARIS cedex 05 - FRANCE<br>
-</p><p>
-Once your membership has been processed we will contact you to welcome you as a member.
-</p><p>
-If you have any questions about membership, contact the <a href="/portal/contact" >OneLab Support team</a>.
-</p>
+	</div>
 </div>
+	<div class="form-group" >
+		<button type="submit" class="btn btn-default">Submit</button>
+	</div>
+</form>
 <script>
 /*
 jQuery(document).ready(function(){