+
-
+ {% block content %}
+ {{ content }}
+ {% endblock %}
+
{% trans "Hi," %}
+{% trans "Hi," %}
--{% blocktrans %} -You have been notified because the status of event "{{ event }}" has changed. -{% endblocktrans %} -
++ {% blocktrans %} + You have been notified because the status of event "{{ event }}" has changed. + {% endblocktrans %} +
-{% with _("View event") as button_label %} -{% include "emails/button-link.html" with url=event_url label=button_label %} -{% endwith %} + {% with _("View event") as button_label %} + {% include "emails/button-link.html" with url=event_url label=button_label %} + {% endwith %} {% endblock %} diff --git a/chrono/agendas/templates/agendas/events_reminder_body.html b/chrono/agendas/templates/agendas/events_reminder_body.html index 3ac1620a..16e53e72 100644 --- a/chrono/agendas/templates/agendas/events_reminder_body.html +++ b/chrono/agendas/templates/agendas/events_reminder_body.html @@ -2,35 +2,35 @@ {% load i18n %} {% block content %} -{% trans "Hi," %}
+{% trans "Hi," %}
--{% blocktrans trimmed with event=booking.event date=date|date:"l j F" time=date|time %} -You have a booking for event "{{ event }}", on {{ date }} at {{ time }}. -{% endblocktrans %} -
++ {% blocktrans trimmed with event=booking.event date=date|date:"l j F" time=date|time %} + You have a booking for event "{{ event }}", on {{ date }} at {{ time }}. + {% endblocktrans %} +
-{% if email_extra_info %} -{{ email_extra_info|force_escape|linebreaks }}
-{% endif %} + {% if email_extra_info %} +{{ email_extra_info|force_escape|linebreaks }}
+ {% endif %} -{% if booking.event.description %} -{% trans "Additional information:" %}
-{{ booking.event.description|linebreaks }} -{% endif %} + {% if booking.event.description %} +{% trans "Additional information:" %}
+ {{ booking.event.description|linebreaks }} + {% endif %} -{% if booking.event.pricing %} -{% trans "Pricing:" %} {{ booking.event.pricing }}
-{% endif %} + {% if booking.event.pricing %} +{% trans "Pricing:" %} {{ booking.event.pricing }}
+ {% endif %} -{% if booking.event.url %} -{% firstof event_url_button_label _("More information") as button_label %} -{% include "emails/button-link.html" with url=booking.event.url label=button_label %} -{% endif %} + {% if booking.event.url %} + {% firstof event_url_button_label _("More information") as button_label %} + {% include "emails/button-link.html" with url=booking.event.url label=button_label %} + {% endif %} -{% if booking.form_url %} -{% with _("Edit or cancel booking") as button_label %} -{% include "emails/button-link.html" with url=booking.get_form_url label=button_label %} -{% endwith %} -{% endif %} + {% if booking.form_url %} + {% with _("Edit or cancel booking") as button_label %} + {% include "emails/button-link.html" with url=booking.get_form_url label=button_label %} + {% endwith %} + {% endif %} {% endblock %} diff --git a/chrono/agendas/templates/agendas/meetings_reminder_body.html b/chrono/agendas/templates/agendas/meetings_reminder_body.html index ecedee40..d5b330a7 100644 --- a/chrono/agendas/templates/agendas/meetings_reminder_body.html +++ b/chrono/agendas/templates/agendas/meetings_reminder_body.html @@ -2,27 +2,27 @@ {% load i18n %} {% block content %} -{% trans "Hi," %}
+{% trans "Hi," %}
--{% with date=date|date:"l j F" time=date|time %} -{% if booking.user_display_label %} -{% blocktrans trimmed with meeting=booking.user_display_label %} -Your meeting "{{ meeting }}" is scheduled on {{ date }} at {{ time }}. -{% endblocktrans %} -{% else %} -{% blocktrans %}You have a meeting scheduled on {{ date }} at {{ time }}.{% endblocktrans %} -{% endif %} -{% endwith %} -
++ {% with date=date|date:"l j F" time=date|time %} + {% if booking.user_display_label %} + {% blocktrans trimmed with meeting=booking.user_display_label %} + Your meeting "{{ meeting }}" is scheduled on {{ date }} at {{ time }}. + {% endblocktrans %} + {% else %} + {% blocktrans %}You have a meeting scheduled on {{ date }} at {{ time }}.{% endblocktrans %} + {% endif %} + {% endwith %} +
-{% if email_extra_info %} -{{ email_extra_info|force_escape|linebreaks }}
-{% endif %} + {% if email_extra_info %} +{{ email_extra_info|force_escape|linebreaks }}
+ {% endif %} -{% if booking.form_url %} -{% with _("Edit or cancel meeting") as button_label %} -{% include "emails/button-link.html" with url=booking.get_form_url label=button_label %} -{% endwith %} -{% endif %} + {% if booking.form_url %} + {% with _("Edit or cancel meeting") as button_label %} + {% include "emails/button-link.html" with url=booking.get_form_url label=button_label %} + {% endwith %} + {% endif %} {% endblock %} diff --git a/chrono/agendas/templates/emails/body_base.html b/chrono/agendas/templates/emails/body_base.html index 9705c361..0705591b 100644 --- a/chrono/agendas/templates/emails/body_base.html +++ b/chrono/agendas/templates/emails/body_base.html @@ -1,15 +1,15 @@ - - - - -{% trans "Users will receive the following email:" %}
-{% trans "Subject:" %} {{ subject }}
-{% else %} -{% trans "Users will receive the following SMS:" %}
-{% endif %} -{{ message }}
+{% trans "Users will receive the following email:" %}
+{% trans "Subject:" %} {{ subject }}
+ {% else %} +{% trans "Users will receive the following SMS:" %}
+ {% endif %} +{{ message }}
- -{{ info }}
- {% empty %} -{% trans "Reminders are disabled for this agenda." %}
- {% endfor %} -- {% if agenda.reminder_settings.days_before_email %} - {% trans "Preview email" %} +
{{ info }}
+ {% empty %} +{% trans "Reminders are disabled for this agenda." %}
+ {% endfor %} ++ {% if agenda.reminder_settings.days_before_email %} + {% trans "Preview email" %} {% endif %} - {% else %}{% trans "undefined" %}{% endif %} -
{% trans "Cancellation failed for the following bookings:" %}
-{% trans "Cancellation failed for the following bookings:" %}
+-{% blocktrans with event=report.event %}Errors occured during cancellation of event "{{ event }}".{% endblocktrans %} -{% trans "Details" %} -
-+ {% blocktrans with event=report.event %}Errors occured during cancellation of event "{{ event }}".{% endblocktrans %} + {% trans "Details" %} +
+| - - | -|||||||||||||||
| {% trans "Mark all bookings without status:" %} | -- - - | -||||||||||||||
| {{ result.get_user_block }} | -({% trans "Cancelled" %}) | - {% if not event.checked or not agenda.disable_check_update %} -+ + + | |||||||||||||
| + + | +||||||||
| {% trans "Mark all bookings without status:" %} | ++ + + | +|||||||
| {{ result.get_user_block }} | +({% trans "Cancelled" %}) | + {% if not event.checked or not agenda.disable_check_update %} ++ {% endif %} + {% endif %} + {% elif result.kind == 'subscription' %} + | {{ result.get_user_block }} | +({% trans "Not booked" %}) | + {% if not event.checked or not agenda.disable_check_update %} ++ {% endif %} {% endif %} - {% endif %} - {% elif result.kind == 'subscription' %} - | {{ result.get_user_block }} | -({% trans "Not booked" %}) | - {% if not event.checked or not agenda.disable_check_update %} -- {% endif %} - {% endif %} - |
| {{ booking.get_user_block }}{% if booking.places_count > 1 %} ({{ booking.places_count }} {% trans "places" %}){% endif %} | -{% if booking.cancellation_datetime %}({% trans "Cancelled" %}){% endif %} | -
| {{ booking.get_user_block }}{% if booking.places_count > 1 %} ({{ booking.places_count }} {% trans "places" %}){% endif %} | +{% if booking.cancellation_datetime %}({% trans "Cancelled" %}){% endif %} | +
{% trans "Pricing:" %} {{ object.pricing }}
{% endif %} - {% if object.url %}{{ object.url|truncatechars:100 }}
{% endif %} - {% if object.publication_datetime %}{% trans "Publication date:" %} {{ object.publication_datetime }}
{% endif %} -{% trans "Pricing:" %} {{ object.pricing }}
{% endif %} + {% if object.url %}{{ object.url|truncatechars:100 }}
{% endif %} + {% if object.publication_datetime %}{% trans "Publication date:" %} {{ object.publication_datetime }}
{% endif %} +{% trans "This event is overbooked." %}
{% trans "This event is full." %}
{% trans "This event is overbooked." %}
{% trans "This event is full." %}
{% trans "The following events exist despite exceptions because they have active bookings:" %}
-{% trans "You can cancel them manually for this warning to go away, or wait until they are passed." %}
-{% trans "The following events exist despite exceptions because they have active bookings:" %}
+{% trans "You can cancel them manually for this warning to go away, or wait until they are passed." %}
+{{ agenda.event_display_template }}
- {% else %}
+ {{ agenda.event_display_template }}
+ {% else %}
{% trans "No event display template configured for this agenda." %}
- {% endif %}
- {{ agenda.get_booking_user_block_template }}
- {{ agenda.get_booking_user_block_template }}
+ {% trans "Notifications are disabled for this agenda." %}
- {% endfor %} - + {% empty %} +{% trans "Notifications are disabled for this agenda." %}
+ {% endfor %} + +| {% trans "First name" %} | -{% trans "Last name" %} | - {% for k in slots.extra_data %}{{ k }} | {% endfor %} - {% if events_num > 1 and form.cleaned_data.activity_display != 'col' %}{% trans "Activity" %} | {% endif %} - {% for date, events in dates %} - {% if form.cleaned_data.activity_display == 'col' %} - {% for event in events %} -{% blocktrans with date=date|date:"d/m" %}{{ event }} of {{ date }}{% endblocktrans %} | - {% endfor %} - {% else %} -{{ date|date:"D d/m" }} | - {% endif %} + {% with events_num=slots.events|length %} + {% for dates in slots.dates %} + {% for grouper in slots.users %} + {% if form.cleaned_data.group_by %}
|---|
| {% trans "First name" %} | +{% trans "Last name" %} | + {% for k in slots.extra_data %}{{ k }} | {% endfor %} + {% if events_num > 1 and form.cleaned_data.activity_display != 'col' %}{% trans "Activity" %} | {% endif %} + {% for date, events in dates %} + {% if form.cleaned_data.activity_display == 'col' %} + {% for event in events %} +{% blocktrans with date=date|date:"d/m" %}{{ event }} of {{ date }}{% endblocktrans %} | + {% endfor %} + {% else %} +{{ date|date:"D d/m" }} | + {% endif %} + {% endfor %} +
|---|---|---|---|---|---|
| {{ user.user_first_name }} | +{{ user.user_last_name }} | + {% for k in slots.extra_data %}{{ user.extra_data|get:k }} | {% endfor %} + {% for date, events in dates %} + {% for event in events %} + {% for item in user.events %}{% if item.event == event %}{% with booked=item.dates|get:date %}{% if booked is True %}☐{% elif booked is None %}-{% endif %} | {% endwith %}{% endif %}{% endfor %} + {% endfor %} + {% endfor %} +||
| 1 %}rowspan="{{ events_num }}"{% endif %}>{{ user.user_first_name }} | +1 %}rowspan="{{ events_num }}"{% endif %}>{{ user.user_last_name }} | + {% for k in slots.extra_data %}1 %}rowspan="{{ events_num }}"{% endif %}>{{ user.extra_data|get:k }} | {% endfor %} + {% endif %} + {% if events_num > 1 %}{{ item.event }} | {% endif %} + {% for date, events in dates %} + {% with booked=item.dates|get:date %}{% if booked is True %}☐{% elif booked is None %}-{% endif %} | {% endwith %} + {% endfor %} +