From b39e43484b54f1ebcb689f343b09a2bde17d78ce Mon Sep 17 00:00:00 2001 From: Yasin Date: Wed, 3 Dec 2014 17:26:45 +0100 Subject: [PATCH] f4f: email templates migration --- .../fed4fire/fed4fire_email_activation.html | 21 +++++++++++++++++++ .../fed4fire_email_default_recipients.txt | 1 + .../fed4fire_email_default_sender.txt | 2 +- .../templates/fed4fire/fed4fire_footer.html | 1 + .../fed4fire_slice_request_denied.html | 18 ++++++++++++++++ .../fed4fire_slice_request_denied.txt | 15 +++++++++++++ .../fed4fire_slice_request_email.html | 21 ++++++++++++++----- .../fed4fire/fed4fire_slice_request_email.txt | 20 ++++++++++++++++++ .../fed4fire_slice_request_validated.html | 21 +++++++++++++++++++ .../fed4fire_slice_request_validated.txt | 15 +++++++++++++ .../fed4fire_user_request_denied.html | 11 ++++++++++ .../fed4fire/fed4fire_user_request_denied.txt | 8 +++++++ .../fed4fire/fed4fire_user_request_email.html | 5 +++++ .../fed4fire/fed4fire_user_request_email.txt | 14 +++++++++++++ .../fed4fire_user_request_validated.html | 14 +++++++++++++ .../fed4fire_user_request_validated.txt | 10 +++++++++ 16 files changed, 191 insertions(+), 6 deletions(-) create mode 100644 portal/templates/fed4fire/fed4fire_email_activation.html create mode 100644 portal/templates/fed4fire/fed4fire_email_default_recipients.txt create mode 100644 portal/templates/fed4fire/fed4fire_slice_request_denied.html create mode 100644 portal/templates/fed4fire/fed4fire_slice_request_denied.txt create mode 100644 portal/templates/fed4fire/fed4fire_slice_request_email.txt create mode 100644 portal/templates/fed4fire/fed4fire_slice_request_validated.html create mode 100644 portal/templates/fed4fire/fed4fire_slice_request_validated.txt create mode 100644 portal/templates/fed4fire/fed4fire_user_request_denied.html create mode 100644 portal/templates/fed4fire/fed4fire_user_request_denied.txt create mode 100644 portal/templates/fed4fire/fed4fire_user_request_email.txt create mode 100644 portal/templates/fed4fire/fed4fire_user_request_validated.html create mode 100644 portal/templates/fed4fire/fed4fire_user_request_validated.txt diff --git a/portal/templates/fed4fire/fed4fire_email_activation.html b/portal/templates/fed4fire/fed4fire_email_activation.html new file mode 100644 index 00000000..ae7627af --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_email_activation.html @@ -0,0 +1,21 @@ +{% extends "layout.html" %} + +{% block content %} + +
+

User RegistrationUser sign-up

+
+
+ {% if activation_status == 'success' %} +

Signup request confirmed.

+

You are currently able to log in to the portal using your email address and the password that you have provided; however, your access is still limited.

+

You will have full access as soon as your account is validated by a manager at your organization. We have sent an email to your organisation's managers with a validation request.

+ {%else%} +

Signup confirmation failed.

+

You have probably arrived at this page by clicking a confirmation link in an email that we have sent to you. + We have been unable to match the link that you have clicked to a signup request in our database.

+

Please contact support so that we may help you complete the signup process.

+ {%endif%} +
+ +{% endblock %} diff --git a/portal/templates/fed4fire/fed4fire_email_default_recipients.txt b/portal/templates/fed4fire/fed4fire_email_default_recipients.txt new file mode 100644 index 00000000..83257e7c --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_email_default_recipients.txt @@ -0,0 +1 @@ +Fed4Fire Support diff --git a/portal/templates/fed4fire/fed4fire_email_default_sender.txt b/portal/templates/fed4fire/fed4fire_email_default_sender.txt index c7ab51cd..83257e7c 100644 --- a/portal/templates/fed4fire/fed4fire_email_default_sender.txt +++ b/portal/templates/fed4fire/fed4fire_email_default_sender.txt @@ -1 +1 @@ -contact@fed4fire.eu +Fed4Fire Support diff --git a/portal/templates/fed4fire/fed4fire_footer.html b/portal/templates/fed4fire/fed4fire_footer.html index e69de29b..d4db4be5 100644 --- a/portal/templates/fed4fire/fed4fire_footer.html +++ b/portal/templates/fed4fire/fed4fire_footer.html @@ -0,0 +1 @@ + diff --git a/portal/templates/fed4fire/fed4fire_slice_request_denied.html b/portal/templates/fed4fire/fed4fire_slice_request_denied.html new file mode 100644 index 00000000..84edf374 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_slice_request_denied.html @@ -0,0 +1,18 @@ + +
+

Dear Fed4Fire user,

+

+

You have recently requested the following slice on the Fed4Fire portal({{portal_url}}):

+
+Slice name : {{slice_name}}
+URL : {{url}}
+Purpose : {{purpose}}
+
c +

We regret to inform you that, a manager of your institution has not confirmed your request. Please contact the manager of your institution for further information. +For any other queries, please contact us by replying to this email.

+
+

On behalf of the entire team, I wish you a fruitful user experience on Fed4Fire.

+
+

Yours sincerely,

+

The Fed4Fire team

+ diff --git a/portal/templates/fed4fire/fed4fire_slice_request_denied.txt b/portal/templates/fed4fire/fed4fire_slice_request_denied.txt new file mode 100644 index 00000000..342204a3 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_slice_request_denied.txt @@ -0,0 +1,15 @@ +Dear Fed4Fire user, + +You have recently requested the following slice on the Fed4fire portal({{portal_url}}): + +Slice name : {{slice_name}} +URL : {{url}} +Purpose : {{purpose}} + +We regret to inform you that, a manager of your institution has not confirmed your request. Please contact the manager of your institution for further information. For any other queries, please contact us by replying to this email. + +On behalf of the entire team, I wish you a fruitful user experience on Fed4Fire. + +Yours sincerely, +The Fed4Fire team + diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.html b/portal/templates/fed4fire/fed4fire_slice_request_email.html index 888e0322..26636838 100644 --- a/portal/templates/fed4fire/fed4fire_slice_request_email.html +++ b/portal/templates/fed4fire/fed4fire_slice_request_email.html @@ -2,10 +2,21 @@

NEW SLICE REQUEST


-slice name : {{slice_name}}
-number of nodes : {{number_of_nodes}}
-type of nodes : {{type_of_nodes}}
-purpose : {{purpose}}
-email : {{email}}
+

You are receiving this request because we have you listed as a manager at an organization that uses Fed4Fire.

+

A user from your organization has requested the creation of a new slice, which will allow him or her to reserve testbed resources to conduct an experiment.

+
+Slice name : {{slice_name}}
+URL : {{url}}
+Purpose : {{purpose}}
+Organization : {{organization}}
+Email : {{email}}
Portal url : {{current_site}}
+

+

You can see new slice request in the portal.

+

Please be sure that you know the user who is requesting this slice, as you are responsible for his or her actions.

+

And kindly ensure that the stated experiment purpose is clear, and, if there is a website that explains the website, that a URL is provided.

+

Fed4Fire and its affiliated testbeds exist purely to support useful and interesting work. To ensure the future of these environments, we need to know what work is actually being done.

+

+

If you believe that you have received this message in error, or if you have any questions, kindly contact contact@fed4fire.eu

+ diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.txt b/portal/templates/fed4fire/fed4fire_slice_request_email.txt new file mode 100644 index 00000000..c19289b2 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_slice_request_email.txt @@ -0,0 +1,20 @@ +NEW SLICE REQUEST + +You are receiving this request because we have you listed as a manager at an organization that uses Fed4Fire. +A user from your organization has requested the creation of a new slice, which will allow him or her to reserve testbed resources to conduct an experiment. + +Slice name : {{slice_name}} +URL : {{url}} +Purpose : {{purpose}} +Email : {{email}} +Organization : {{organization}} +Portal url : {{current_site}} + +You can see new slice request in: http://{{current_site}}/portal/validate +Please be sure that you know the user who is requesting this slice, as you are responsible for his or her actions. + +And kindly ensure that the stated experiment purpose is clear, and, if there is a website that explains the website, that a URL is provided. +Fed4FIRE and its affiliated testbeds exist purely to support useful and interesting work. To ensure the future of these environments, we need to know what work is actually being done. + +If you believe that you have received this message in error, or if you have any questions, kindly contact contact@fed4fire.eu + diff --git a/portal/templates/fed4fire/fed4fire_slice_request_validated.html b/portal/templates/fed4fire/fed4fire_slice_request_validated.html new file mode 100644 index 00000000..fbcbea86 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_slice_request_validated.html @@ -0,0 +1,21 @@ + +
+

Dear Fed4FIRE user,

+

+

You have recently requested a slice in the Fed4FIRE portal.

+
+Slice name : {{slice_name}}
+URL : {{url}}
+Purpose : {{purpose}}
+

+

+ We are pleased to inform you that a manager from your institution has validated your slice request on the Fed4FIRE portal. + You can now add resources to you slice and start experimenting. +

+

+

We wish you a fruitful user experience with the Fed4FIRE portal.

+

+

Yours sincerely,

+

The Fed4FIRE team

+ + diff --git a/portal/templates/fed4fire/fed4fire_slice_request_validated.txt b/portal/templates/fed4fire/fed4fire_slice_request_validated.txt new file mode 100644 index 00000000..5fe200fd --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_slice_request_validated.txt @@ -0,0 +1,15 @@ +Dear Fed4FIRE user, + +You have recently requested a slice in the OneLab portal. + +Slice name : {{slice_name}} +URL : {{url}} +Purpose : {{purpose}} + + +We are pleased to inform you that a manager from your institution has validated your slice request on the Fed4FIRE portal. You can now add resources to you slice and start experimenting. + +We wish you a fruitful user experience with the Fed4FIRE portal. + +Yours sincerely, +The Fed4FIRE team diff --git a/portal/templates/fed4fire/fed4fire_user_request_denied.html b/portal/templates/fed4fire/fed4fire_user_request_denied.html new file mode 100644 index 00000000..56f7f4f5 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_user_request_denied.html @@ -0,0 +1,11 @@ + +
+

Dear {{first_name}} {{last_name}},

+

+

You have recently registered as a user to Fed4FIRE portal. We are sorry to inform you that, a manager of your institution has rejected your request. Please contact the manager of your institution for further information. For any other queries, contact us by replying to this email.

+

+

We wish you all the best.

+

+

Yours sincerely,

+

The Fed4FIRE team

+ diff --git a/portal/templates/fed4fire/fed4fire_user_request_denied.txt b/portal/templates/fed4fire/fed4fire_user_request_denied.txt new file mode 100644 index 00000000..b3afba50 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_user_request_denied.txt @@ -0,0 +1,8 @@ +Dear {{first_name}} {{last_name}}, + +You have recently registered as a user to Fed4FIRE portal. We are sorry to inform you that, a manager of your institution has rejected your request. Please contact the manager of your institution for further information. For any other queries, contact us by replying to this email. + +We wish you all the best. + +Yours sincerely, +The Fed4FIRE team diff --git a/portal/templates/fed4fire/fed4fire_user_request_email.html b/portal/templates/fed4fire/fed4fire_user_request_email.html index 5c6801f9..60abd27e 100644 --- a/portal/templates/fed4fire/fed4fire_user_request_email.html +++ b/portal/templates/fed4fire/fed4fire_user_request_email.html @@ -4,8 +4,13 @@
First name : {{first_name}}
Last name : {{last_name}}
+Organization : {{organization}}
Authority hrn: {{authority_hrn}}
Public key : {{public_key}}
Email : {{email}}
User hrn : {{user_hrn}}
Portal url : {{ current_site }}
+

+

You can validate the user here.

+
+

Please note that the validation request will only become visible once the user has confirmed his/her email address.

diff --git a/portal/templates/fed4fire/fed4fire_user_request_email.txt b/portal/templates/fed4fire/fed4fire_user_request_email.txt new file mode 100644 index 00000000..17ce1842 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_user_request_email.txt @@ -0,0 +1,14 @@ +NEW USER REQUEST + +First name : {{first_name}} +Last name : {{last_name}} +Organization :{{organization}} +Authority hrn: {{authority_hrn}} +Public key : {{public_key}} +Email : {{email}} +User hrn : {{user_hrn}} +Portal url : {{ current_site }} + +Please note that the validation request will only become visible once the user has confirmed his/her email address. + + diff --git a/portal/templates/fed4fire/fed4fire_user_request_validated.html b/portal/templates/fed4fire/fed4fire_user_request_validated.html new file mode 100644 index 00000000..73e7a1e2 --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_user_request_validated.html @@ -0,0 +1,14 @@ + +
+

Dear {{first_name}} {{last_name}},

+

+

It is my pleasure to welcome you as a fully signed-up user of the Fed4FIRE portal. Fed4FIRE provides you with access to world class computer networking testbeds. Our aim at Fed4FIRE is to promote the use of these testbeds for research and development by industry, for scientific research, and for university level laboratory exercises.

+

+

+Your entry point for access to the testbeds is the Fed4FIRE portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or individual nodes on the testbed with your Fed4FIRE public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. The Fed4FIRE operations team is standing by at contact@fed4fire.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them. +

+

+

We wish you a fruitful user experience with the OneLab portal.

+

+

Yours sincerely,

+

THE Fed4FIRE team

diff --git a/portal/templates/fed4fire/fed4fire_user_request_validated.txt b/portal/templates/fed4fire/fed4fire_user_request_validated.txt new file mode 100644 index 00000000..40a1b03c --- /dev/null +++ b/portal/templates/fed4fire/fed4fire_user_request_validated.txt @@ -0,0 +1,10 @@ +Dear {{first_name}} {{last_name}}, + +It is my pleasure to welcome you as a fully signed-up user of the Fed4FIRE portal. Fed4FIRE provides you with access to world class computer networking testbeds. Our aim at Fed4FIRE is to promote the use of these testbeds for research and development by industry, for scientific research, and for university level laboratory exercises. + +Your entry point for access to the testbeds is the Fed4FIRE portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or to individual nodes on the testbed with your Fed4FIRE public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. TheFed4FIRE operations team is standing by at contact@fed4fire.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them. + +We wish you a fruitful user experience with the Fed4FIRE portal. + +Yours sincerely, +The Fed4FIRE team -- 2.43.0