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

email fix

Browse Source
remotes/origin/stage6
ya_dim4ik 9 years ago
parent d5a89eb8fe
commit 0214cc7a12
3 changed files with 47 additions and 69 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. 63
      emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
  2. 13
      static/mailing_settings/css/main.css
  3. 40
      templates/client/accounts/mailing_settings.html

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

@ -108,52 +108,43 @@
<td align="center" style="padding:45px 0px 40px 0px;"> <td align="center" style="padding:45px 0px 40px 0px;">
<table cellspacing="0" cellpadding="0" border="0" style="width: 100%;"> <table cellspacing="0" cellpadding="0" border="0" style="width: 100%;">
<tr> <tr>
<td align="center" style="color: #333333; font-size: 28px; font-weight: bold; text-transform: uppercase; padding-bottom: 35px;">{% trans "Самые важные события для вас" %}</td> <td align="center" style="color: #333333; font-size: 28px; font-weight: normal; text-transform: uppercase; padding-bottom: 35px;">{% trans "Самые важные события для вас" %}</td>
</tr> </tr>
</table> </table>
<table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin: 0 auto;"> <table cellspacing="0" cellpadding="0" border="0" style="width: 600px; margin: 0 auto;">
<tr> <tr>
<td valign="top" style="width: 225px;"> <td valign="top" style="width: 170px;">
<a href="http://{{ domain }}{{ obj.get_permanent_url }}"><img src="cid:recommended{{ obj.pk }}" style="margin-top: -2px;"/></a>{# {% endthumbnail %}#} {# TODO: Сменить размер картинки на 170x170 #}
</td> <a href="http://{{ domain }}{{ obj.get_permanent_url }}"><img src="cid:recommended{{ obj.pk }}" style="margin-top: -2px;"/></a>{# {% endthumbnail %}#}
</td>
<td valign="top" align="left" style="padding-left: 22px;"> <td valign="top" align="left" style="padding-left: 22px;">
<table cellspacing="0" cellpadding="0" border="0" style="wigth: 100%;"> <table cellspacing="0" cellpadding="0" border="0" style="wigth: 100%;">
{% 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> <tr>
<td style="padding: 3px 0px 3px 0px;"> <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> <a href="http://{{ domain }}{{ obj.get_permanent_url }}" style="color: #333333; font-size: 25px; font-weight: normal; text-decoration: none;">{{ obj.name|safe }}</a>
</td>
</tr> </tr>
<tr> <tr>
<td style="color: #3399cc; font-size: 17px; padding: 3px 0px 3px 0px;"> <td style="color: #333333; font-size: 16px; padding: 3px 0px 3px 0px;">
<table border="0" cellpadding="0" cellspacing="0"> {{ obj.main_title|safe }}
<tr> </td>
<td style="padding-right: 9px;"><img src="cid:calendar" style="margin-top: -2px; alt=""></td>
<td>{{ obj.get_dates_v2 }}{% if obj.get_event_place_name %}, {{ obj.get_event_place_name }}{% endif %}</td>
</tr>
</table>
</td>
</tr> </tr>
<tr> <tr>
<td style="color: #333333; font-size: 16px; padding: 3px 0px 3px 0px;"> <td style="color: #3399cc; font-size: 17px; padding: 3px 0px 3px 0px;">
{{ obj.main_title|safe }} <table border="0" cellpadding="0" cellspacing="0">
</td> <tr>
<td style="padding-right: 9px;"><img src="cid:calendar" style="margin-top: -2px; alt="></td>
<td>{{ obj.get_dates_v2 }}{% if obj.get_event_place_name %}, {{ obj.get_event_place_name }}{% endif %}</td>
</tr>
</table>
</td>
</tr> </tr>
{% comment %}
<tr> <tr>
<td style="color: #999999; font-size: 13px; padding: 3px 0px 15px 0px;"> <td style="color: #999999; font-size: 13px; padding: 3px 0px 15px 0px;">
{% for tag in obj.tags %} {% for tag in obj.tags %}
@ -161,6 +152,20 @@
{% endfor %} {% endfor %}
</td> </td>
</tr> </tr>
{% endcomment %}
{% 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> <tr>
<td style="padding: 6px 0px 0px 0px;"> <td style="padding: 6px 0px 0px 0px;">

13
static/mailing_settings/css/main.css
Unescape View File

@ -69,7 +69,7 @@
.page_header{ .page_header{
background: url(../images/header.jpg) no-repeat top fixed; background: url(../images/header.jpg) no-repeat top fixed;
padding: 16px 0 88px; padding: 16px 0 35px;
} }
h1{ h1{
@ -111,6 +111,17 @@ h3{
transition: color .3s; transition: color .3s;
} }
.page_header p{
padding-top: 25px;
font-size: 22px;
color: #fff;
text-align: center;
}
.page_header p span{
color: #FF6600;
}
.themes_block, .themes_block,
.period_block{ .period_block{
background-color: #fbfbfb; background-color: #fbfbfb;

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

@ -21,6 +21,7 @@
<a href="/" class="back_to_site">expomap.ru <span>&#8250;</span></a> <a href="/" class="back_to_site">expomap.ru <span>&#8250;</span></a>
</div> </div>
<h1>{% trans 'Настройте рассылку от Expomap' %}</h1> <h1>{% trans 'Настройте рассылку от Expomap' %}</h1>
<p>{% trans 'для' %} <span>{{ request.user }}</span></p>
</div> </div>
</header> </header>
@ -187,46 +188,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.4/jquery.fancybox.pack.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/fancybox/2.1.4/jquery.fancybox.pack.min.js" defer></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.min.js" defer></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/malihu-custom-scrollbar-plugin/3.1.5/jquery.mCustomScrollbar.min.js" defer></script>
<script type="application/javascript">
// var checked_r_cities = [ {{ checked_r_cities|join:', ' }} ];
// var checked_f_countries = [ {{ checked_f_countries|join:', ' }} ];
// var checked_th = [ {{ checked_th|join:', ' }} ];
// var checked_tg = [ {{ checked_tg|join:', ' }} ];
// var user_choice = {
// th: {
// 1: "Авиакосмическая промышленность",
// 94: "АПК и пищевая индустрия"
// },
// tg: {
//
// },
// r_cities: {
// "-1034272": "Алушта",
// "-2880021": "Астрахань",
// "-2883930": "Белгород"
// },
// area: {
// 4: "Европа"
// },
// co: {
// 16: "Бангладеш",
// 194: "Вьетнам"
// }
// };
</script>
<script src="{% static 'mailing_settings/js/main.js' %}" defer></script> <script src="{% static 'mailing_settings/js/main.js' %}" defer></script>
{# {% if not object.subscriber %}#}
{# <script>#}
{# $(document).ready(function() {#}
{# var popupUnsibscribed = $('#unsibscribed');#}
{# $.fancybox(popupUnsibscribed, fbPopupOptions);#}
{# });#}
{# </script>#}
{# <div class="reversed" style="border-left: 5px solid #ff9900; padding: 8px 12px; background-color: #fff; font-size:17px; text-align: justify; margin-bottom: 10px">#}
{# {% trans "Вы не являетесь подписчиком. Чтобы подписаться, выберите интересующие Вас данные." %}#}
{# </div>#}
{# {% endif %}#}
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save