From 18317fa64cd7eaabbbad9046fb5d84cf5d4748e8 Mon Sep 17 00:00:00 2001 From: Yasin Rahman Date: Wed, 8 Apr 2015 15:53:08 +0200 Subject: [PATCH] templates: validate url updated to /portal/institution#requests --- portal/templates/fed4fire/fed4fire_slice_request_email.html | 2 +- portal/templates/fed4fire/fed4fire_slice_request_email.txt | 2 +- portal/templates/fed4fire/fed4fire_user_request_email.html | 2 +- portal/templates/onelab/onelab_user_request_email.html | 2 +- portal/templates/onelab/onelab_user_request_email.txt | 2 +- portal/templates/slice_request_email.html | 2 +- portal/templates/slice_request_email.txt | 2 +- portal/templates/smartfire/smartfire_user_request_email.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.html b/portal/templates/fed4fire/fed4fire_slice_request_email.html index 6a26829d..8fc65698 100644 --- a/portal/templates/fed4fire/fed4fire_slice_request_email.html +++ b/portal/templates/fed4fire/fed4fire_slice_request_email.html @@ -12,7 +12,7 @@ Email : {{email}}
Portal url : {{current_site}}

-

You can see new slice request in the portal.

+

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.

diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.txt b/portal/templates/fed4fire/fed4fire_slice_request_email.txt index b530cda4..5e8d24da 100644 --- a/portal/templates/fed4fire/fed4fire_slice_request_email.txt +++ b/portal/templates/fed4fire/fed4fire_slice_request_email.txt @@ -10,7 +10,7 @@ Email : {{email}} Organization : {{organization}} Portal url : {{current_site}} -You can see new slice request in: {{current_site}}/portal/validate +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. diff --git a/portal/templates/fed4fire/fed4fire_user_request_email.html b/portal/templates/fed4fire/fed4fire_user_request_email.html index e54d0bf4..87717933 100644 --- a/portal/templates/fed4fire/fed4fire_user_request_email.html +++ b/portal/templates/fed4fire/fed4fire_user_request_email.html @@ -11,6 +11,6 @@ User hrn : {{user_hrn}}
Portal url : {{ current_site }}

-

You can validate the user here.

+

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/onelab/onelab_user_request_email.html b/portal/templates/onelab/onelab_user_request_email.html index e4cf19b5..f5f4573d 100644 --- a/portal/templates/onelab/onelab_user_request_email.html +++ b/portal/templates/onelab/onelab_user_request_email.html @@ -14,7 +14,7 @@ User hrn : {{user_hrn}}
Portal url : {{ current_site }}

-

You can see new user request in the portal.

+

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 diff --git a/portal/templates/onelab/onelab_user_request_email.txt b/portal/templates/onelab/onelab_user_request_email.txt index ce8d5482..68a82532 100644 --- a/portal/templates/onelab/onelab_user_request_email.txt +++ b/portal/templates/onelab/onelab_user_request_email.txt @@ -12,7 +12,7 @@ Email : {{email}} User hrn : {{user_hrn}} Portal url : {{ current_site }} -You can see new user request in the portal: {{current_site}}/portal/validate +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. diff --git a/portal/templates/slice_request_email.html b/portal/templates/slice_request_email.html index d76655e1..a9ca8f26 100644 --- a/portal/templates/slice_request_email.html +++ b/portal/templates/slice_request_email.html @@ -12,7 +12,7 @@ Email : {{email}}
Portal url : {{current_site}}

-

You can see new slice request in the portal.

+

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, as described in the OneLab terms and conditions.

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.

diff --git a/portal/templates/slice_request_email.txt b/portal/templates/slice_request_email.txt index 6188b532..0f3c5b94 100644 --- a/portal/templates/slice_request_email.txt +++ b/portal/templates/slice_request_email.txt @@ -10,7 +10,7 @@ Email : {{email}} Organization : {{organization}} Portal url : {{current_site}} -You can see new slice request in: {{current_site}}/portal/validate +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, as described in the OneLab terms and conditions: {{current_site}}/terms diff --git a/portal/templates/smartfire/smartfire_user_request_email.html b/portal/templates/smartfire/smartfire_user_request_email.html index e9522ff3..92c1cb4a 100644 --- a/portal/templates/smartfire/smartfire_user_request_email.html +++ b/portal/templates/smartfire/smartfire_user_request_email.html @@ -11,6 +11,6 @@ User hrn : {{user_hrn}}
Portal url : {{ current_site }}

-

You can validate the user here.

+

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.

-- 2.43.0