CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-05 15:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unify design of the different mail previews

Browse Source
This commit is contained in:
Raphael Michel
2017-04-14 11:51:27 +02:00
parent bc6b84f900
commit f5b871f8f5
5 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pretix/control/templates/pretixcontrol/event/mail_settings_fragment.html
View File

@@ -27,9 +27,9 @@
<div id="{{ item }}_edit" class="tab-pane fade in active">
{% bootstrap_field field show_label=False form_group_class="" %}
</div>
<div id="{{ item }}_preview" class="tab-pane">
<div id="{{ item }}_preview" class="tab-pane mail-preview-group">
{% for l in request.event.settings.locales %}
<pre lang="{{ l }}" for="{{ item }}"></pre>
<pre lang="{{ l }}" for="{{ item }}" class="mail-preview"></pre>
{% endfor %}
</div>
</div>
@@ -50,4 +50,4 @@
{% endwith %}
</div>
</div>
</div>
</div>

2
src/pretix/control/views/event.py
View File

@@ -423,7 +423,7 @@ class MailSettingsPreview(EventPermissionRequiredMixin, View):
return {
'date': date_format(now() + timedelta(days=7), 'SHORT_DATE_FORMAT'),
'expire_date': date_format(now() + timedelta(days=15), 'SHORT_DATE_FORMAT'),
'payment_info': _('{} {} has been transferred to account<9999-9999-9999-9999> at {}').format(
'payment_info': _('{} {} has been transferred to account <9999-9999-9999-9999> at {}').format(
42.23, self.request.event.currency, date_format(now(), 'SHORT_DATETIME_FORMAT'))
}