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 1521f33dd4
commit 47862cca12
3 changed files with 31 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      emencia/django/newsletter/models.py
  2. 27
      emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
  3. 25
      emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html

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

@ -251,18 +251,18 @@ class Contact(models.Model):
# recommended
paid_recommend = NewsletterRecommend.objects.filter(
fr__gte=date,
to__lte=date)
fr__lte=date,
to__gte=date)
recommended = SearchQuerySet().models(Exposition, Conference)\
.filter(expohit=True, data_begin__gte=date)
if th_tg_filter:
paid_recommend = list(paid_recommend.filter(theme__in=th_tg_structure.keys()))
recommended = recommended.filter(th_tg_filter)
try:
ctx['recommended'] = choice(paid_recommend)
ctx['recommended'] = choice(paid_recommend).event()
except:
try:
ctx['recommended'] = recommended[0]
ctx['recommended'] = recommended[0].object
except:
pass

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

@ -101,7 +101,7 @@
</table>
{% if recommended %}
{% with recommended.object as obj %}
{% with recommended as obj %}
<!-- recommendation -->
<table cellspacing="0" cellpadding="0" border="0" style="width:100%;">
<tr>
@ -120,17 +120,18 @@
<td valign="top" align="left" style="padding-left: 22px;">
<table cellspacing="0" cellpadding="0" border="0" style="wigth: 100%;">
<tr>
<td valign="middle" style="color: #cc3399; font-size: 13px; text-transform: uppercase; padding: 3px 0px 3px 0px;">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td style="padding-right: 8px;"><img src="cid:marker" alt=""></td>
<td>{{ obj.get_event_place_name }}</td>
</tr>
</table>
</td>
</tr>
{% if obj.get_event_place_name %}
<tr>
<td valign="middle" style="color: #cc3399; font-size: 13px; text-transform: uppercase; padding: 3px 0px 3px 0px;">
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td style="padding-right: 8px;"><img src="cid:marker" alt=""></td>
<td>{{ obj.get_event_place_name }}</td>
</tr>
</table>
</td>
</tr>
{% endif %}
<tr>
<td style="padding: 3px 0px 3px 0px;">
<a href="http://{{ domain }}{{ obj.get_permanent_url }}" style="color: #333333; font-size: 25px; font-weight: bold; text-decoration: none;">{{ obj.name|safe }}</a></td>
@ -141,7 +142,7 @@
<table border="0" cellpadding="0" cellspacing="0">
<tr>
<td style="padding-right: 9px;"><img src="cid:calendar" style="margin-top: -2px; alt=""></td>
<td>{{ obj.get_dates_v2 }}, {{ obj.get_event_place_name }}</td>
<td>{{ obj.get_dates_v2 }}{% if obj.get_event_place_name %}, {{ obj.get_event_place_name }}{% endif %}</td>
</tr>
</table>
</td>

25
emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html
Unescape View File

@ -116,7 +116,7 @@
</table>
{% if recommended %}
{% with recommended.object as obj %}
{% with recommended as obj %}
<!-- recommendation -->
<table border="0" cellspacing="0" style="width:100%;">
<tr>
@ -141,13 +141,14 @@
<td valign="top" align="left" style="padding-left: 22px;">
<table style="wigth: 100%;">
<tr>
<td valign="middle" style="color: #cc3399; font-size: 13px; text-transform: uppercase; padding: 3px 0px 3px 0px;">
<img src="{% static 'newsletter/images/marker.png' %}" alt="" style="display: inline-block; vertical-align: middle; margin-right: 5px;">
{{ obj.get_event_place_name }}
</td>
</tr>
{% if obj.get_event_place_name %}
<tr>
<td valign="middle" style="color: #cc3399; font-size: 13px; text-transform: uppercase; padding: 3px 0px 3px 0px;">
<img src="{% static 'newsletter/images/marker.png' %}" alt="" style="display: inline-block; vertical-align: middle; margin-right: 5px;">
{{ obj.get_event_place_name }}
</td>
</tr>
{% endif %}
<tr>
<td style="padding: 3px 0px 3px 0px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}" style="color: #333333; font-size: 25px; font-weight: bold; text-decoration: none;">{{ obj.name|safe }}</a></td>
</tr>
@ -155,7 +156,7 @@
<tr>
<td style="color: #3399cc; font-size: 17px; padding: 3px 0px 3px 0px;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="">
{{ obj.get_dates }}, {{ obj.get_event_place_name }}
{{ obj.get_dates_v2 }}{% if obj.get_event_place_name %}, {{ obj.get_event_place_name }}{% endif %}
</td>
</tr>
@ -229,7 +230,7 @@
<tr>
<td style="color: #3399cc; font-size: 14px; padding-bottom: 7px;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_dates }}
{{ obj.get_dates_v2 }}
</td>
</tr>
@ -337,7 +338,7 @@
<tr>
<td style="color: #3399cc; font-size: 14px; padding-bottom: 3px;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
{{ obj.get_dates }}
{{ obj.get_dates_v2 }}
</td>
</tr>
@ -416,7 +417,7 @@
<tr>
<td style="color: #3399cc; font-size: 13px; line-height: 14px; padding-bottom: 5px;">
<img src="{% static 'newsletter/images/calendar.png' %}" alt="" style="display: inline-block; vertical-align: middle; margin-top: -2px; margin-right: 4px;">
{{ obj.get_dates }}
{{ obj.get_dates_v2 }}
</td>
</tr>
<tr>

Write Preview
Loading…
Cancel
Save