Merge pull request #109 from nerc-project/email_template_fixed

updated email templates and also url to renew projects/allocations

k8s/overlays/prod/configmap.yaml

@@ -23,7 +23,7 @@ data:
   CENTER_NAME: "New England Research Cloud"
   CENTER_BASE_URL: "https://coldfront.mss.mghpcc.org"
   CENTER_HELP_URL: "https://nerc.mghpcc.org/user-guides/"
-  CENTER_PROJECT_RENEWAL_HELP_URL: "https://nerc.mghpcc.org/user-guides/"
+  CENTER_PROJECT_RENEWAL_HELP_URL: "https://nerc-project.github.io/nerc-docs/get-started/allocation/project-and-allocation-review/"
   ACCOUNT_CREATION_TEXT: >
     Any faculty, staff, student, or external collaborator must request an user account through the <a href="https://regapp.mss.mghpcc.org/" target="_blank">MGHPCC Shared Services (MGHPCC-SS) Account Portal</a>. For more information, please see the <a href="https://nerc.mghpcc.org/user-guides/" target="_blank">user guides</a>.
   EMAIL_ENABLED: 'True'

k8s/overlays/staging/configmap.yaml

@@ -23,7 +23,7 @@ data:
   CENTER_NAME: "New England Research Cloud"
   CENTER_BASE_URL: "https://coldfront-staging.mss.mghpcc.org"
   CENTER_HELP_URL: "https://nerc.mghpcc.org/user-guides/"
-  CENTER_PROJECT_RENEWAL_HELP_URL: "https://nerc.mghpcc.org/user-guides/"
+  CENTER_PROJECT_RENEWAL_HELP_URL: "https://nerc-project.github.io/nerc-docs/get-started/allocation/project-and-allocation-review/"
   ACCOUNT_CREATION_TEXT: >
     Any faculty, staff, student, or external collaborator must request an user account through the <a href="https://regapp.mss.mghpcc.org/" target="_blank">MGHPCC Shared Services (MGHPCC-SS) Account Portal</a>. For more information, please see the <a href="https://nerc.mghpcc.org/user-guides/" target="_blank">user guides</a>.
   EMAIL_ENABLED: 'True'

src/email/allocation_activated.txt

@@ -4,5 +4,8 @@ Your allocation request for {{resource}} has been activated. You now have access
 
 To view your allocations information, please go to {{url}}
 
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy.
+
 Thank you,
 {{signature}}

src/email/allocation_change_approved.txt

@@ -4,5 +4,8 @@ Your allocation change request for {{resource}} has been approved. The requested
 
 To view your allocation's information, please go to {{url}}
 
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy.
+
 Thank you,
 {{signature}}

src/email/allocation_change_denied.txt

@@ -4,5 +4,8 @@ Your allocation change request for {{resource}} has been denied.
 
 Please login to view a message from the system administrators pertaining to your allocation change request: {{url}}
 
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy.
+
 Thank you,
 {{signature}}

src/email/allocation_denied.txt

@@ -4,5 +4,8 @@ Your allocation request for {{resource}} has been denied.
 
 Please login to view a message from the system administrators: {{url}}
 
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy.
+
 Thank you,
 {{signature}}

src/email/allocation_expired.txt

@@ -1,6 +1,6 @@
 Dear {{center_name}} user,
 
-Your access to {{center_name}} resources has expired. Any accounts under these allocation(s) are now unable to
+Your access to {{center_name}}'s resources has expired. Any accounts under these allocation(s) are now unable to
 access the associated resource. If you wish to continue using them, the group owners responsible for the following project(s) must create a new
 allocation request(s). Below is a list of links to your project(s) containing at least one expired allocation: 
 {% for project_key, project_url in project_dict.items %}
@@ -15,5 +15,8 @@ The group owner responsible for this project is required to renew it on a yearly
 last year, you will be required to before requesting a new allocation.
 For more information about the yearly renewal, visit our knowledge base: {{ project_renewal_help_url }}.
 
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy.
+
 Thank you,
 {{ signature }}

src/email/allocation_expiring.txt

@@ -17,5 +17,8 @@ The group owner responsible for this project is required to renew it on a yearly
 last year, you will be required to before renewing the allocation.
 For more information about the yearly renewal, visit our knowledge base: {{ project_renewal_help_url }}
 
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy.
+
 Thank you,
 {{ signature }}