validation link and customization of user&slices email activation

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 909f2a1..df3f2dc 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -84,7 +84,7 @@ class RegistrationView (FreeAccessView, ThemeView):
                 'current_site'  : current_site,
                 'email_hash'    : email_hash,
                 'pi'            : '',
-                'validation_link': 'http://' + current_site + '/portal/email_activation/'+ email_hash
+                'validation_link': 'https://' + current_site + '/portal/email_activation/'+ email_hash
             }
 
             # Construct user_hrn from email (XXX Should use common code)

diff --git a/portal/templates/fibre/fibre_activate_user.html b/portal/templates/fibre/fibre_activate_user.html
index e14b018..3593639 100644 (file)
--- a/portal/templates/fibre/fibre_activate_user.html
+++ b/portal/templates/fibre/fibre_activate_user.html
@@ -1,4 +1,4 @@
-<img src="https://146.164.47.246:27486/static/img/fibre-logo.gif" width="200" height="100">
+<img src="https://146.164.47.246:27486/static/img/fibre-logo.gif" width="217" 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>
@@ -23,6 +23,6 @@ You may now log in to the portal using your email address and the password that
 </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.
+We look forward to welcoming you to Myslice. You will find answers to frequently asked questions <a href="https://{{current_site}}/portal/support/">here</a>. 
+Please don't hesitate to <a href="https://{{current_site}}/portal/contact/">contact us</a> with any additional questions that you might have.
 </p>

diff --git a/portal/templates/fibre/fibre_activate_user.txt b/portal/templates/fibre/fibre_activate_user.txt
new file mode 100644 (file)
index 0000000..0d3253a
--- /dev/null
+++ b/portal/templates/fibre/fibre_activate_user.txt
@@ -0,0 +1,24 @@
+We have received a user signup request for your email address at {{current_site}}
+
+You have the following user details:
+
+Organization: {{organization}}
+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 Myslice. 
+Please don't hesitate to contact us at support@fibre.org.br with any additional questions that you might have.
+
+
+

diff --git a/portal/templates/fibre/fibre_activate_user_email_subject.txt b/portal/templates/fibre/fibre_activate_user_email_subject.txt
new file mode 100644 (file)
index 0000000..0e76f7c
--- /dev/null
+++ b/portal/templates/fibre/fibre_activate_user_email_subject.txt
@@ -0,0 +1 @@
+{{current_site}} Portal user email activation

diff --git a/portal/templates/fibre/fibre_slice_request_email.html b/portal/templates/fibre/fibre_slice_request_email.html
new file mode 100644 (file)
index 0000000..fd140d7
--- /dev/null
+++ b/portal/templates/fibre/fibre_slice_request_email.html
@@ -0,0 +1,11 @@
+<img src="https://146.164.47.246:27486/static/img/fibre-logo.gif" width="217" height="100">
+<br>
+<h1>NEW SLICE REQUEST</h1>
+<br>
+<b>Slice name      :</b> {{slice_name}}</br>
+<b>URL                            :</b> {{exp_url}}</br>
+<b>Purpose         :</b> {{purpose}}</br>
+<b>Organization           :</b> {{organization}}</br>
+<b>Email           :</b> {{email}}</br>
+<b>Portal url     :</b> {{current_site}}</br> 
+

diff --git a/portal/templates/fibre/fibre_slice_request_email.txt b/portal/templates/fibre/fibre_slice_request_email.txt
new file mode 100644 (file)
index 0000000..c8a51b5
--- /dev/null
+++ b/portal/templates/fibre/fibre_slice_request_email.txt
@@ -0,0 +1,9 @@
+NEW SLICE REQUEST
+
+Slice name      : {{slice_name}}
+URL                    : {{exp_url}}
+Purpose         : {{purpose}}
+Email           : {{email}}
+Organization   : {{organization}}
+Portal url             : {{current_site}}
+

diff --git a/portal/templates/fibre/fibre_slice_request_email_subject.txt b/portal/templates/fibre/fibre_slice_request_email_subject.txt
new file mode 100644 (file)
index 0000000..e3988df
--- /dev/null
+++ b/portal/templates/fibre/fibre_slice_request_email_subject.txt
@@ -0,0 +1 @@
+Slice request submitted 

diff --git a/portal/templates/fibre/fibre_user_request_email.html b/portal/templates/fibre/fibre_user_request_email.html
index fa0e896..5a4c7eb 100644 (file)
--- a/portal/templates/fibre/fibre_user_request_email.html
+++ b/portal/templates/fibre/fibre_user_request_email.html
@@ -1,9 +1,9 @@
-<img src="https://onelab.eu/templates/onelab2/images/logo.png">
+<img src="https://146.164.47.246:27486/static/img/fibre-logo.gif" width="217" height="100">
 <br>
 <h1>NEW USER REQUEST</h1>
 <br>
-<p>You are receiving this request because we have you listed as a manager at an organization that uses OneLab.</p> 
-<p>If you believe that you have received this message in error, or if you have any questions, kindly contact support@onelab.eu.</p>
+<p>You are receiving this request because we have you listed as a manager at an organization that uses Myslice portal.</p> 
+<p>If you believe that you have received this message in error, or if you have any questions, kindly contact support@fibre.org.br.</p>
 <br>
 <b>First name   :</b> {{first_name}}<br>
 <b>Last name    :</b> {{last_name}}<br>
@@ -14,5 +14,5 @@
 <b>User hrn     :</b> {{user_hrn}}<br>
 <b>Portal url  :</b> {{ current_site }}<br>
 <p></p>
-<p>You can validate the user <a href="http://{{current_site}}/portal/validate">here</a>.<p>
-<p>Please note that the validation request will only become visible to you on the OneLab portal once the user has confirmed his/her email address.</p>
+<p>You can validate the user <a href="https://{{current_site}}/portal/validate">here</a>.<p>
+<p>Please note that the validation request will only become visible to you on the Myslice portal once the user has confirmed his/her email address.</p>

diff --git a/portal/templates/fibre/fibre_user_request_email.txt b/portal/templates/fibre/fibre_user_request_email.txt
index b782e71..e3a0418 100644 (file)
--- a/portal/templates/fibre/fibre_user_request_email.txt
+++ b/portal/templates/fibre/fibre_user_request_email.txt
@@ -1,7 +1,7 @@
 NEW USER REQUEST
 
-You are receiving this request because we have you listed as a manager at an organization that uses OneLab. 
-If you believe that you have received this message in error, or if you have any questions, kindly contact support@onelab.eu.
+You are receiving this request because we have you listed as a manager at an organization that uses Myslice portal. 
+If you believe that you have received this message in error, or if you have any questions, kindly contact support@fibre.org.br.
 
 First name   : {{first_name}}
 Last name    : {{last_name}} 
@@ -12,8 +12,8 @@ Email        : {{email}}
 User hrn     : {{user_hrn}}
 Portal url   : {{ current_site }}
 
-You can validate the user here: http://{{current_site}}/portal/validate
+You can validate the user here: https://{{current_site}}/portal/validate
 
-Please note that the validation request will only become visible to you on the OneLab portal once the user has confirmed his/her email address.
+Please note that the validation request will only become visible to you on the Myslice portal once the user has confirmed his/her email address.
 
 

diff --git a/portal/templates/fibre/fibre_user_request_email_subject.txt b/portal/templates/fibre/fibre_user_request_email_subject.txt
new file mode 100644 (file)
index 0000000..a373b60
--- /dev/null
+++ b/portal/templates/fibre/fibre_user_request_email_subject.txt
@@ -0,0 +1 @@
+User request submitted