Merge "Make static OPNFV references dynamic"

6 files changed, 13 insertions, 13 deletions

diff --git a/src/templates/base/notifier/email_ended.txt b/src/templates/base/notifier/email_ended.txt
index 1788e00..33a1ec5 100644
--- a/src/templates/base/notifier/email_ended.txt
+++ b/src/templates/base/notifier/email_ended.txt
@@ -1,9 +1,9 @@
 {{user_name|default:"Developer"}},
 
 {% if owner %}
-The booking you requested from the OPNFV Lab as a Service has ended.
+The booking you requested from the {{booking.lab.project}} Lab  has ended.
 {% else %}
-The booking you collaborated on at the OPNFV Lab as a Service has ended.
+The booking you collaborated on at the {{booking.lab.project}} Lab has ended.
 {% endif %}
 
 booking information:
@@ -20,6 +20,6 @@ You may visit the following link for more information:
 
 Feel free to create another booking with us!
 
-Thank you for contributing to the OPNFV platform!
+Thank you for contributing to the {{booking.lab.project}} platform!
 
     - The Lab-as-a-Service team
diff --git a/src/templates/base/notifier/email_expiring.txt b/src/templates/base/notifier/email_expiring.txt
index 72c9a83..d78e59f 100644
--- a/src/templates/base/notifier/email_expiring.txt
+++ b/src/templates/base/notifier/email_expiring.txt
@@ -1,9 +1,9 @@
 {{user_name|default:"Developer"}},
 
 {% if owner %}
-The booking you requested from the OPNFV Lab as a Service is about to expire.
+The booking you requested from the {{booking.lab.project}} lab is about to expire.
 {% else %}
-The booking you collaborate on at the OPNFV Lab as a Service is about to expire.
+The booking you collaborate on at the {{booking.lab.project}} lab is about to expire.
 {% endif %}
 
 booking information:
@@ -20,6 +20,6 @@ You may visit the following link for more information:
 
 Please take the time to backup all data or extend the booking if needed.
 
-Thank you for contributing to the OPNFV platform!
+Thank you for contributing to the {{booking.lab.project}} platform!
 
     - The Lab-as-a-Service team
diff --git a/src/templates/base/notifier/email_fulfilled.txt b/src/templates/base/notifier/email_fulfilled.txt
index 90d294a..e3e07f9 100644
--- a/src/templates/base/notifier/email_fulfilled.txt
+++ b/src/templates/base/notifier/email_fulfilled.txt
@@ -1,7 +1,7 @@
 {{user_name|default:"Developer"}},
 
 {% if owner %}
-The booking you requested of the OPNFV Lab as a Service has finished deploying and is ready for you to use.
+The booking you requested of the {{booking.lab.project}} lab has finished deploying and is ready for you to use.
 {% else %}
 A booking you collaborate on is ready for you to use
 {% endif %}
@@ -16,6 +16,6 @@ The lab that fulfilled your booking request has sent you the following messages:
 You may visit the following link for more information:
 {{booking_url}}
 
-Thank you for contributing to the OPNFV platform!
+Thank you for contributing to the {{booking.lab.project}} platform!
 
     - The Lab-as-a-Service team
diff --git a/src/templates/base/notifier/end_booking.html b/src/templates/base/notifier/end_booking.html
index a2981c1..ebad027 100644
--- a/src/templates/base/notifier/end_booking.html
+++ b/src/templates/base/notifier/end_booking.html
@@ -4,11 +4,11 @@
             {% if owner %}
             <h3>Your booking has expired</h3>
             <p>Your booking has ended and the machines have been cleaned up.</p>
-            <p>Thank you for working on OPNFV, and feel free to book more machines if you need them.</p>
+            <p>Thank you for working on {{booking.lab.project}}, and feel free to book more machines if you need them.</p>
             {% else %}
             <h3>A booking that you collaborated on has expired</h3>
             <p>The booking owned by {{booking.owner.username}} that you worked on has ended</p>
-            <p>Thank you for contributing to OPNFV!</p>
+            <p>Thank you for contributing to {{booking.lab.project}}.</p>
             {% endif %}
             <p>Booking information:</p>
             <ul>
@@ -22,7 +22,7 @@
                 <li>collaborators:
                     <ul>
                         {% for user in booking.collaborators.all %}
-                        <li>user.username</li>
+                        <li>{{user.username}}</li>
                         {% empty %}
                         <li>No collaborators</li>
                         {% endfor %}
diff --git a/src/templates/base/notifier/expiring_booking.html b/src/templates/base/notifier/expiring_booking.html
index 8bfa689..89042fe 100644
--- a/src/templates/base/notifier/expiring_booking.html
+++ b/src/templates/base/notifier/expiring_booking.html
@@ -21,7 +21,7 @@
                 <li>collaborators:
                     <ul>
                         {% for user in booking.collaborators.all %}
-                        <li>user.username</li>
+                        <li>{{user.username}}</li>
                         {% empty %}
                         <li>No collaborators</li>
                         {% endfor %}
diff --git a/src/templates/base/notifier/new_booking.html b/src/templates/base/notifier/new_booking.html
index 64244e0..7580694 100644
--- a/src/templates/base/notifier/new_booking.html
+++ b/src/templates/base/notifier/new_booking.html
@@ -20,7 +20,7 @@
                 <li>collaborators:
                     <ul>
                         {% for user in booking.collaborators.all %}
-                        <li>user.username</li>
+                        <li>{{user.username}}</li>
                         {% empty %}
                         <li>No collaborators</li>
                         {% endfor %}