Project emails: generic template works for both onelab and f4f

diff --git a/portal/templates/fed4fire/fed4fire_project_request_validated.txt b/portal/templates/fed4fire/fed4fire_project_request_validated.txt
deleted file mode 100644 (file)
index 559bbb5..0000000
--- a/portal/templates/fed4fire/fed4fire_project_request_validated.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Dear Fed4FIRE user,
-
-You have recently requested a project in the Fed4FIRE portal.
-
-Project name  : {{project_name}}
-Authority     : {{authority_hrn}}
-Email         : {{email}}
-Purpose       : {{purpose}}
-
-We are pleased to inform you that a manager from your institution has validated your project request on the Fed4FIRE portal. You can now create slices 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_project_request_denied.html b/portal/templates/project_request_denied.html
similarity index 57%
rename from portal/templates/fed4fire/fed4fire_project_request_denied.html
rename to portal/templates/project_request_denied.html
index 5c4916c..33532fd 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_project_request_denied.html
+++ b/portal/templates/project_request_denied.html
@@ -1,19 +1,19 @@
-<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png" width="80px">
+<img src="{{current_site}}/static/img/{{theme.logo}}" width="80px">
 <br>
-<p>Dear Fed4FIRE user,</p>
+<p>Dear {{theme.label}} user,</p>
 <p></p>
-<p>You have recently requested a project in the Fed4FIRE portal.</p>
+<p>You have recently requested a project in the {{theme}} portal.</p>
 <br>
 <b>Project name  :</b> {{project_name}}</br>
 <b>Authority     :</b> {{authority_hrn}}</br>
 <b>Email         :</b> {{email}}</br>
-<b>Purpose         :</b> {{purpose}}</br>
+<b>Purpose       :</b> {{purpose}}</br>
 <p></p>
 <br>
 <p>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.</p>
 <br>
-<p>We wish you a fruitful user experience on Fed4FIRE.</p>
+<p>We wish you a fruitful user experience on {{{{theme.label}}}}.</p>
 <br>
 <p>Yours sincerely,</p>
-<p>The Fed4FIRE team</p>
+<p>The {{{{theme.label}}}} team</p>

diff --git a/portal/templates/fed4fire/fed4fire_project_request_denied.txt b/portal/templates/project_request_denied.txt
similarity index 67%
rename from portal/templates/fed4fire/fed4fire_project_request_denied.txt
rename to portal/templates/project_request_denied.txt
index e5502d8..db95fc7 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_project_request_denied.txt
+++ b/portal/templates/project_request_denied.txt
@@ -1,6 +1,6 @@
-Dear Fed4FIRE user,
+Dear {{theme.label}} user,
 
-You have recently requested a project in the Fed4FIRE portal.
+You have recently requested a project in the {{theme.label}} portal.
 
 Project name  : {{project_name}}
 Authority     : {{authority_hrn}}
@@ -9,8 +9,8 @@ Purpose       : {{purpose}}
 
 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.
+We wish you a fruitful user experience on {{theme.label}}.
 
 Yours sincerely,
-The Fed4FIRE team
+The {{theme.label}} team
 

diff --git a/portal/templates/fed4fire/fed4fire_project_request_email.html b/portal/templates/project_request_email.html
similarity index 53%
rename from portal/templates/fed4fire/fed4fire_project_request_email.html
rename to portal/templates/project_request_email.html
index c93ab40..5422769 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_project_request_email.html
+++ b/portal/templates/project_request_email.html
@@ -1,21 +1,24 @@
-<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png" width="80px">
+<img src="{{current_site}}/static/img/{{theme.logo}}" width="80px">
 <br>
 <h1>NEW PROJECT 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 {{theme.label}}.</p>
 <p>A user from your organization has requested the creation of a new project.</p>
 <br>
 <b>Project name  :</b> {{project_name}}</br>
 <b>Authority     :</b> {{authority_hrn}}</br>
 <b>Email         :</b> {{email}}</br>
-<b>Purpose         :</b> {{purpose}}</br>
-<b>Portal url     :</b> {{current_site}}</br> 
+<b>Purpose       :</b> {{purpose}}</br>
+<b>Portal url   :</b> {{current_site}}</br> 
 <p></p>
 <p>You can see this new project request <a href="{{current_site}}/portal/institution#requests">in the portal.</a><p>
 <p>Please be sure that you know the user who is requesting this project, as you are responsible for his or her actions.</p>
 <p>And kindly ensure that the stated experiment purpose is clear.</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>{{theme.label}} 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>
-
+<p>If you believe that you have received this message in error, or if you have any questions, kindly contact contact@{{theme.theme}}.eu</p>
+<br>
+<p>Yours sincerely,</p>            
+<p>The {{{{theme.label}}}} team</p>
 
+{%# include theme|add:"_widget-email_footer.html" %}

diff --git a/portal/templates/fed4fire/fed4fire_project_request_email.txt b/portal/templates/project_request_email.txt
similarity index 68%
rename from portal/templates/fed4fire/fed4fire_project_request_email.txt
rename to portal/templates/project_request_email.txt
index f38fd8c..ab36c4c 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_project_request_email.txt
+++ b/portal/templates/project_request_email.txt
@@ -1,6 +1,6 @@
-NEW SLICE REQUEST
+NEW PROJECT 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 {{theme.label}}.
 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.
 
 Project name  : {{project_name}}
@@ -14,7 +14,7 @@ You can see this new project request in: {{current_site}}/portal/institution#req
 Please be sure that you know the user who is requesting this project, as you are responsible for his or her actions.
  
 And kindly ensure that the stated experiment purpose is clear. 
-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. 
+{{theme.label}} 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
+If you believe that you have received this message in error, or if you have any questions, kindly contact contact@{{theme.theme}}.eu
 

diff --git a/portal/templates/fed4fire/fed4fire_project_request_validated.html b/portal/templates/project_request_validated.html
similarity index 50%
rename from portal/templates/fed4fire/fed4fire_project_request_validated.html
rename to portal/templates/project_request_validated.html
index b8356dc..c3bf7c0 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_project_request_validated.html
+++ b/portal/templates/project_request_validated.html
@@ -1,8 +1,8 @@
-<img src="https://portal.fed4fire.eu/static/img/f4f-logo.png" width="80px">
+<img src="{{current_site}}/static/img/{{theme.logo}}" width="80px">
 <br>
-<p>Dear Fed4FIRE user,</p>
+<p>Dear {{theme.label}} user,</p>
 <p></p>
-<p>You have recently requested a project in the Fed4FIRE portal.</p>
+<p>You have recently requested a project in the {{theme.label}} portal.</p>
 <br>
 <b>Project name  :</b> {{project_name}}</br>
 <b>Authority     :</b> {{authority_hrn}}</br>
@@ -10,13 +10,13 @@
 <b>Purpose       :</b> {{purpose}}</br>
 <p></p>
 <p>
-       We are pleased to inform you that a manager from your institution has validated your project request on the Fed4FIRE portal. 
+       We are pleased to inform you that a manager from your institution has validated your project request on the {{theme.label}} portal. 
        You can now create slices and start experimenting.
 </p>
 <p></p>
-<p>We wish you a fruitful user experience with the Fed4FIRE portal.</p>
+<p>We wish you a fruitful user experience with the {{theme.label}} portal.</p>
 <p></p>
 <p>Yours sincerely,</p>
-<p>The Fed4FIRE team</p>
+<p>The {{theme.label}} team</p>
 
 

diff --git a/portal/templates/project_request_validated.txt b/portal/templates/project_request_validated.txt
new file mode 100644 (file)
index 0000000..7c8fb90
--- /dev/null
+++ b/portal/templates/project_request_validated.txt
@@ -0,0 +1,15 @@
+Dear {{theme.label}} user,
+
+You have recently requested a project in the {{theme.label}} portal.
+
+Project name  : {{project_name}}
+Authority     : {{authority_hrn}}
+Email         : {{email}}
+Purpose       : {{purpose}}
+
+We are pleased to inform you that a manager from your institution has validated your project request on the {{theme.label}} portal. You can now create slices and start experimenting.
+
+We wish you a fruitful user experience with the {{theme.label}} portal.
+
+Yours sincerely,
+The {{theme.label}} team

diff --git a/portal/templates/fed4fire/fed4fire_projectrequest_view.html b/portal/templates/projectrequest_view.html
similarity index 100%
rename from portal/templates/fed4fire/fed4fire_projectrequest_view.html
rename to portal/templates/projectrequest_view.html