Add event date/time to registration emails

Fixes: indico#3337
bpedersen2 · May 8, 2018 · 085c9ab · 085c9ab
1 parent df8c2c2
commit 085c9ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/indico/modules/events/registration/templates/emails/base_registration.html b/indico/modules/events/registration/templates/emails/base_registration.html
@@ -1,4 +1,5 @@
 {% extends 'emails/base.html' %}
+{% from 'events/emails/render_event_dates.html' import render_event_dates_html %}
 {% block header %}{% endblock %}
 {% block footer %}{% endblock %}
 
@@ -17,6 +18,9 @@
             <h1 style="margin: 0;">
                 {{ event.title }}
             </h1>
+            <div>
+            {{- render_event_dates_html(event) -}}
+            </div>
             <h3 style="margin: 0; margin-top: 10px; padding-top: 10px; border-top: 1px solid #eee;">
                 {{ registration.registration_form.title }}
                 <span style="float: right; font-style: italic;">

diff --git a/indico/modules/events/registration/templates/emails/invitation_default.html b/indico/modules/events/registration/templates/emails/invitation_default.html
@@ -1,3 +1,4 @@
+{% from 'events/emails/render_event_dates.html' import render_event_dates_html %}
 {% macro get_subject() %}Invitation to register{% endmacro %}
 
 {% macro get_html_body() %}
@@ -6,6 +7,9 @@
     We'd like to invite you to register for the following event:<br>
     <strong>{{ event.title }}</strong><br><br>
 
+    {{- render_event_dates_html(event) -}}
+
+
     You can register (or decline the invitation) by using this link:<br>
     {invitation_link}
 

diff --git a/indico/modules/events/templates/emails/event_creation.txt b/indico/modules/events/templates/emails/event_creation.txt
@@ -1,4 +1,5 @@
 {% extends 'emails/base.txt' %}
+{% from 'events/emails/render_event_dates.html' import render_event_dates %}
 
 {% block subject -%}
     New {{ event.type }} in Indico
@@ -43,31 +44,7 @@
             {{ event.description | striptags }}
         {%- endif %}
 
-        {% if not occurrences -%}
-            {% filter underline %}Date{% endfilter %}
-            {{ event.start_dt|format_date(timezone=event.timezone) }}
-            {%- if event.start_dt_local.date() != event.end_dt_local.date() %}
-                {#- #} - {{ event.end_dt|format_date(timezone=event.timezone) }}
-            {%- endif %}
-
-            {% filter underline %}Time{% endfilter %}
-            {{ event.start_dt|format_time(timezone=event.timezone) }} - {{ event.end_dt|format_time(timezone=event.timezone) }}
-            {#- #} ({{ event.timezone }})
-
-            {% filter underline %}URL{% endfilter %}
-            {{ event.external_url }}
-        {%- else -%}
-            {% filter underline %}Timezone{% endfilter %}
-            {{ event.timezone }}
-
-            {% filter underline %}Occurrences{% endfilter -%}
-            {% for evt in occurrences|sort(attribute='start_dt') %}
-                {{ evt.start_dt|format_date(timezone=evt.timezone) }}, {# -#}
-                {{ evt.start_dt|format_time(timezone=evt.timezone) }} - {# -#}
-                {{ evt.end_dt|format_time(timezone=evt.timezone) }}: {# -#}
-                {{ evt.external_url -}}
-            {%- endfor -%}
-        {%- endif -%}
+        {{- render_event_dates(event, occurrences) -}}
     {%- endfilter -%}
 {%- endblock %}