From: Yasin Date: Wed, 3 Dec 2014 16:46:01 +0000 (+0100) Subject: Fed4fire to Fed4FIRE X-Git-Tag: myslice-1.1~21 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=6035cf31001888b4b21c91ace8d758c9756f3fa8 Fed4fire to Fed4FIRE --- diff --git a/portal/templates/fed4fire/fed4fire_about.html b/portal/templates/fed4fire/fed4fire_about.html index 79789b51..b0c3b6d7 100644 --- a/portal/templates/fed4fire/fed4fire_about.html +++ b/portal/templates/fed4fire/fed4fire_about.html @@ -17,7 +17,7 @@

- Fed4Fire Portal is a central place to get acess to all Fed4FIRE testbeds.In order to get access to the portal, + Fed4FIRE Portal is a central place to get acess to all Fed4FIRE testbeds.In order to get access to the portal, an experimenter needs to register to the portal. The portal administrative body is responsible to accept or reject newly registered users.

diff --git a/portal/templates/fed4fire/fed4fire_email_default_recipients.txt b/portal/templates/fed4fire/fed4fire_email_default_recipients.txt index 83257e7c..b2de7ee4 100644 --- a/portal/templates/fed4fire/fed4fire_email_default_recipients.txt +++ b/portal/templates/fed4fire/fed4fire_email_default_recipients.txt @@ -1 +1 @@ -Fed4Fire Support +Fed4FIRE Support diff --git a/portal/templates/fed4fire/fed4fire_email_default_sender.txt b/portal/templates/fed4fire/fed4fire_email_default_sender.txt index 83257e7c..b2de7ee4 100644 --- a/portal/templates/fed4fire/fed4fire_email_default_sender.txt +++ b/portal/templates/fed4fire/fed4fire_email_default_sender.txt @@ -1 +1 @@ -Fed4Fire Support +Fed4FIRE Support diff --git a/portal/templates/fed4fire/fed4fire_slice_request_denied.html b/portal/templates/fed4fire/fed4fire_slice_request_denied.html index 84edf374..ca2b9107 100644 --- a/portal/templates/fed4fire/fed4fire_slice_request_denied.html +++ b/portal/templates/fed4fire/fed4fire_slice_request_denied.html @@ -1,8 +1,8 @@
-

Dear Fed4Fire user,

+

Dear Fed4FIRE user,

-

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

+

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


Slice name : {{slice_name}}
URL : {{url}}
@@ -11,8 +11,7 @@

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.

+

We wish you a fruitful user experience on Fed4FIRE.


Yours sincerely,

-

The Fed4Fire team

- +

The Fed4FIRE team

diff --git a/portal/templates/fed4fire/fed4fire_slice_request_denied.txt b/portal/templates/fed4fire/fed4fire_slice_request_denied.txt index 82827378..21897b49 100644 --- a/portal/templates/fed4fire/fed4fire_slice_request_denied.txt +++ b/portal/templates/fed4fire/fed4fire_slice_request_denied.txt @@ -1,4 +1,4 @@ -Dear Fed4Fire user, +Dear Fed4FIRE user, You have recently requested the following slice on the Fed4FIRE portal({{portal_url}}): @@ -8,8 +8,8 @@ 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. +We wish you a fruitful user experience on Fed4FIRE. Yours sincerely, -The Fed4Fire team +The Fed4FIRE team diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.html b/portal/templates/fed4fire/fed4fire_slice_request_email.html index 26636838..1a49a144 100644 --- a/portal/templates/fed4fire/fed4fire_slice_request_email.html +++ b/portal/templates/fed4fire/fed4fire_slice_request_email.html @@ -2,7 +2,7 @@

NEW SLICE REQUEST


-

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

+

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}}
@@ -15,7 +15,7 @@

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.

+

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 index c19289b2..5b7ccb0e 100644 --- a/portal/templates/fed4fire/fed4fire_slice_request_email.txt +++ b/portal/templates/fed4fire/fed4fire_slice_request_email.txt @@ -1,6 +1,6 @@ NEW SLICE REQUEST -You are receiving this request because we have you listed as a manager at an organization that uses Fed4Fire. +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}}