From e1091940983901862271235173f9e8fe44ad933d Mon Sep 17 00:00:00 2001 From: Yasin Rahman Date: Tue, 12 May 2015 15:03:00 +0200 Subject: [PATCH] Generic Templates for all portals: Migrations & Modifs --- myslice/settings.py | 1 + portal/templates/activate_user.html | 6 ++-- portal/templates/activate_user.txt | 6 ++-- portal/templates/contact_support_email.html | 2 +- .../contact_support_email_subject.txt | 2 +- .../fed4fire/fed4fire_activate_user.html | 28 ------------------- .../fed4fire/fed4fire_activate_user.txt | 7 ----- .../fed4fire_contact_support_email.html | 4 +-- .../fed4fire_contact_support_email.txt | 6 ---- .../fed4fire/fed4fire_email_activation.html | 21 -------------- .../fed4fire_join_request_denied.html | 18 ------------ .../fed4fire/fed4fire_join_request_denied.txt | 15 ---------- .../fed4fire/fed4fire_join_request_email.html | 18 ------------ .../fed4fire/fed4fire_join_request_email.txt | 19 ------------- .../fed4fire_join_request_validated.html | 20 ------------- .../fed4fire_join_request_validated.txt | 14 ---------- .../fed4fire_slice-request-done-view.html | 14 ---------- .../fed4fire_slice_request_denied.html | 17 ----------- .../fed4fire_slice_request_denied.txt | 15 ---------- .../fed4fire_slice_request_email.html | 22 --------------- .../fed4fire/fed4fire_slice_request_email.txt | 20 ------------- .../fed4fire_slice_request_validated.html | 21 -------------- .../fed4fire_slice_request_validated.txt | 15 ---------- .../fed4fire_user_register_complete.html | 21 -------------- .../fed4fire_user_request_denied.html | 11 -------- .../fed4fire/fed4fire_user_request_denied.txt | 8 ------ .../fed4fire/fed4fire_user_request_email.html | 16 ----------- .../fed4fire/fed4fire_user_request_email.txt | 14 ---------- .../onelab/onelab_user_request_email.html | 22 --------------- .../onelab/onelab_user_request_email.txt | 21 -------------- portal/templates/project_request_denied.html | 6 ++-- portal/templates/project_request_email.html | 4 +-- portal/templates/slice-request-done-view.html | 4 +-- portal/templates/slice_request_denied.html | 2 +- portal/templates/slice_request_email.html | 15 ++++++---- portal/templates/slice_request_email.txt | 12 ++++---- portal/templates/slice_request_validated.html | 19 ++++++------- portal/templates/slice_request_validated.txt | 18 ++++++------ portal/templates/user_register_complete.html | 23 ++++++++------- portal/templates/user_request_denied.html | 10 +++---- portal/templates/user_request_denied.txt | 9 ++---- portal/templates/user_request_email.html | 16 +++++++---- portal/templates/user_request_email.txt | 8 ++++-- 43 files changed, 85 insertions(+), 485 deletions(-) delete mode 100644 portal/templates/fed4fire/fed4fire_activate_user.html delete mode 100644 portal/templates/fed4fire/fed4fire_activate_user.txt delete mode 100644 portal/templates/fed4fire/fed4fire_contact_support_email.txt delete mode 100644 portal/templates/fed4fire/fed4fire_email_activation.html delete mode 100644 portal/templates/fed4fire/fed4fire_join_request_denied.html delete mode 100644 portal/templates/fed4fire/fed4fire_join_request_denied.txt delete mode 100644 portal/templates/fed4fire/fed4fire_join_request_email.html delete mode 100644 portal/templates/fed4fire/fed4fire_join_request_email.txt delete mode 100644 portal/templates/fed4fire/fed4fire_join_request_validated.html delete mode 100644 portal/templates/fed4fire/fed4fire_join_request_validated.txt delete mode 100644 portal/templates/fed4fire/fed4fire_slice-request-done-view.html delete mode 100644 portal/templates/fed4fire/fed4fire_slice_request_denied.html delete mode 100644 portal/templates/fed4fire/fed4fire_slice_request_denied.txt delete mode 100644 portal/templates/fed4fire/fed4fire_slice_request_email.html delete mode 100644 portal/templates/fed4fire/fed4fire_slice_request_email.txt delete mode 100644 portal/templates/fed4fire/fed4fire_slice_request_validated.html delete mode 100644 portal/templates/fed4fire/fed4fire_slice_request_validated.txt delete mode 100644 portal/templates/fed4fire/fed4fire_user_register_complete.html delete mode 100644 portal/templates/fed4fire/fed4fire_user_request_denied.html delete mode 100644 portal/templates/fed4fire/fed4fire_user_request_denied.txt delete mode 100644 portal/templates/fed4fire/fed4fire_user_request_email.html delete mode 100644 portal/templates/fed4fire/fed4fire_user_request_email.txt delete mode 100644 portal/templates/onelab/onelab_user_request_email.html delete mode 100644 portal/templates/onelab/onelab_user_request_email.txt diff --git a/myslice/settings.py b/myslice/settings.py index 04d96e67..fc09fc34 100644 --- a/myslice/settings.py +++ b/myslice/settings.py @@ -90,6 +90,7 @@ MANAGERS = ADMINS #DEFAULT_FROM_EMAIL = "root@theseus.ipv6.lip6.fr" #EMAIL_HOST_PASSWORD = "mypassword" +DEFAULT_FROM_EMAIL = "OneLab Support " EMAIL_HOST = "localhost" EMAIL_PORT = 25 EMAIL_USE_TLS = False diff --git a/portal/templates/activate_user.html b/portal/templates/activate_user.html index 0692b0b3..c46176b6 100644 --- a/portal/templates/activate_user.html +++ b/portal/templates/activate_user.html @@ -1,9 +1,9 @@ - +

We have received a user signup request for your email address at {{current_site}}

You have the following user details:

-Organization: {{organization}}
+Authority: {{authority_hrn}}
First name: {{first_name}}
Last name: {{last_name}}
Email: {{email}}
@@ -24,6 +24,6 @@ A manager from your organization must also validate your request. Upon confirmat

-We look forward to welcoming you to OneLab. You will find answers to frequently asked questions here. +We look forward to welcoming you to {{theme.label}}. You will find answers to frequently asked questions here. Please don't hesitate to contact us with any additional questions that you might have.

diff --git a/portal/templates/activate_user.txt b/portal/templates/activate_user.txt index a68d1ceb..5a433977 100644 --- a/portal/templates/activate_user.txt +++ b/portal/templates/activate_user.txt @@ -2,7 +2,7 @@ We have received a user signup request for your email address at {{current_site} You have the following user details: -Organization: {{organization}} +Authority: {{authority_hrn}} First name: {{first_name}} Last name: {{last_name}} Email: {{email}} @@ -17,8 +17,8 @@ You may now log in to the portal using your email address and the password that 2. A manager from your organization must also validate 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@onelab.eu with any additional questions that you might have. +We look forward to welcoming you to {{theme.label}}. +Please don't hesitate to contact us at support@{{theme.theme}}.eu with any additional questions that you might have. diff --git a/portal/templates/contact_support_email.html b/portal/templates/contact_support_email.html index 9848087b..54c11903 100644 --- a/portal/templates/contact_support_email.html +++ b/portal/templates/contact_support_email.html @@ -1,4 +1,4 @@ - +

User details


diff --git a/portal/templates/contact_support_email_subject.txt b/portal/templates/contact_support_email_subject.txt index dd21e446..e413c626 100644 --- a/portal/templates/contact_support_email_subject.txt +++ b/portal/templates/contact_support_email_subject.txt @@ -1 +1 @@ -OneLab support: user ticket +{{theme.label}} support: {{email}} submitted a query diff --git a/portal/templates/fed4fire/fed4fire_activate_user.html b/portal/templates/fed4fire/fed4fire_activate_user.html deleted file mode 100644 index e1fa009a..00000000 --- a/portal/templates/fed4fire/fed4fire_activate_user.html +++ /dev/null @@ -1,28 +0,0 @@ - -
-

We have received a user signup request for your email address at {{current_site}}

-

You have the following user details:

- -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: -

- - -

-We look forward to welcoming you to Fed4FIRE portal. You will find answers to frequently asked questions here. -Please don't hesitate to contact us with any additional questions that you might have. -

diff --git a/portal/templates/fed4fire/fed4fire_activate_user.txt b/portal/templates/fed4fire/fed4fire_activate_user.txt deleted file mode 100644 index b5eb224d..00000000 --- a/portal/templates/fed4fire/fed4fire_activate_user.txt +++ /dev/null @@ -1,7 +0,0 @@ -You have registered to {{current_site}} -Please validate your email address by clicking the following link: - -{{validation_link}} - - - diff --git a/portal/templates/fed4fire/fed4fire_contact_support_email.html b/portal/templates/fed4fire/fed4fire_contact_support_email.html index 74ca3da7..31096baa 100644 --- a/portal/templates/fed4fire/fed4fire_contact_support_email.html +++ b/portal/templates/fed4fire/fed4fire_contact_support_email.html @@ -4,5 +4,5 @@

Query details

-Subject : {{subject}} -Query : {{description}} +Subject : {{subject}} +Query : {{description}} diff --git a/portal/templates/fed4fire/fed4fire_contact_support_email.txt b/portal/templates/fed4fire/fed4fire_contact_support_email.txt deleted file mode 100644 index e6c0534d..00000000 --- a/portal/templates/fed4fire/fed4fire_contact_support_email.txt +++ /dev/null @@ -1,6 +0,0 @@ -email : {{email}} - -Query Details: - -Subject : {{subject}} -Description : {{description}} diff --git a/portal/templates/fed4fire/fed4fire_email_activation.html b/portal/templates/fed4fire/fed4fire_email_activation.html deleted file mode 100644 index ae7627af..00000000 --- a/portal/templates/fed4fire/fed4fire_email_activation.html +++ /dev/null @@ -1,21 +0,0 @@ -{% 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_join_request_denied.html b/portal/templates/fed4fire/fed4fire_join_request_denied.html deleted file mode 100644 index 5b98402c..00000000 --- a/portal/templates/fed4fire/fed4fire_join_request_denied.html +++ /dev/null @@ -1,18 +0,0 @@ - -
-

Dear Fed4FIRE user,

-

-

You have recently requested to join a project in the Fed4FIRE portal.

-
-Project name : {{project_name}}
-Authority : {{authority_hrn}}
-Email : {{email}}
-

-
-

We regret 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, please contact us by replying to this email.

-
-

We wish you a fruitful user experience on Fed4FIRE.

-
-

Yours sincerely,

-

The Fed4FIRE team

diff --git a/portal/templates/fed4fire/fed4fire_join_request_denied.txt b/portal/templates/fed4fire/fed4fire_join_request_denied.txt deleted file mode 100644 index 45bab221..00000000 --- a/portal/templates/fed4fire/fed4fire_join_request_denied.txt +++ /dev/null @@ -1,15 +0,0 @@ -Dear Fed4FIRE user, - -You have recently requested to join a project in the Fed4FIRE portal. - -Project name : {{project_name}} -Authority : {{authority_hrn}} -Email : {{email}} - -We regret 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, please contact us by replying to this email. - -We wish you a fruitful user experience on Fed4FIRE. - -Yours sincerely, -The Fed4FIRE team - diff --git a/portal/templates/fed4fire/fed4fire_join_request_email.html b/portal/templates/fed4fire/fed4fire_join_request_email.html deleted file mode 100644 index f7949d01..00000000 --- a/portal/templates/fed4fire/fed4fire_join_request_email.html +++ /dev/null @@ -1,18 +0,0 @@ - -
-

JOIN PROJECT REQUEST

-
-

You are receiving this request because we have you listed as a manager of a project that uses Fed4FIRE.

-

A user has requested to join your project, which will allow him or her to reserve testbed resources to conduct an experiment.

-
-Project name : {{project_name}}
-Authority : {{authority_hrn}}
-Email : {{email}}
-

-

You can accept or reject this request in the portal.

-

Please be sure that you know the user who is requesting to join your project.

-

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_join_request_email.txt b/portal/templates/fed4fire/fed4fire_join_request_email.txt deleted file mode 100644 index 57cc4d75..00000000 --- a/portal/templates/fed4fire/fed4fire_join_request_email.txt +++ /dev/null @@ -1,19 +0,0 @@ -JOIN PROJECT REQUEST - -You are receiving this request because we have you listed as a manager a project that uses Fed4FIRE. -A user has requested to join your project, which will allow him or her to reserve testbed resources to conduct an experiment. - -Project name : {{project_name}} -Authority : {{authority_hrn}} -Email : {{email}} - -You can accept or reject thisrequest in: -{{current_site}}/portal/project/{{authority_hrn}}.{{project_name}}#requests - - -Please be sure that you know the user who is requesting to join your project. - -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_join_request_validated.html b/portal/templates/fed4fire/fed4fire_join_request_validated.html deleted file mode 100644 index 62ec3123..00000000 --- a/portal/templates/fed4fire/fed4fire_join_request_validated.html +++ /dev/null @@ -1,20 +0,0 @@ - -
-

Dear Fed4FIRE user,

-

-

You have recently requested to join a project in the Fed4FIRE portal.

-
-Project name : {{project_name}}
-Authority : {{authority_hrn}}
-Email : {{email}}
-

-

- We are pleased to inform you that a project manager has validated your request on the Fed4FIRE portal. You have automatically been added to all existing slices in this project. You may also create new slices in this project 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_join_request_validated.txt b/portal/templates/fed4fire/fed4fire_join_request_validated.txt deleted file mode 100644 index 2b61cfec..00000000 --- a/portal/templates/fed4fire/fed4fire_join_request_validated.txt +++ /dev/null @@ -1,14 +0,0 @@ -Dear Fed4FIRE user, - -You have recently requested to join a project in the Fed4FIRE portal. - -Project name : {{project_name}} -Authority : {{authority_hrn}} -Email : {{email}} - -We are pleased to inform you that a project manager has validated your request on the Fed4FIRE portal. You have automatically been added to all existing slices in this project. You may also create new slices in this project 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-done-view.html b/portal/templates/fed4fire/fed4fire_slice-request-done-view.html deleted file mode 100644 index c848b06d..00000000 --- a/portal/templates/fed4fire/fed4fire_slice-request-done-view.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} - -

Success

- -Your slice has been created. You can view all your slices in the dashboard. - -{% endblock %} - diff --git a/portal/templates/fed4fire/fed4fire_slice_request_denied.html b/portal/templates/fed4fire/fed4fire_slice_request_denied.html deleted file mode 100644 index 7a1c12c8..00000000 --- a/portal/templates/fed4fire/fed4fire_slice_request_denied.html +++ /dev/null @@ -1,17 +0,0 @@ - -
-

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.

-
-

We 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 deleted file mode 100644 index 21897b49..00000000 --- a/portal/templates/fed4fire/fed4fire_slice_request_denied.txt +++ /dev/null @@ -1,15 +0,0 @@ -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. - -We 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 deleted file mode 100644 index 5a217d81..00000000 --- a/portal/templates/fed4fire/fed4fire_slice_request_email.html +++ /dev/null @@ -1,22 +0,0 @@ - -
-

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}}
-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 deleted file mode 100644 index 5e8d24da..00000000 --- a/portal/templates/fed4fire/fed4fire_slice_request_email.txt +++ /dev/null @@ -1,20 +0,0 @@ -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: {{current_site}}/portal/institution#requests -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 deleted file mode 100644 index 6fdcbbff..00000000 --- a/portal/templates/fed4fire/fed4fire_slice_request_validated.html +++ /dev/null @@ -1,21 +0,0 @@ - -
-

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 deleted file mode 100644 index a89be97a..00000000 --- a/portal/templates/fed4fire/fed4fire_slice_request_validated.txt +++ /dev/null @@ -1,15 +0,0 @@ -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_user_register_complete.html b/portal/templates/fed4fire/fed4fire_user_register_complete.html deleted file mode 100644 index bcecea03..00000000 --- a/portal/templates/fed4fire/fed4fire_user_register_complete.html +++ /dev/null @@ -1,21 +0,0 @@ -{% extends "layout.html" %} - -{% block content %} - -
-

User Registration User sign-up

-
-
-

Sign up information received.

-

You can now log in to the portal. You will have limited access.

-

To gain full access, two steps are required:

-
    -
  • 1. You confirm your signup request by clicking on the link in the email that we have sent to your email address.
    - Please be aware that it can happen that this email was automatically filtered to your spam box.
    - Please check your spam box if you do not receive the email in a few minutes
    • -
  • 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.
    • -
-
- -{% endblock %} diff --git a/portal/templates/fed4fire/fed4fire_user_request_denied.html b/portal/templates/fed4fire/fed4fire_user_request_denied.html deleted file mode 100644 index 9245cbd0..00000000 --- a/portal/templates/fed4fire/fed4fire_user_request_denied.html +++ /dev/null @@ -1,11 +0,0 @@ - -
-

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 deleted file mode 100644 index b3afba50..00000000 --- a/portal/templates/fed4fire/fed4fire_user_request_denied.txt +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index b9b090ff..00000000 --- a/portal/templates/fed4fire/fed4fire_user_request_email.html +++ /dev/null @@ -1,16 +0,0 @@ - -
-

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 }}
-

-

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 deleted file mode 100644 index 17ce1842..00000000 --- a/portal/templates/fed4fire/fed4fire_user_request_email.txt +++ /dev/null @@ -1,14 +0,0 @@ -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/onelab/onelab_user_request_email.html b/portal/templates/onelab/onelab_user_request_email.html deleted file mode 100644 index f5f4573d..00000000 --- a/portal/templates/onelab/onelab_user_request_email.html +++ /dev/null @@ -1,22 +0,0 @@ - -
-

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.

-
-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 see new user request in the portal.

-

Please note that the request will only become visible to you on the OneLab portal once the user has confirmed his/her email address.

-

Please only validate users who you know for whose actions you are prepared to take responsibility, as described in the -OneLab terms and conditions. If you find any anomalies in the request -(mistakes/spam/unauthorized persons) please notify us.

- diff --git a/portal/templates/onelab/onelab_user_request_email.txt b/portal/templates/onelab/onelab_user_request_email.txt deleted file mode 100644 index 68a82532..00000000 --- a/portal/templates/onelab/onelab_user_request_email.txt +++ /dev/null @@ -1,21 +0,0 @@ -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. - -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 see new user request in the portal: {{current_site}}/portal/institution#requests - -Please note that the request will only become visible to you on the OneLab portal once the user has confirmed his/her email address. - -Please only validate users who you know for whose actions you are prepared to take responsibility, as described in the OneLab terms and conditions. -If you find any anomalies in the request (mistakes/spam/unauthorized persons) please notify us at support@onelab.eu. - diff --git a/portal/templates/project_request_denied.html b/portal/templates/project_request_denied.html index 33532fda..2824e2df 100644 --- a/portal/templates/project_request_denied.html +++ b/portal/templates/project_request_denied.html @@ -2,7 +2,7 @@

Dear {{theme.label}} user,

-

You have recently requested a project in the {{theme}} portal.

+

You have recently requested a project in the {{theme.label}} portal.


Project name : {{project_name}}
Authority : {{authority_hrn}}
@@ -13,7 +13,7 @@

We regret 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, please contact us by replying to this email.


-

We wish you a fruitful user experience on {{{{theme.label}}}}.

+

We wish you a fruitful user experience on {{theme.label}}.


Yours sincerely,

-

The {{{{theme.label}}}} team

+

The {{theme.label}} team

diff --git a/portal/templates/project_request_email.html b/portal/templates/project_request_email.html index 5422769e..991127fb 100644 --- a/portal/templates/project_request_email.html +++ b/portal/templates/project_request_email.html @@ -19,6 +19,4 @@

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


Yours sincerely,

-

The {{{{theme.label}}}} team

- -{%# include theme|add:"_widget-email_footer.html" %} +

The {{theme.label}} team

diff --git a/portal/templates/slice-request-done-view.html b/portal/templates/slice-request-done-view.html index 9ab6807b..c848b06d 100644 --- a/portal/templates/slice-request-done-view.html +++ b/portal/templates/slice-request-done-view.html @@ -2,9 +2,9 @@ {% block content %} -

Slice created

+

Success

-As a manager of your institution, your slice has directly been created directly. +Your slice has been created. You can view all your slices in the dashboard.