mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

1577 email fixes

Browse Source
remotes/origin/stage6
Alexander Burdeiny 9 years ago
parent 1d3567a4ff
commit e074c10aeb
3 changed files with 20 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      accounts/urls.py
  2. 6
      emencia/django/newsletter/models.py
  3. 28
      emencia/django/newsletter/templates/newsletter/AutomaticEmail.html

2
accounts/urls.py
Unescape View File

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

6
emencia/django/newsletter/models.py
Unescape View File

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

28
emencia/django/newsletter/templates/newsletter/AutomaticEmail.html
Unescape View File

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

Write Preview
Loading…
Cancel
Save