From: Yasin Rahman Date: Wed, 18 Mar 2015 13:45:09 +0000 (+0100) Subject: FIX templates: url http/https X-Git-Tag: myslice-1.3~53 X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=6008fbb9490e4cb70e52055bc2145f414992e232 FIX templates: url http/https --- diff --git a/portal/templates/activate_user.html b/portal/templates/activate_user.html index 9f165d0e..0692b0b3 100644 --- a/portal/templates/activate_user.html +++ b/portal/templates/activate_user.html @@ -10,7 +10,7 @@ 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: +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 OneLab. You will find answers to frequently asked questions here. -Please don't hesitate to contact us with any additional questions that you might have. +We look forward to welcoming you to OneLab. 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.html b/portal/templates/fed4fire/fed4fire_activate_user.html index 078c498e..4ad469b5 100644 --- a/portal/templates/fed4fire/fed4fire_activate_user.html +++ b/portal/templates/fed4fire/fed4fire_activate_user.html @@ -9,7 +9,7 @@ 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: +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. +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_slice_request_email.html b/portal/templates/fed4fire/fed4fire_slice_request_email.html index 770b78b0..6a26829d 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 5b7ccb0e..b530cda4 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: http://{{current_site}}/portal/validate +You can see new slice request in: {{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. diff --git a/portal/templates/fed4fire/fed4fire_user_request_email.html b/portal/templates/fed4fire/fed4fire_user_request_email.html index 14061334..e54d0bf4 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 49479477..e4cf19b5 100644 --- a/portal/templates/onelab/onelab_user_request_email.html +++ b/portal/templates/onelab/onelab_user_request_email.html @@ -14,9 +14,9 @@ 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 +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 index 83ec9d3c..ce8d5482 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: http://{{current_site}}/portal/validate +You can see new user request in the portal: {{current_site}}/portal/validate 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 4f869027..d76655e1 100644 --- a/portal/templates/slice_request_email.html +++ b/portal/templates/slice_request_email.html @@ -12,9 +12,9 @@ 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.

+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.

OneLab 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/slice_request_email.txt b/portal/templates/slice_request_email.txt index 997e7529..6188b532 100644 --- a/portal/templates/slice_request_email.txt +++ b/portal/templates/slice_request_email.txt @@ -10,9 +10,9 @@ Email : {{email}} Organization : {{organization}} Portal url : {{current_site}} -You can see new slice request in: http://{{current_site}}/portal/validate +You can see new slice request in: {{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, as described in the OneLab terms and conditions: - http://{{current_site}}/terms + {{current_site}}/terms 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. OneLab 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/smartfire/smartfire_activate_user.html b/portal/templates/smartfire/smartfire_activate_user.html index 48e01427..04884b0e 100644 --- a/portal/templates/smartfire/smartfire_activate_user.html +++ b/portal/templates/smartfire/smartfire_activate_user.html @@ -10,7 +10,7 @@ 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: +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 SmartFIRE. You will find answers to frequently asked questions here. -Please don't hesitate to contact us with any additional questions that you might have. +We look forward to welcoming you to SmartFIRE. 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/smartfire/smartfire_user_request_email.html b/portal/templates/smartfire/smartfire_user_request_email.html index ae8952c2..e9522ff3 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.

diff --git a/portal/templates/user_request_email.html b/portal/templates/user_request_email.html index f14eb832..37dfb521 100644 --- a/portal/templates/user_request_email.html +++ b/portal/templates/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.