Fed4fire to Fed4FIRE

diff --git a/portal/templates/fed4fire/fed4fire_about.html b/portal/templates/fed4fire/fed4fire_about.html
index 79789b5..b0c3b6d 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_about.html
+++ b/portal/templates/fed4fire/fed4fire_about.html
@@ -17,7 +17,7 @@
     <div class="tab-pane active row" id="about">
                <div class="col-md-12">
                        <p>
-                               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  <a href="/portal/register">register</a> to the portal. The portal administrative body
                                is responsible to accept or reject newly registered users.   
                        </p>

diff --git a/portal/templates/fed4fire/fed4fire_email_default_recipients.txt b/portal/templates/fed4fire/fed4fire_email_default_recipients.txt
index 83257e7..b2de7ee 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_email_default_recipients.txt
+++ b/portal/templates/fed4fire/fed4fire_email_default_recipients.txt
@@ -1 +1 @@
-Fed4Fire Support <contact@fed4fire.eu>
+Fed4FIRE Support <contact@fed4fire.eu>

diff --git a/portal/templates/fed4fire/fed4fire_email_default_sender.txt b/portal/templates/fed4fire/fed4fire_email_default_sender.txt
index 83257e7..b2de7ee 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_email_default_sender.txt
+++ b/portal/templates/fed4fire/fed4fire_email_default_sender.txt
@@ -1 +1 @@
-Fed4Fire Support <contact@fed4fire.eu>
+Fed4FIRE Support <contact@fed4fire.eu>

diff --git a/portal/templates/fed4fire/fed4fire_slice_request_denied.html b/portal/templates/fed4fire/fed4fire_slice_request_denied.html
index 84edf37..ca2b910 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_slice_request_denied.html
+++ b/portal/templates/fed4fire/fed4fire_slice_request_denied.html
@@ -1,8 +1,8 @@
 <img src="http://www.fed4fire.eu/uploads/media/fed4fire-logo.jpg">
 <br>
-<p>Dear Fed4Fire user,</p>
+<p>Dear Fed4FIRE user,</p>
 <p></p>
-<p>You have recently requested the following slice on the Fed4Fire portal({{portal_url}}):</p> 
+<p>You have recently requested the following slice on the Fed4FIRE portal({{portal_url}}):</p> 
 <br>
 <b>Slice name   :</b> {{slice_name}}<br>
 <b>URL          :</b> {{url}}<br>
@@ -11,8 +11,7 @@
 <p>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.</p>
 <br>
-<p>On behalf of the entire team, I wish you a fruitful user experience on Fed4Fire.</p>
+<p>We wish you a fruitful user experience on Fed4FIRE.</p>
 <br>
 <p>Yours sincerely,</p>
-<p>The Fed4Fire team</p>
-
+<p>The Fed4FIRE team</p>

diff --git a/portal/templates/fed4fire/fed4fire_slice_request_denied.txt b/portal/templates/fed4fire/fed4fire_slice_request_denied.txt
index 8282737..21897b4 100644 (file)
--- 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 2663683..1a49a14 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_slice_request_email.html
+++ b/portal/templates/fed4fire/fed4fire_slice_request_email.html
@@ -2,7 +2,7 @@
 <br>
 <h1>NEW SLICE REQUEST</h1>
 <br>
-<p>You are receiving this request because we have you listed as a manager at an organization that uses Fed4Fire.</p>
+<p>You are receiving this request because we have you listed as a manager at an organization that uses Fed4FIRE.</p>
 <p>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.</p>
 <br>
 <b>Slice name      :</b> {{slice_name}}</br>
@@ -15,7 +15,7 @@
 <p>You can see new slice request <a href="http://{{current_site}}/portal/validate">in the portal.</a><p>
 <p>Please be sure that you know the user who is requesting this slice, as you are responsible for his or her actions.</p>
 <p>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.</p>
-<p>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.</p>
+<p>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.</p>
 <p></p>
 <p>If you believe that you have received this message in error, or if you have any questions, kindly contact contact@fed4fire.eu</p>
 

diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.txt b/portal/templates/fed4fire/fed4fire_slice_request_email.txt
index c19289b..5b7ccb0 100644 (file)
--- 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}}