diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
index 6179dbca..91729a50 100644
--- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
+++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
@@ -162,7 +162,7 @@
- {% trans "посмотреть Подробнее" %}
+ {% trans "посмотреть Подробнее" %}
|
@@ -279,13 +279,30 @@
-{# {% thumbnail obj.get_logo '100x100' as im %}#}
-{# {% endthumbnail %}#}
|
+
+ | {{ obj.name|safe }} |
+
+
+
+ | {{ obj.main_title|safe }} |
+
+
+
+
+
+
+  |
+ {{ obj.get_dates_v2 }} |
+
+
+ |
+
+
{% if forloop.first %}
|
@@ -323,25 +340,6 @@
{% endif %}
|
-
- | {{ obj.name|safe }} |
-
-
-
- | {{ obj.main_title|safe }} |
-
-
-
-
-
-
-  |
- {{ obj.get_dates_v2 }} |
-
-
- |
-
-
{% trans "подробнее" %}
@@ -384,59 +382,55 @@
|
-{# #}
-{# #}
- {% for sqs_obj in foreign %}
- {% with sqs_obj.object as obj %}
-{# #}
-
-
-
-
-
-
- |
-
-
-
-
- {% if obj.get_event_place_name %}
-
-
-  |
- {{ obj.get_event_place_name }} |
-
-
- {% endif %}
- |
-
-
- | {{ obj.name|safe }} |
-
-
-
-
-
-  |
- {{ obj.get_dates_v2 }} |
-
-
- |
-
-
- |
- {% for tag in obj.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}
- |
-
-
- |
-
-
-{# | #}
- {% endwith %}
- {% endfor %}
-{# #}
-{# #}
+ {% for sqs_obj in foreign %}
+ {% with sqs_obj.object as obj %}
+
+
+
+
+
+
+ |
+
+
+
+ | {{ obj.name|safe }} |
+
+
+
+
+
+
+  |
+ {{ obj.get_dates_v2 }} |
+
+
+ |
+
+
+
+
+ {% if obj.get_event_place_name %}
+
+
+  |
+ {{ obj.get_event_place_name }} |
+
+
+ {% endif %}
+ |
+
+
+ |
+ {% for tag in obj.tags %}{{ tag.name }}{% if not forloop.last %}, {% endif %}{% endfor %}
+ |
+
+
+ |
+
+
+ {% endwith %}
+ {% endfor %}
|
diff --git a/templates/admin/_base.html b/templates/admin/_base.html
index 36cf2bfd..6d0e34a3 100644
--- a/templates/admin/_base.html
+++ b/templates/admin/_base.html
@@ -1,7 +1,7 @@
{% extends "c_admin/base.html" %}
{% load admin_static %}
-{% block span_num %}10{% endblock %}
+{% block span_num %}9{% endblock %}
{% block extrastyle %}
@@ -52,7 +52,7 @@
{% block body %}
-
+{# #}
{% block breadcrumbs %}
{% endblock %}
@@ -78,6 +78,6 @@
{% block footer %}{% endblock %}
-
+{# #}
{% endblock %}
|