Update notification email templates

galaxyproject · Apr 11, 2024 · 2674499 · 2674499
1 parent 25013ea
commit 2674499
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 24 deletions.
diff --git a/lib/galaxy/config/templates/mail/notifications/message-email.html b/lib/galaxy/config/templates/mail/notifications/message-email.html
@@ -13,12 +13,13 @@
 - name                      The user's name
 - user_email                The user's email
 - date                      Date and time of the notification
-- hostname                  Your galaxy's hostname
+- hostname                  Your galaxy's hostname (i.e. usegalaxy.* or the value in `server_name` from the galaxy config file)
 - contact_email             Your galaxy's contact email
 - notification_settings_url The URL to the user's notification settings to manage their subscriptions
 - content                   The message payload
   - subject                   The message subject
   - content                   The message content in HTML (converted from Markdown)
+- galaxy_url                The URL to the Galaxy instance (i.e. https://usegalaxy.*)
 
 Template begins here >>>>>>
 <!DOCTYPE html>
@@ -55,14 +56,20 @@
 
     <p style="font-size: 12pt;">
       Regards,<br>
-      Your Galaxy Team at {{ hostname }}
+      Your Galaxy Team at <a href="{{ galaxy_url }}">{{ hostname }}</a>
     </p>
 
     <p style="font-size: 10pt;">
-      This is an automated email. If you have any questions or concerns, please do not reply to this email, instead, contact us at <a href="mailto:{{ contact_email }}">{{ contact_email }}</a>.<br><br>
-
-      You received this email because you are subscribed to receive notifications of this type.
+      You received this email because you are subscribed to receive notifications from the Galaxy Team.
+      {% if notification_settings_url %}
       You can manage your notification settings <a href="{{ notification_settings_url }}">here</a>.
+      {% endif %}
+
+      <br>
+
+      {% if contact_email %}
+      This is an automated email. If you have any questions or concerns, please do not reply to this email, instead, contact us at <a href="mailto:{{ contact_email }}">{{ contact_email }}</a>.
+      {% endif %}
     </p>
 
     <img

diff --git a/lib/galaxy/config/templates/mail/notifications/message-email.txt b/lib/galaxy/config/templates/mail/notifications/message-email.txt
@@ -13,12 +13,13 @@ sent:
 - name                      The user's name
 - user_email                The user's email
 - date                      Date and time of the notification
-- hostname                  Your galaxy's hostname
+- hostname                  Your galaxy's hostname (i.e. usegalaxy.* or the value in `server_name` from the galaxy config file)
 - contact_email             Your galaxy's contact email
 - notification_settings_url The URL to the user's notification settings to manage their subscriptions
 - content                   The message payload
   - subject                 The message subject
   - content                 The message content in HTML (converted from Markdown)
+- galaxy_url                The URL to the Galaxy instance (i.e. https://usegalaxy.*)
 
 Template begins here>>>>>>
 Hello {{ name }},
@@ -31,11 +32,18 @@ Subject:
 Message:
 {{ content['message'] }}
 
-To manage your notification settings, please visit {{ notification_settings_url }}.
-
-If you have any questions, please contact us at {{ contact_email }}.
-
 Thank you for using Galaxy!
 
 Regards,
-Your Galaxy Team
+Your Galaxy Team at {{ hostname }}
+
+---
+
+You received this email because you are subscribed to receive notifications from the Galaxy Team.
+{% if notification_settings_url %}
+To manage your notification settings, please visit {{ notification_settings_url }}.
+{% endif %}
+
+{% if contact_email %}
+This is an automated email. If you have any questions or concerns, please do not reply to this email, instead, contact us at {{ contact_email }}.
+{% endif %}
diff --git a/lib/galaxy/config/templates/mail/notifications/new_shared_item-email.html b/lib/galaxy/config/templates/mail/notifications/new_shared_item-email.html
@@ -13,14 +13,15 @@
 - name                      The user's name
 - user_email                The user's email
 - date                      Date and time of the notification
-- hostname                  Your galaxy's hostname
+- hostname                  Your galaxy's hostname (i.e. usegalaxy.* or the value in `server_name` from the galaxy config file)
 - contact_email             Your galaxy's contact email
 - notification_settings_url The URL to the user's notification settings to manage their subscriptions
 - content                   The new_shared_item payload
   - item_type               The type of the shared item
   - item_name               The name of the shared item
   - owner_name              The name of the owner of the shared item
   - slug                    The slug of the shared item. Used for the link to the item.
+- galaxy_url                The URL to the Galaxy instance (i.e. https://usegalaxy.*)
 
 Template begins here >>>>>>
 <!DOCTYPE html>
@@ -41,7 +42,7 @@
     <p style="font-size: 12pt;">
       To access the shared {{ content['item_type'] }}, please visit the following link:
       <br>
-      <a href="{{ content['slug'] }}">{{ content['item_name'] }}</a>
+      <a href="{{galaxy_url}}/{{ content['slug'] }}">{{ content['item_name'] }}</a>
       <br><br>
 
     <p style="font-size: 12pt;">
@@ -51,15 +52,20 @@
 
     <p style="font-size: 12pt;">
       Regards,<br>
-      Your Galaxy Team at {{ hostname }}
+      Your Galaxy Team at <a href="{{ galaxy_url }}">{{ hostname }}</a>
     </p>
 
     <p style="font-size: 10pt;">
-      This is an automated email. If you have any questions or concerns, please do not reply to this email, instead, contact us at <a href="mailto:{{ contact_email }}">{{ contact_email }}</a>.<br><br>
-
       You received this email because you are subscribed to receive notifications when another user shares an item with you.
-      <br>
+      {% if notification_settings_url %}
       You can manage your notification settings <a href="{{ notification_settings_url }}">here</a>.
+      {% endif %}
+
+      <br>
+
+      {% if contact_email %}
+      This is an automated email. If you have any questions or concerns, please do not reply to this email, instead, contact us at <a href="mailto:{{ contact_email }}">{{ contact_email }}</a>.
+      {% endif %}
     </p>
 
     <img

diff --git a/lib/galaxy/config/templates/mail/notifications/new_shared_item-email.txt b/lib/galaxy/config/templates/mail/notifications/new_shared_item-email.txt
@@ -13,29 +13,38 @@ sent:
 - name                      The user's name
 - user_email                The user's email
 - date                      Date and time of the notification
-- hostname                  Your galaxy's hostname
+- hostname                  Your galaxy's hostname (i.e. usegalaxy.* or the value in `server_name` from the galaxy config file)
 - contact_email             Your galaxy's contact email
 - notification_settings_url The URL to the user's notification settings to manage their subscriptions
 - content                   The new_shared_item payload
   - item_type               The type of the shared item
   - item_name               The name of the shared item
   - owner_name              The name of the owner of the shared item
   - slug                    The slug of the shared item. Used for the link to the item.
+- galaxy_url                The URL to the Galaxy instance (i.e. https://usegalaxy.*)
 
 Template begins here>>>>>>
 Hello {{ name }},
 
-A new {{ content['item_type'] }} has been shared with you by {{ content['owner_name'] }}.
+A new {{ content['item_type'] }} has been shared with you on {{ date }} by {{ content['owner_name'] }}.
 
 To access the shared {{ content['item_type'] }}, please visit the following link:
-{{ hostname }}/{{ content['slug'] }}
+{{ galaxy_url }}/{{ content['slug'] }}
+
+Thank you for using Galaxy!
+
+Regards,
+Your Galaxy Team at {{ hostname }}
+
+---
 
 You received this email because you are subscribed to receive notifications when another user shares an item with you.
+{% if notification_settings_url %}
 To manage your notification settings, please visit {{ notification_settings_url }}.
+{% endif %}
 
-If you have any questions, please contact us at {{ contact_email }}.
+{% if contact_email %}
+This is an automated email. If you have any questions or concerns, please do not reply to this email, instead, contact us at {{ contact_email }}.
+{% endif %}
 
-Thank you for using Galaxy!
 
-Regards,
-Your Galaxy Team