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

dailymail content fix

Browse Source
remotes/origin/stage6
Alexander Burdeiny 9 years ago
parent 8020fb2104
commit 0be442126f
2 changed files with 12 additions and 9 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. 3
      emencia/django/newsletter/mailer.py
  2. 18
      emencia/django/newsletter/templates/newsletter/AutomaticEmail.html

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

@ -109,6 +109,9 @@ dailymail_attahcments = {
'marker': 'newsletter/images/marker.png',
'calendar': 'newsletter/images/calendar.png',
'm1': 'newsletter/images/m1.png',
'm2': 'newsletter/images/m2.png',
'm3': 'newsletter/images/m3.png',
'm4': 'newsletter/images/m4.png',
'expo': 'newsletter/images/expo.png',
'news2': 'newsletter/images/news2.jpg',
'b': 'newsletter/images/b.png',

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

@ -83,7 +83,7 @@
<table>
<tr>
<td>
<td valign="top" style="width: 225px;">
<img src="recommended_{{ recommended.object.pk }}"/>
{% comment %}
{% thumbnail obj.get_logo '281x225' as im %}
@ -92,7 +92,7 @@
{% endcomment %}
</td>
<td valign="top" align="left" style="width: 50%; padding-left: 22px;">
<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;">
@ -155,8 +155,8 @@
{% with sqs_obj.object as obj %}
<table style="width: 100%; margin-top: 15px;">
<tr {% if not forloop.last %}style="border-bottom: 1px solid #eaeaea;"{% endif %}>
<td valign="top">
<img src="moscow_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}" style="border: 1px solid #eaeaea;"/>
<td valign="top" style="width: 110px;">
<img src="cid:moscow_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}" style="border: 1px solid #eaeaea;"/>
{% comment %}
{% thumbnail obj.get_logo '109x114' as im %}
<img style="border: 1px solid #eaeaea;" src="{{ im.url }}"/>
@ -229,7 +229,7 @@
<table style="width: 100%; margin-top: 15px;">
<tr {% if not forloop.last %}style="border-bottom: 1px solid #eaeaea;"{% endif %}>
<td valign="top">
<img src="russia_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}" style="border: 1px solid #eaeaea;"/>
<img src="cid:russia_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}" style="border: 1px solid #eaeaea;"/>
{% comment %}
{% thumbnail obj.get_logo '109x114' as im %}
<img style="border: 1px solid #eaeaea;" src="{{ im.url }}"/>
@ -296,7 +296,7 @@
</tr>
<tr>
<td>
<td valign="top">
<table style="width: 100%;">
<tr>
{% for sqs_obj in foreign %}
@ -305,7 +305,7 @@
<table style="width: 130px; margin: 0 auto;">
<tr>
<td style="padding-bottom: 15px;">
<img src="foreign_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}" style="border: 1px solid #eaeaea;"/>
<img src="cid:foreign_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}" style="border: 1px solid #eaeaea;"/>
{% comment %}
{% thumbnail obj.get_logo '109x114' as im %}
<img style="border: 1px solid #eaeaea;" src="{{ im.url }}"/>
@ -314,9 +314,9 @@
</td>
</tr>
<tr>
<td class="color1" style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px;">
<td class="color{{ forloop.counter }}" style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px;">
{% if obj.get_event_place_name %}
<img src="cid:m1" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
<img src="cid:m{{ forloop.counter }}" alt="" style="display: inline-block; vertical-align: middle; margin-right: 4px;">
{{ obj.get_event_place_name }}
{% endif %}
</td>

Write Preview
Loading…
Cancel
Save