Fixes #3073: Updates Registration Pending Emails

magfest · Dec 29, 2017 · 852b465 · 852b465
1 parent 03a36be
commit 852b465
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 27 deletions.
diff --git a/uber/templates/emails/reg_workflow/attendee_qrcode.html b/uber/templates/emails/reg_workflow/attendee_qrcode.html
@@ -1,27 +1,30 @@
 <html>
 <head></head>
 <body>
-
 {{ attendee.first_name }},
-
-{{ c.EVENT_NAME_AND_YEAR }} is coming up soon ({{ event_dates() }})!
-
-<br/><br/>To help speed up check-in, please bring the 2D barcode below with you when you pick up your badge. You can print it out or display it on your phone.
-<br/><br/>Please note, however, that this code is <strong>not</strong> a replacement for your photo ID. You must still present your photo ID when picking up your badge.
-You may not pick up badges on behalf of other attendees, even if you have a copy of their barcode.
-
-<br/><br/><img src="{{ c.URL_BASE }}/registration/qrcode_generator?data={{ attendee.public_id }}" />
-
-<br/> <br/>
+<br><br>
+{{ c.EVENT_NAME }} is coming up on {{ c.EVENT_MONTH }} {{ c.EVENT_START_DAY }}!
+<br><br>
+To help speed up check-in, please bring the 2D barcode below with you when you
+pick up your badge. You can print it out or display it on your phone.
+<br><br>
+Please note, however, that this code is <strong>not</strong> a replacement for
+your photo ID. You must still present your government issued photo ID when
+picking up your badge.
+<br><br>
+You may not pick up badges on behalf of other attendees, even if you have a
+copy of their barcode and ID.
+<br><br>
+<img src="{{ c.URL_BASE }}/registration/qrcode_generator?data={{ attendee.public_id }}" />
+<br><br>
 {% include "emails/reg_workflow/reg_notes.html" %}
-
 {% if attendee.is_transferable %}
-    <br/> <br/>
-    {{ c.EVENT_NAME }} has a no-refund policy for all registrations.  If for any reason you can't make it, we allow and encourage
-    you to resell your registration for the exact price you paid for it.  To transfer your registration to another person,
-    send them <a href="{{ c.URL_BASE }}/preregistration/transfer_badge?id={{ attendee.id }}">this personalized link</a>,
-    which will work until {{ c.FINAL_EMAIL_DEADLINE|datetime_local }}.
+    <br><br>
+    {{ c.EVENT_NAME }} has a no-refund policy for all registrations.  If for any
+    reason you can't make it, we allow and encourage you to resell your
+    registration up to the exact price you paid for it.  To transfer your
+    registration to another person, send them
+    <a href="{{ c.URL_BASE }}/preregistration/transfer_badge?id={{ attendee.id }}">this personalized link</a>.
 {% endif %}
-
 </body>
 </html>
diff --git a/uber/templates/emails/reg_workflow/reg_notes.html b/uber/templates/emails/reg_workflow/reg_notes.html
@@ -1,5 +1,5 @@
 {% if attendee.staffing and not attendee.assigned_depts %}
-    <br/> <br/>
+    <br><br>
     Thanks for your interest in volunteering!
     {% if attendee.paid == c.HAS_PAID %}
         Now that we've received your payment
@@ -13,23 +13,23 @@
 {% endif %}
 
 {% if c.CONSENT_FORM_URL and attendee.age_group_conf['consent_form'] %}
-    <br/> <br/>
+    <br><br>
     Because you are under 18, you must bring a signed and notarized parental permission
     to be granted admission to {{ c.EVENT_NAME }}. You may download the consent form
     <a href="{{ c.CONSENT_FORM_URL }}">by clicking here</a>.
-    <br/> <br/>
+    <br><br>
     You may <a href="{{ c.URL_BASE }}/preregistration/confirm?id={{ attendee.id }}">click here</a>
     to edit your info if you are over 18.
 {% endif %}
 
 {% if c.CODE_OF_CONDUCT_URL %}
-    <br/><br/>
+    <br><br>
     Registered attendees agree to the {{ c.EVENT_NAME }} code of conduct by picking up their badge.
     You can review the code of conduct anytime by <a href="{{ c.CODE_OF_CONDUCT_URL }}">clicking here</a>.
 {% endif %}
 
 {% if c.PREREG_FAQ_URL %}
-    <br/><br/>
+    <br><br>
     Got a question? Most common questions are answered in our FAQ.
     Be sure to check the FAQ by <a href="{{ c.PREREG_FAQ_URL }}">clicking here</a>!
-{% endif %}
+{% endif %}
diff --git a/uber/templates/emails/reg_workflow/under_18_reminder.txt b/uber/templates/emails/reg_workflow/under_18_reminder.txt
@@ -1,9 +1,9 @@
 {{ attendee.first_name }},
 
-Thanks for pre-registering for {{ c.EVENT_NAME }}.  Our records indicate that you are under the age of 18, and as such, you will need a signed parental consent form. If a parent/guardian will be present at {{ c.EVENT_NAME }}, then they can sign the consent form when you pick up your badge at the registration desk. If a parent/guardian will not be at the event, the form may be brought pre-signed, however it MUST be notarized. We will not accept pre-signed forms that are not notarized. You may find the form at {{ c.CONSENT_FORM_URL }}
+Thanks for pre-registering for {{ c.EVENT_NAME }}. Our records indicate that you are under the age of 18, and as such, you will need a signed parental consent form. If a parent/legal guardian will be present at {{ c.EVENT_NAME }}, then they can sign the consent form when you pick up your badge at Registration in Expo Hall E. If a parent/legal guardian will not be at the event, the form may be brought pre-signed, however it MUST be notarized. We will not accept pre-signed forms that are not notarized. You may find the form at {{ c.CONSENT_FORM_URL }}.
 
-If you are actually over 18, you can update your age in our database at {{ c.URL_BASE }}/preregistration/confirm?id={{ attendee.id  }} before {{ c.UBER_TAKEDOWN|datetime_local }}.
+If you are actually over 18, please update your age in our database at {{ c.URL_BASE }}/preregistration/confirm?id={{ attendee.id }} prior to picking up your badge.
 
-We look forward to seeing you at {{ c.EVENT_NAME}} on {{ event_dates() }}.
+We look forward to seeing you at {{ c.EVENT_NAME_AND_YEAR }}!
 
 {{ c.REGDESK_EMAIL_SIGNATURE }}