Merge branch 'fibre' of ssh://git.onelab.eu/git/myslice into fibre

Conflicts:
	portal/registrationview.py

diff --cc portal/templates/fibre/fibre_activate_user.html
index 0000000,0000000..e14b018
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/portal/templates/fibre/fibre_activate_user.html
@@@ -1,0 -1,0 +1,28 @@@
++<img src="https://146.164.47.246:27486/static/img/fibre-logo.gif" width="200" height="100">
++<br>
++<p>We have received a user signup request for your email address at {{current_site}}</p>
++<p>You have the following user details:</p>
++
++Organization: {{organization}}<br>
++First name: {{first_name}}<br>
++Last name: {{last_name}}<br>
++Email: {{email}}<br>
++
++<p></p>
++<p>
++You may now log in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required:
++</p>
++
++<ul>
++<li>1. You confirm that you have indeed made this request by clicking on the following link: <br>
++      <a href={{validation_link}}>{{validation_link}}</a> 
++              <ul><li>If you did not make this request, we apologise. You may disregard this email or you may advise us the error by replying to this email.</li></ul>
++</li>
++<li>
++2. A manager from your organization validates your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request.
++</li>
++</ul>
++<p>
++We look forward to welcoming you to OneLab. You will find answers to frequently asked questions <a href="http://{{current_site}}/portal/support/">here</a>. 
++Please don't hesitate to <a href="http://{{current_site}}/portal/contact/">contact us</a> with any additional questions that you might have.
++</p>

diff --cc portal/templates/fibre/fibre_registration_view.html
index 474a1b8,474a1b8..4b57f8b
--- 1/portal/templates/fibre/fibre_registration_view.html
--- 2/portal/templates/fibre/fibre_registration_view.html
+++ b/portal/templates/fibre/fibre_registration_view.html
@@@ -164,7 -164,7 +164,11 @@@ $(document).ready(function()
              {% if authority.name %}
                  {value:"{{ authority.name }}",label:"{{authority.name}}"},
              {% else %}
--                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
++              {% 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 %}
              {% endif %}
          {% endfor %}    
      {% else %}