Merge pull request #492 from ubccr/email-fix

Fix url not displaying in emails

coldfront/templates/email/allocation_activated.txt

@@ -1,11 +1,15 @@
 Dear {{center_name}} user,
 
-Your allocation request for {{resource}} has been activated. You now have access to this resource.
+Your allocation request for {{resource}} has been activated. You now have
+access to this resource.
 
-To view your allocations information, please go to {{allocation_url}}
+To view your allocations information, please go to:
 
-If you are a student or collaborator under this project, you are receiving this notice as a courtesy. If you would like
-to opt out of future notifications, instructions can be found here: {{opt_out_instruction_url}}
+{{url}}
+
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy. If you would like to opt out of future notifications,
+instructions can be found here: {{opt_out_instruction_url}}
 
 Thank you,
 {{signature}}

coldfront/templates/email/allocation_change_approved.txt

@@ -1,11 +1,15 @@
 Dear {{center_name}} user,
 
-Your allocation change request for {{resource}} has been approved. The requested changes are now active.
+Your allocation change request for {{resource}} has been approved. The
+requested changes are now active.
 
-To view your allocation's information, please go to {{allocation_url}}
+To view your allocation's information, please go to:
 
-If you are a student or collaborator under this project, you are receiving this notice as a courtesy. If you would like
-to opt out of future notifications, instructions can be found here: {{opt_out_instruction_url}}
+{{url}}
+
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy. If you would like to opt out of future notifications,
+instructions can be found here: {{opt_out_instruction_url}}
 
 Thank you,
 {{signature}}

coldfront/templates/email/allocation_change_denied.txt

@@ -2,10 +2,14 @@ Dear {{center_name}} user,
 
 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: {{allocation_url}}
+Please login to view a message from the system administrators pertaining to
+your allocation change request: 
 
-If you are a student or collaborator under this project, you are receiving this notice as a courtesy. If you would like
-to opt out of future notifications, instructions can be found here: {{opt_out_instruction_url}}
+{{url}}
+
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy. If you would like to opt out of future notifications,
+instructions can be found here: {{opt_out_instruction_url}}
 
 Thank you,
 {{signature}}

coldfront/templates/email/allocation_denied.txt

@@ -2,10 +2,13 @@ Dear {{center_name}} user,
 
 Your allocation request for {{resource}} has been denied.
 
-Please login to view a message from the system administrators: {{allocation_url}}
+Please login to view a message from the system administrators: 
 
-If you are a student or collaborator under this project, you are receiving this notice as a courtesy. If you would like
-to opt out of future notifications, instructions can be found here: {{opt_out_instruction_url}}
+{{url}}
+
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy. If you would like to opt out of future notifications,
+instructions can be found here: {{opt_out_instruction_url}}
 
 Thank you,
 {{signature}}

coldfront/templates/email/allocation_revoked.txt

@@ -2,10 +2,13 @@ Dear {{center_name}} user,
 
 Your allocation for {{resource}} has been revoked.
 
-Please login to view a message from the system administrators: {{url}}
+Please login to view a message from the system administrators: 
 
-If you are a student or collaborator under this project, you are receiving this notice as a courtesy. If you would like
-to opt out of future notifications, instructions can be found here: {{opt_out_instruction_url}}
+{{url}}
+
+If you are a student or collaborator under this project, you are receiving this
+notice as a courtesy. If you would like to opt out of future notifications,
+instructions can be found here: {{opt_out_instruction_url}}
 
 Thank you,
 {{signature}}