User signup- templates updated

diff --git a/portal/templates/activate_user.html b/portal/templates/activate_user.html
index 362f879..5437867 100644 (file)
--- a/portal/templates/activate_user.html
+++ b/portal/templates/activate_user.html
@@ -1,8 +1,30 @@
 <img src="https://onelab.eu/templates/onelab2/images/logo.png">
 <br>
-<h1>You have registered to {{current_site}}</h1>
+<p>We have received a user signup request for your email address at {{current_site}}</p>
 <br>
-<h1>Please validate your email address by clicking the following link</h1>
+<p>You have the following user details:</p>
 <br>
-<a href={{validation_link}}>{{validation_link}}</a>
+Organisation: {{authority_hrn}}<br>
+First name: {{first_name}}<br>
+Last name: {{last_name}}<br>
+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> 
+               <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>
+</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>
+<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.
+</p>

diff --git a/portal/templates/activate_user.txt b/portal/templates/activate_user.txt
index b5eb224..0d2ca56 100644 (file)
--- a/portal/templates/activate_user.txt
+++ b/portal/templates/activate_user.txt
@@ -1,7 +1,24 @@
-You have registered to {{current_site}}
-Please validate your email address by clicking the following link:
+We have received a user signup request for your email address at {{current_site}}
 
-{{validation_link}}
+You have the following user details:
+
+Organisation: {{authority_hrn}}
+First name: {{first_name}}
+Last name: {{last_name}}
+Email: {{email}}
+
+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:
+
+       1. You confirm that you have indeed made this request by clicking on the following link:
+
+               {{validation_link}}
+
+               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.
+
+       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.
+
+We look forward to welcoming you to OneLab. 
+Please don't hesitate to contact us at support@myslice.info with any additional questions that you might have.
 
 
 

diff --git a/portal/templates/email_activation.html b/portal/templates/email_activation.html
index b9df80e..43feab2 100644 (file)
--- a/portal/templates/email_activation.html
+++ b/portal/templates/email_activation.html
@@ -3,20 +3,18 @@
 {% block content %}
 
 <div class="row">
-       <h1><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="User Registration" /> Experimenter registration</h1>
+       <h1><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="User Registration" />User sign-up</h1>
 </div>
 <div class="row">
        {%if activation_status == 'success'%}
-               <h3>Email activation complete !</h3>
-               <p>Your account is pending for validation.</p>
-               <p>PI of your institution is responsible for validating your account.</p>
-               <p>You will be notified once your account is validated.</p>
-               <p>In the meantime, you can login to the portal with your email and password and browse through the limited access features.</p>
+               <h3>Signup request confirmed.</h3>
+               <p>You are currently able to log in to the portal using your email address and the password that you provided, but your access is still limited.</p> 
+               <p>You will have full access as soon as your account is validated by a manager at your organization. We have sent an email to the managers with a validation request.</p>
        {%else%}
-               <h3>Email activation Failed !</h3>
-               <p>Your email address is not registered in our server.</p>
-               <p>Please <a href="/portal/register">register</a> to get access to the portal.</p> 
-               <p>If you have already registered and still having this message, please <a href="/portal/contact/">contact support.</a> </p>
+               <h3>Signup confirmation failed.</h3>
+               <p>You have probably arrived at this page by clicking a confirmation link in an email that we have sent to you. However, 
+               we have been unable to match the link that you have clicked to a signup request in our database.</p>
+               <p>Please <a href="/portal/contact/">contact support</a> so that we can help you complete the signup process.</p>
        {%endif%}
  </div>