From: Loic Baron <loic.baron@lip6.fr>
Date: Sun, 27 Jul 2014 02:51:00 +0000 (-0300)
Subject: Customizing user email activation page and organizations in the registration
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=07a26b0488b574d1500d1079bc4d72bef0d71c24;p=myslice.git

Customizing user email activation page and organizations in the registration
---

diff --git a/portal/templates/fibre/fibre_registration_view.html b/portal/templates/fibre/fibre_registration_view.html
index 4b57f8bb..a1ab866b 100644
--- a/portal/templates/fibre/fibre_registration_view.html
+++ b/portal/templates/fibre/fibre_registration_view.html
@@ -167,7 +167,39 @@ $(document).ready(function(){
 		{% if authority.authority_hrn == "fibre.ufrj" %}
 			{value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DO RIO DE JANEIRO"},
 		{% else %}
-			{value:"{{ authority.authority_hrn }}",label:"FIBRE"},
+                      {% if authority.authority_hrn == "fibre.ufg" %}
+                              {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DE GOIAS"},
+                      {% else %}
+                              {% if authority.authority_hrn == "fibre.uff" %}
+                                     {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL FLUMINENSE"},
+                              {% else %}
+                                     {% if authority.authority_hrn == "fibre.ufpa" %}
+                                             {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DO PARA"},
+                                     {% else %}
+                                             {% if authority.authority_hrn == "fibre.ufpe" %}
+                                                     {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DE PERNAMBUCO"},
+                                             {% else %}
+                                                     {% if authority.authority_hrn == "fibre.ufscar" %}
+                                                            {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE FEDERAL DE SAO CARLOS"},
+                                                     {% else %}
+                                                            {% if authority.authority_hrn == "fibre.unifacs" %}
+                                                                     {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE SALVADOR"},
+                                                            {% else %}
+                                                                     {% if authority.authority_hrn == "fibre.usp" %}
+                                                                            {value:"{{ authority.authority_hrn }}",label:"UNIVERSIDADE DE SAO PAULO"},
+                                                                     {% else %}
+                                                                            {% if authority.authority_hrn == "fibre.cpqd" %}
+                                                                                    {value:"{{ authority.authority_hrn }}",label:"CENTRO DE PESQUISA E DESENVOLVIMENTO EM TELECOMUNICACOES"},
+                                                                            {% else %}
+		                                                                    {value:"{{ authority.authority_hrn }}",label:"FIBRE"},
+   		                                                            {% endif %}
+	                                                             {% endif %}
+	                                                    {% endif %}
+	                                            {% endif %}
+                                             {% endif %}
+                                    {% endif %}
+                              {% endif %}
+		      {% endif %}
 		{% endif %}
             {% endif %}
         {% endfor %}    
diff --git a/portal/templates/fibre/fibre_user_register_complete.html b/portal/templates/fibre/fibre_user_register_complete.html
new file mode 100644
index 00000000..2bd2f0a2
--- /dev/null
+++ b/portal/templates/fibre/fibre_user_register_complete.html
@@ -0,0 +1,18 @@
+{% extends "layout.html" %}
+
+{% block content %}
+
+<div class="row">
+	<h1><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="User Registration" /> User sign-up</h1>
+</div>
+<div class="row">
+  <h3>Sign up information received.</h3>
+  <p>You can now log in to the portal. You will have limited access. </p>
+  <p>To gain full access, two steps are required:</p>
+  <ul>
+	<li>1. You confirm your signup request by clicking on the link in the email that we have sent to your email address.</li>
+	<li>2. A manager from your organization validates your request. (We have sent email to your organisation's registered managers.)</li>
+  </ul>		
+</div>
+
+{% endblock %}