1577 email fixes

remotes/origin/stage6
Alexander Burdeiny 9 years ago
parent 1d3567a4ff
commit e074c10aeb
  1. 2
      accounts/urls.py
  2. 6
      emencia/django/newsletter/models.py
  3. 28
      emencia/django/newsletter/templates/newsletter/AutomaticEmail.html

@ -22,7 +22,7 @@ from views import (
urlpatterns = patterns('',
url(r'^profile/company/$', login_required(ProfileCompanyView.as_view())),
url(r'^profile/mailing/$', MailingSettings.as_view(), name='accounts-mailing_settings'),
url(r'^profile/mailing/unsubscribe/$', login_required(MailingSettingsUnsubscribe.as_view()), name='accounts-mailing_settings_unsubscribe'),
url(r'^profile/mailing/unsubscribe/$', MailingSettingsUnsubscribe.as_view(), name='accounts-mailing_settings_unsubscribe'),
url(r'^profile/settings/$', login_required(SettingsView.as_view()), name='accounts_settings'),
url(r'^profile/calendar/remove/$', 'accounts.views.remove_from_calendar'),
url(r'^profile/calendar/export/$', 'core.views.download_workbook'),

@ -256,7 +256,7 @@ class Contact(models.Model):
ctx['moscow'] = moscow_sqs.order_by('data_begin')[:4]
moscow_filter_url = QueryDict('', mutable=True)
moscow_filter_url.setlist('theme', th_tg_structure.keys())
moscow_filter_url.setlist('tag', list(chain(th_tg_structure.values())))
moscow_filter_url.setlist('tag', list(chain(*th_tg_structure.values())))
moscow_filter_url['city'] = settings.MOSCOW_PK
moscow_filter_url['date_from'] = date.strftime('%d.%m.%Y')
ctx['moscow_filter_url'] = mark_safe(moscow_filter_url.urlencode())
@ -275,7 +275,7 @@ class Contact(models.Model):
ctx['russia'] = russia_sqs.order_by('data_begin')[:3]
russia_filter_url = QueryDict('', mutable=True)
russia_filter_url.setlist('theme', th_tg_structure.keys())
russia_filter_url.setlist('tag', list(chain(th_tg_structure.values())))
russia_filter_url.setlist('tag', list(chain(*th_tg_structure.values())))
russia_filter_url['country'] = settings.RUSSIA_PK
russia_filter_url['date_from'] = r_date.strftime('%d.%m.%Y')
ctx['russia_filter_url'] = mark_safe(russia_filter_url.urlencode())
@ -304,7 +304,7 @@ class Contact(models.Model):
ctx['foreign'] = foreign_sqs.order_by('data_begin')[:4]
foreign_filter_url = QueryDict('', mutable=True)
foreign_filter_url.setlist('theme', th_tg_structure.keys())
foreign_filter_url.setlist('tag', list(chain(th_tg_structure.values())))
foreign_filter_url.setlist('tag', list(chain(*th_tg_structure.values())))
foreign_filter_url.setlist('country', f_countries)
foreign_filter_url['date_from'] = date.strftime('%d.%m.%Y')
ctx['foreign_filter_url'] = mark_safe(foreign_filter_url.urlencode())

@ -57,11 +57,11 @@
<table border="0" cellspacing="0" cellpadding="0" style="width: 100%; background-color: #ffffff;">
<tr>
<td align="left" style="padding: 13px 0px 13px 24px;">
<img src="cid:logo1' %}" alt="">
<img src="cid:logo1" alt="">
</td>
<td align="right" style="padding: 13px 24px 13px 0px">
<img src="cid:logo2' %}" alt="">
<img src="cid:logo2" alt="">
</td>
</tr>
</table>
@ -296,12 +296,12 @@
</tr>
<tr>
<td valign="top">
<td>
<table style="width: 100%;">
<tr>
{% for sqs_obj in foreign %}
{% with sqs_obj.object as obj %}
<td>
<td valign="top">
<table style="width: 130px; margin: 0 auto;">
<tr>
<td style="padding-bottom: 15px;">
@ -544,8 +544,8 @@
<tr>
<td style="font-family: Arial, sans-serif; color: #333333; font-size: 14px; line-height: 1.5; padding-top: 10px;">
{% trans "Поисковик деловых событий" %} <br>
<a href="#" style="color: #ff6600;">expomap.ru</a> <br>
<a href="#" style="color: #ff6600;">mail@expomap.ru</a>
<a href="https://www.expomap.ru" style="color: #ff6600;">expomap.ru</a> <br>
<a href="mailto:mail@expomap.ru" style="color: #ff6600;">mail@expomap.ru</a>
</td>
</tr>
@ -567,10 +567,14 @@
<!-- Menu -->
<table style="width: 100%; border-top: 1px solid #f3f3f3; border-bottom: 1px solid #f3f3f3;">
<tr>
<td style="padding-top: 15px; padding-bottom: 15px; padding-left: 15px;" align="center"><a href="#" style="font-size: 15px;color: #666666;">{% trans "Выставки" %}</a></td>
<td style="padding-top: 15px; padding-bottom: 15px;" align="center"><a href="#" style="font-size: 15px;color: #666666;">{% trans "Конференции" %}</a></td>
<td style="padding-top: 15px; padding-bottom: 15px;" align="center"><a href="#" style="font-size: 15px;color: #ff6600;">{% trans "Участие в выставках" %}</a></td>
<td style="padding-top: 15px; padding-bottom: 15px;" align="center"><a href="#" style="font-size: 15px;color: #666666;">{% trans "Новости" %}</a></td>
<td style="padding-top: 15px; padding-bottom: 15px; padding-left: 15px;" align="center">
<a href="http://{{ domain }}/expo/" style="font-size: 15px;color: #666666;">{% trans "Выставки" %}</a></td>
<td style="padding-top: 15px; padding-bottom: 15px;" align="center">
<a href="http://{{ domain }}/conference/" style="font-size: 15px;color: #666666;">{% trans "Конференции" %}</a></td>
<td style="padding-top: 15px; padding-bottom: 15px;" align="center">
<a href="http://{{ domain }}/service/participation/" style="font-size: 15px;color: #ff6600;">{% trans "Участие в выставках" %}</a></td>
<td style="padding-top: 15px; padding-bottom: 15px;" align="center">
<a href="http://{{ domain }}/blogs/" style="font-size: 15px;color: #666666;">{% trans "Новости" %}</a></td>
<td style="padding-top: 15px; padding-bottom: 15px; padding-right: 15px;" align="center"><a href="#" style="font-size: 15px;color: #666666;">{% trans "Статьи" %}</a></td>
</tr>
</table>
@ -579,10 +583,10 @@
<!-- footer -->
<table style="width: 100%; background-color: #ffffff;">
<tr>
<td style="padding-top: 35px; padding-left: 20px; padding-right: 20px; font-family: Arial, sans-serif; font-size: 13px; color: #999999; padding-bottom: 7px;" align="center">{% trans "Вы получили это письмо, так как подписаны на рассылку" %} <a href="#" style="color: #ff6600;">https://www.expomap.ru</a></td>
<td style="padding-top: 35px; padding-left: 20px; padding-right: 20px; font-family: Arial, sans-serif; font-size: 13px; color: #999999; padding-bottom: 7px;" align="center">{% trans "Вы получили это письмо, так как подписаны на рассылку" %} <a href="https://www.expomap.ru" style="color: #ff6600;">www.expomap.ru</a></td>
</tr>
<tr>
<td align="center" style="font-family: Arial, sans-serif; font-size: 13px; color: #999999; padding-bottom: 7px;"><a href="#" style="color: #ff6600;">{% trans "Переслать другу" %}</a> {% trans "или" %} <a href="#" style="color: #ff6600;">{% trans "Отписаться" %}</a></td>
<td align="center" style="font-family: Arial, sans-serif; font-size: 13px; color: #999999; padding-bottom: 7px;"><a href="#" style="color: #ff6600;">{% trans "Переслать другу" %}</a> {% trans "или" %} <a href="{% if uidb36 and token %}http://{{ domain }}{% url 'newsletter-authmailingsettings' uidb36=uidb36 token=token %}{% endif %}" style="color: #ff6600;">{% trans "Отписаться" %}</a></td>
</tr>
<tr>
<td align="center" style="padding-bottom: 30px; font-family: Arial, sans-serif; font-size: 13px; color: #999999;">&copy; 2008 — 2016 Expomap.ru</td>

Loading…
Cancel
Save