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

Merge branch 'stage6' of bitbucket.org:Bonus_05/expomap into stage6

Browse Source
remotes/origin/stage6
Alexander Burdeinyi 9 years ago
parent 4771fb784d e611a3bf47
commit 67ceca0336
2 changed files with 72 additions and 78 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. 144
      emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
  2. 6
      templates/admin/_base.html

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

@ -162,7 +162,7 @@
<tr> <tr>
<td style="padding: 6px 0px 0px 0px;"> <td style="padding: 6px 0px 0px 0px;">
<a href="http://{{ domain }}{{ obj.get_permanent_url }}" style="display: inline-block; padding: 10px 30px; background-color: #ff6600; border-radius: 5px; text-transform: uppercase; color: #fff; text-decoration: none; font-size: 13px;">{% trans "посмотреть Подробнее" %} <img src="cid:white_arrow"></a> <a href="http://{{ 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"></a>
</td> </td>
</tr> </tr>
</table> </table>
@ -279,13 +279,30 @@
<tr> <tr>
<td valign="top" style="width: 110px;"> <td valign="top" style="width: 110px;">
<a href="https://{{ domain }}{{ obj.get_permanent_url }}" class="event_image"> <a href="https://{{ domain }}{{ obj.get_permanent_url }}" class="event_image">
{# {% thumbnail obj.get_logo '100x100' as im %}#}
<img src="cid:russia_{{ obj.event_type }}_{{ obj.pk }}"/> <img src="cid:russia_{{ obj.event_type }}_{{ obj.pk }}"/>
{# {% endthumbnail %}#}
</a> </a>
</td> </td>
<td style="padding-left: 20px; width: 470px;"> <td style="padding-left: 20px; width: 470px;">
<table cellspacing="0" cellpadding="0" border="0" style="width: 100%;"> <table cellspacing="0" cellpadding="0" border="0" style="width: 100%;">
<tr>
<td style="padding-bottom: 5px;"><a href="https://{{ domain }}{{ obj.get_permanent_url }}" class="event_title" style="font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; font-weight: bold; text-transform: uppercase; color: #333333; text-decoration: none;">{{ obj.name|safe }}</a></td>
</tr>
<tr>
<td style="font-size: 14px; color: #999999; padding-bottom: 5px;">{{ obj.main_title|safe }}</td>
</tr>
<tr>
<td style="color: #3399cc; font-size: 14px; padding-bottom: 3px;">
<table cellspacing="0" cellpadding="0" border="0">
<tr>
<td style="padding-right: 14px;"><img src="cid:calendar" alt=""></td>
<td>{{ obj.get_dates_v2 }}</td>
</tr>
</table>
</td>
</tr>
<tr> <tr>
{% if forloop.first %} {% if forloop.first %}
<td style="font-size: 13px; text-transform: uppercase; padding-bottom: 5px; color: #99cc66;"> <td style="font-size: 13px; text-transform: uppercase; padding-bottom: 5px; color: #99cc66;">
@ -323,25 +340,6 @@
{% endif %} {% endif %}
</tr> </tr>
<tr>
<td style="padding-bottom: 5px;"><a href="https://{{ domain }}{{ obj.get_permanent_url }}" class="event_title" style="font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; font-weight: bold; text-transform: uppercase; color: #333333; text-decoration: none;">{{ obj.name|safe }}</a></td>
</tr>
<tr>
<td style="font-size: 14px; color: #999999; padding-bottom: 5px;">{{ obj.main_title|safe }}</td>
</tr>
<tr>
<td style="color: #3399cc; font-size: 14px; padding-bottom: 3px;">
<table cellspacing="0" cellpadding="0" border="0">
<tr>
<td style="padding-right: 14px;"><img src="cid:calendar" alt=""></td>
<td>{{ obj.get_dates_v2 }}</td>
</tr>
</table>
</td>
</tr>
<tr> <tr>
<td style="padding-bottom: 18px; padding-top: 10px;"> <td style="padding-bottom: 18px; padding-top: 10px;">
<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> <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>
@ -384,59 +382,55 @@
<tr> <tr>
<td> <td>
{# <table cellspacing="0" cellpadding="0" border="0" style="width: 100%;">#} {% for sqs_obj in foreign %}
{# <tr>#} {% with sqs_obj.object as obj %}
{% for sqs_obj in foreign %} <table cellspacing="0" cellpadding="0" border="0" {% if not forloop.first %}style="padding-top: 20px; border-top: 1px solid #eaeaea;"{% endif %}>
{% with sqs_obj.object as obj %} <tr>
{# <td valign="top">#} <td valign="top" style="padding-bottom: 15px; text-align: center; width: 130px;">
<table cellspacing="0" cellpadding="0" border="0" {% if not forloop.first %}style="padding-top: 20px; border-top: 1px solid #eaeaea;"{% endif %}> <a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="foreign_image">
<tr> <img src="cid:foreign_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}"/>
<td valign="top" style="padding-bottom: 15px; text-align: center; width: 130px;"> </a>
<a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="foreign_image"> </td>
<img src="cid:foreign_{{ sqs_obj.object.event_type }}_{{ sqs_obj.object.pk }}"/> <td valign="top" style="padding-left: 20px; width: 450px;">
</a> <table border="0" cellspacing="0" cellpadding="0">
</td> <tr>
<td valign="top" style="padding-left: 20px; width: 450px;"> <td style="padding-bottom: 10px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_title" style="font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; font-weight: bold; text-transform: uppercase; color: #333333; text-decoration: none;">{{ obj.name|safe }}</a></td>
<table border="0" cellspacing="0" cellpadding="0"> </tr>
<tr>
<td style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px; {% if forloop.first %}color: #33ccff; {% elif forloop.counter == 2 %}color: #cc3399; {% elif forloop.counter == 3 %}color: #99cc66;{% elif forloop.counter == 4 %}color: #ff6600;{% endif %}"> <tr>
{% if obj.get_event_place_name %} <td style="color: #3399cc; font-size: 13px; line-height: 14px; padding-bottom: 5px;">
<table border="0" cellpadding="0" cellspacing="0"> <table border="0" cellpadding="0" cellspacing="0">
<tr> <tr>
<td style="padding-right: 5px;"><img src="cid:m{{ forloop.counter }}" alt=""></td> <td style="padding-right: 7px;"><img src="cid:calendar" alt=""></td>
<td>{{ obj.get_event_place_name }}</td> <td>{{ obj.get_dates_v2 }}</td>
</tr> </tr>
</table> </table>
{% endif %} </td>
</td> </tr>
</tr>
<tr> <tr>
<td style="padding-bottom: 10px;"><a href="http://{{ domain }}{{ obj.get_permanent_url }}" class="event_title" style="font-family: Arial,sans-serif; font-size: 17px; line-height: 21px; font-weight: bold; text-transform: uppercase; color: #333333; text-decoration: none;">{{ obj.name|safe }}</a></td> <td style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px; {% if forloop.first %}color: #33ccff; {% elif forloop.counter == 2 %}color: #cc3399; {% elif forloop.counter == 3 %}color: #99cc66;{% elif forloop.counter == 4 %}color: #ff6600;{% endif %}">
</tr> {% if obj.get_event_place_name %}
<tr> <table border="0" cellpadding="0" cellspacing="0">
<td style="color: #3399cc; font-size: 13px; line-height: 14px; padding-bottom: 5px;"> <tr>
<table border="0" cellpadding="0" cellspacing="0"> <td style="padding-right: 5px;"><img src="cid:m{{ forloop.counter }}" alt=""></td>
<tr> <td>{{ obj.get_event_place_name }}</td>
<td style="padding-right: 7px;"><img src="cid:calendar" alt=""></td> </tr>
<td>{{ obj.get_dates_v2 }}</td> </table>
</tr> {% endif %}
</table> </td>
</td> </tr>
</tr> <tr>
<tr> <td style="font-size: 13px; color: #999999;">
<td style="font-size: 13px; color: #999999;"> {% for tag in obj.tags %}<a href="http://{{ domain }}{{ obj.catalog }}tag/{{ tag.url }}" class="tag" style="font-size: 13px; color: #999999; text-decoration: none;">{{ tag.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
{% for tag in obj.tags %}<a href="http://{{ domain }}{{ obj.catalog }}tag/{{ tag.url }}" class="tag" style="font-size: 13px; color: #999999; text-decoration: none;">{{ tag.name }}</a>{% if not forloop.last %}, {% endif %}{% endfor %} </td>
</td> </tr>
</tr> </table>
</table> </td>
</td> </tr>
</tr> </table>
</table> {% endwith %}
{# </td>#} {% endfor %}
{% endwith %}
{% endfor %}
{# </tr>#}
{# </table>#}
</td> </td>
</tr> </tr>

6
templates/admin/_base.html
Unescape View File

@ -1,7 +1,7 @@
{% extends "c_admin/base.html" %} {% extends "c_admin/base.html" %}
{% load admin_static %} {% load admin_static %}
{% block span_num %}10{% endblock %} {% block span_num %}9{% endblock %}
{% block extrastyle %} {% block extrastyle %}
<link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}" /> <link rel="stylesheet" type="text/css" href="{% block stylesheet %}{% static "admin/css/base.css" %}{% endblock %}" />
@ -52,7 +52,7 @@
{% block body %} {% block body %}
<!-- Container --> <!-- Container -->
<div id="container"> {# <div id="container">#}
{% block breadcrumbs %} {% block breadcrumbs %}
{% endblock %} {% endblock %}
@ -78,6 +78,6 @@
<!-- END Content --> <!-- END Content -->
{% block footer %}<div id="footer"></div>{% endblock %} {% block footer %}<div id="footer"></div>{% endblock %}
</div> {# </div>#}
<!-- END Container --> <!-- END Container -->
{% endblock %} {% endblock %}

Write Preview
Loading…
Cancel
Save