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

m

Browse Source
remotes/origin/stage6
Alexander Burdeinyi 9 years ago
parent 8ab782a7c3
commit 58706db297
6 changed files with 29 additions and 23 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. 4
      accounts/urls.py
  2. 27
      accounts/views.py
  3. 2
      emencia/django/newsletter/mailer.py
  4. 7
      emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
  5. 4
      templates/client/accounts/mailing_settings.html
  6. 8
      templates/client/popups/unsubscribed.html

4
accounts/urls.py
Unescape View File

@ -9,7 +9,7 @@ from views import (
Feed, Feed,
HomeView, HomeView,
MailingSettings, MailingSettings,
MailingSettingsUnsubscribe, # MailingSettingsUnsubscribe,
NameView, NameView,
PhoneView, PhoneView,
ProfileCompanyView, ProfileCompanyView,
@ -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/$', 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'),

27
accounts/views.py
Unescape View File

@ -135,6 +135,11 @@ class MailingSettings(GetUserMixin, ContextMixin, AjaxableResponseMixin, CreateU
}) })
elif not self.request.user.is_authenticated(): elif not self.request.user.is_authenticated():
raise HttpResponseForbidden() raise HttpResponseForbidden()
if self.request.GET.get('unsibscribe') and instance.subscriber:
instance.unsubscribe()
self.extra_ctx.update({'unsubscribe_success': True})
elif not instance.subscriber:
self.extra_ctx.update({'unsubscribed': True})
return instance return instance
def form_valid(self, form): def form_valid(self, form):
@ -150,17 +155,17 @@ class MailingSettings(GetUserMixin, ContextMixin, AjaxableResponseMixin, CreateU
# print(self.request.POST) # print(self.request.POST)
return super(MailingSettings, self).form_invalid(form) return super(MailingSettings, self).form_invalid(form)
#
class MailingSettingsUnsubscribe(GetUserMixin, RedirectView): # class MailingSettingsUnsubscribe(GetUserMixin, RedirectView):
url = reverse_lazy('accounts-mailing_settings') # url = reverse_lazy('accounts-mailing_settings')
#
def get(self, request, *args, **kwargs): # def get(self, request, *args, **kwargs):
contact = self.get_user() # contact = self.get_user()
if contact is None: # if contact is None:
return HttpResponseForbidden() # return HttpResponseForbidden()
if contact.subscriber: # if contact.subscriber:
contact.unsubscribe() # contact.unsubscribe()
return super(MailingSettingsUnsubscribe, self).get(request, *args, **kwargs) # return super(MailingSettingsUnsubscribe, self).get(request, *args, **kwargs)
class CalendarView(TemplateView): class CalendarView(TemplateView):

2
emencia/django/newsletter/mailer.py
Unescape View File

@ -130,7 +130,7 @@ dailymail_attahcments = {
} }
context_attachments_size = { context_attachments_size = {
'recommended': '170x170', 'recommended': '170x170',
'news': '272x195', 'news': '170x170',
'blog': '272x195', 'blog': '272x195',
'moscow': '109x114', 'moscow': '109x114',
'russia': '109x114', 'russia': '109x114',

7
emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
Unescape View File

@ -340,8 +340,7 @@
<tr> <tr>
<td style="padding-bottom: 18px; padding-top: 10px;"> <td style="padding-bottom: 18px; padding-top: 10px;">
{# TODO: Подставить href в ссылку #} <a href="https://{{ domain }}{{ obj.get_permanent_url }}" style="display: inline-block; padding: 7px 17px 6px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "подробнее" %} <img src="cid:arrow" alt=""></a>
<a href="#" style="display: inline-block; padding: 7px 17px 6px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "подробнее" %} <img src="cid:arrow" alt=""></a>
</td> </td>
</tr> </tr>
</table> </table>
@ -463,7 +462,6 @@
<tr> <tr>
<td style="width: 170px; text-align: center; padding-bottom: 30px;" valign="top"> <td style="width: 170px; text-align: center; padding-bottom: 30px;" valign="top">
{# TODO: Сделать картинку 170х170 #}
<a href="http://{{ domain }}{{ news.get_permanent_url }}"><img src="cid:news{{ news.pk }}" alt=""></a> <a href="http://{{ domain }}{{ news.get_permanent_url }}"><img src="cid:news{{ news.pk }}" alt=""></a>
</td> </td>
@ -490,8 +488,7 @@
<tr> <tr>
<td style="padding-top: 10px;"> <td style="padding-top: 10px;">
{# TODO: Подставить href в ссылку #} <a href="http://{{ domain }}{{ news.get_permanent_url }}" style="display: inline-block; padding: 7px 17px 6px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "подробнее" %} <img src="cid:arrow" alt=""></a>
<a href="#" style="display: inline-block; padding: 7px 17px 6px 20px; border: 1px solid #ff6600; color: #ff6600; text-decoration: none; text-transform: uppercase; font-size: 12px; line-height: 12px; border-radius: 5px;">{% trans "подробнее" %} <img src="cid:arrow" alt=""></a>
</td> </td>
</tr> </tr>
</table> </table>

4
templates/client/accounts/mailing_settings.html
Unescape View File

@ -158,7 +158,7 @@
<div class="button_block"> <div class="button_block">
<div class="container"> <div class="container">
<button type="submit">{% trans "Сохранить" %}</button> <button type="submit">{% trans "Сохранить" %}</button>
<a href="{% url 'accounts-mailing_settings_unsubscribe' %}">{% trans 'Не хочу быть в курсе событий (отписаться от всего)' %}</a> <a href="?unsibscribe=1">{% trans 'Не хочу быть в курсе событий (отписаться от всего)' %}</a>
</div> </div>
</div> </div>
</form> </form>
@ -179,7 +179,7 @@
{% include 'client/popups/mailing_settings_countries.html' %} {% include 'client/popups/mailing_settings_countries.html' %}
</div> </div>
{% if not object.subscriber %} {% if unsubscribe_success or unsubscribed %}
<div id="unsibscribed_modal"> <div id="unsibscribed_modal">
{% include 'client/popups/unsubscribed.html' %} {% include 'client/popups/unsubscribed.html' %}
</div> </div>

8
templates/client/popups/unsubscribed.html
Unescape View File

@ -4,11 +4,15 @@
<div id="unsibscribed" class="popup-window unsibscribed"> <div id="unsibscribed" class="popup-window unsibscribed">
<header> <header>
<div class="title">{% trans 'Вы отписались от нашей рассылки' %}</div> <div class="title">{% if unsubscribe_success %}{% trans 'Вы отписались от нашей рассылки' %}{% else %}{% trans 'Вы не подписаны ни на одну из наших рассылок' %}{% endif %}</div>
</header> </header>
<div class="body"> <div class="body">
{% trans "Мы расстроены, но отписали Вас от всех писем. Надеемся, в скором времени вы снова захотите быть в курсе событий своей отрасли." %} {% if unsubscribe_success %}
{% trans "Мы расстроены, но отписали Вас от всех писем. Надеемся, в скором времени вы снова захотите быть в курсе событий своей отрасли." %}
{% else %}
{% trans "Надеемся, в скором времени вы снова захотите быть в курсе событий своей отрасли." %}
{% endif %}
<div class="wait-ajax"></div> <div class="wait-ajax"></div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save