X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Ffibre%2Ffibre_registration_view.html;h=baa2e25e1c9ed9410add86398298dcd6c4f06f57;hb=583c62239bbf6be5222e170609e547349389c1c1;hp=4b57f8bb9690142f2f5ea0b04d0b2155a3fd6c1a;hpb=30fb08d8e61409fd0d7e88a59057134a59f8e7c8;p=unfold.git

diff --git a/portal/templates/fibre/fibre_registration_view.html b/portal/templates/fibre/fibre_registration_view.html
index 4b57f8bb..baa2e25e 100644
--- a/portal/templates/fibre/fibre_registration_view.html
+++ b/portal/templates/fibre/fibre_registration_view.html
@@ -33,10 +33,10 @@
 		  		<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 
+				please choose the FIBRE organization. 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>
+				<!-- <p>Organization not listed? <a href="/portal/join">Request its addition now.</a></p> -->
 			</div>
 	</div>
 </div>
@@ -57,15 +57,23 @@
 			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>
+		<div class="form-group">
+			<label for="Reasons" class="control-label" >Reasons for Applying</label>
+                	<p></p>
+			<textarea type="text" rows="4" cols="70" name="reasons" size="25" class="form-control" style="width:350px;height:60px"  minlength="5" maxlength="250" value="{{reasons}}" placeholder="Reasons for applying" title="Identify yourself and tell us more about your expectations to use the testbed." required ></textarea>
+		</div>
 	</div>	
 
 	<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:250px" minlength="4" value="{{ password }}" 
+			<input type="text" name="username" size="25" class="form-control" style="width:350px" minlength="5" value="{{ username }}" placeholder="Username" required />
+	    </div>
+            <div class="form-group">
+			<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 />
+			placeholder="Password" required />	
 	    </div>
 	    <div class="form-group">
 			<input type="password"  id="confirmpassword" name="confirmpassword" style="width:250px"  minlength="4" class="form-control" value="" 
@@ -102,7 +110,7 @@
 	<div class="col-md-12">
 		<div class="form-group" id="register">
 			<p></p>	
-	    	<input class="submit btn btn-onelab" type="submit" value="Sign up" />
+	    	<input class="submit btn btn-onelab" type="submit" value="Request My Account" />
 
 	    </div>
 	</div>
@@ -165,10 +173,62 @@ $(document).ready(function(){
                 {value:"{{ authority.name }}",label:"{{authority.name}}"},
             {% else %}
 		{% if authority.authority_hrn == "fibre.ufrj" %}
-			{value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DO RIO DE JANEIRO"},
-		{% else %}
-			{value:"{{ authority.authority_hrn }}",label:"FIBRE"},
-		{% endif %}
+                        {value:"{{ authority.authority_hrn }}",label:"UFRJ - UNIVERSIDADE FEDERAL DO RIO DE JANEIRO"},
+                {% else %}
+                      {% if authority.authority_hrn == "fibre.ufg" %}
+                              {value:"{{ authority.authority_hrn }}",label:"UFG - UNIVERSIDADE FEDERAL DE GOIAS"},
+                      {% else %}
+                              {% if authority.authority_hrn == "fibre.uff" %}
+                                     {value:"{{ authority.authority_hrn }}",label:"UFF - UNIVERSIDADE FEDERAL FLUMINENSE"},
+                              {% else %}
+                                     {% if authority.authority_hrn == "fibre.ufpa" %}
+                                             {value:"{{ authority.authority_hrn }}",label:"UFPA - UNIVERSIDADE FEDERAL DO PARA"},
+                                     {% else %}
+                                             {% if authority.authority_hrn == "fibre.ufpe" %}
+                                                     {value:"{{ authority.authority_hrn }}",label:"UFPE - UNIVERSIDADE FEDERAL DE PERNAMBUCO"},
+                                             {% else %}
+                                                     {% if authority.authority_hrn == "fibre.ufscar" %}
+                                                            {value:"{{ authority.authority_hrn }}",label:"UFSCAR - UNIVERSIDADE FEDERAL DE SAO CARLOS"},
+                                                     {% else %}
+                                                            {% if authority.authority_hrn == "fibre.unifacs" %}
+                                                                     {value:"{{ authority.authority_hrn }}",label:"UNIFACS - UNIVERSIDADE SALVADOR"},
+                                                            {% else %}
+                                                                     {% if authority.authority_hrn == "fibre.usp" %}
+                                                                            {value:"{{ authority.authority_hrn }}",label:"USP - UNIVERSIDADE DE SAO PAULO"},
+                                                                     {% else %}
+                                                                            {% if authority.authority_hrn == "fibre.cpqd" %}
+                                                                                    {value:"{{ authority.authority_hrn }}",label:"CPQD - CENTRO DE PESQUISA E DESENVOLVIMENTO EM TELECOMUNICACOES"},
+                                                                            {% else %}
+                                                                                    {% if authority.authority_hrn == "fibre.rnp" %}
+                                                                                             {value:"{{ authority.authority_hrn }}",label:"(Catch-all) RNP - REDE NACIONAL DE ENSINO E PESQUISA"},
+                                                                                    {% else %}
+		                 						    	{% if authority.authority_hrn == "fibre.i2cat" %}
+										        	{value:"{{ authority.authority_hrn }}",label:"I2CAT - FOUNDATION, RESEARCH AND INNOVATION IN THE INTERNET AREA"},
+										        {% else %}
+											        {% if authority.authority_hrn == "fibre.uth" %}
+                                                                                        	         {value:"{{ authority.authority_hrn }}",label:"UTH - UNIVERSITY OF THESSALY"},
+											        {% else %}
+												      {% if authority.authority_hrn == "fibre.bristol" %}
+                                                                                                	     {value:"{{ authority.authority_hrn }}",label:"UNIBRIS - UNIVERSITY OF BRISTOL"},
+												       {% else %}
+												             {% if authority.authority_hrn == "fibre.upmc" %}
+                                                                                                	            {value:"{{ authority.authority_hrn }}",label:"UPMC - UNIVERSITE PIERRE ET MARIE CURIE"},
+												             {% else %}
+                                                                                   		 	            {value:"{{ authority.authority_hrn }}",label:"FIBRE"},
+                         											{% endif %}
+  												{% endif %}
+											{% endif %}
+										{% endif %}
+                                                                            {% endif %}
+                                                                         {% endif %}
+                                                                     {% endif %}
+                                                            {% endif %}
+                                                    {% endif %}
+                                             {% endif %}
+                                    {% endif %}
+                              {% endif %}
+                      {% endif %}
+                {% endif %}
             {% endif %}
         {% endfor %}    
     {% else %}