user-sign up: update email template

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 2fbdf23..f2fe7b9 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -68,7 +68,7 @@ class RegistrationView (FreeAccessView, ThemeView):
                 'password'      : wsgi_request.POST.get('password',      ''),
                 'current_site'  : current_site,
                 'email_hash'    : email_hash,
-                'validation_link': 'https://' + current_site + '/portal/email_activation/'+ email_hash
+                'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash
             }
 
             # Construct user_hrn from email (XXX Should use common code)

diff --git a/portal/templates/activate_user.html b/portal/templates/activate_user.html
index 5437867..ada08c8 100644 (file)
--- a/portal/templates/activate_user.html
+++ b/portal/templates/activate_user.html
@@ -1,9 +1,8 @@
 <img src="https://onelab.eu/templates/onelab2/images/logo.png">
 <br>
 <p>We have received a user signup request for your email address at {{current_site}}</p>
-<br>
 <p>You have the following user details:</p>
-<br>
+
 Organisation: {{authority_hrn}}<br>
 First name: {{first_name}}<br>
 Last name: {{last_name}}<br>
@@ -13,7 +12,7 @@ Email: {{email}}<br>
 <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>
-<br>
+
 <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> 
@@ -23,8 +22,7 @@ You may now log in to the portal using your email address and the password that
 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>
-<br>
 <p>
-We look forward to welcoming you to OneLab. You will find answers to frequently asked questions <a href="/portal/support/">here</a>. 
-Please don't hesitate to <a href="/portal/contact/">contact us</a> with any additional questions that you might have.
+We look forward to welcoming you to OneLab. You will find answers to frequently asked questions <a href="{{current_site}}/portal/support/">here</a>. 
+Please don't hesitate to <a href="{{current_site}}/portal/contact/">contact us</a> with any additional questions that you might have.
 </p>