From 3f5345ea5e82dce0982bf36d9884135c3c101b06 Mon Sep 17 00:00:00 2001
From: Kotiuk Nazarii <kotzillla@gmail.com>
Date: Wed, 2 Sep 2015 00:17:20 +0300
Subject: [PATCH] Master commit

---
 templates/client/base_catalog.html            |  2 ++
 templates/client/blank.html                   | 19 ++-------------
 .../client/exposition/exposition_detail.html  | 24 ++++---------------
 .../client/includes/banner_blocks/aside2.html | 22 +++++++++++++++++
 .../client/includes/banners/under_search.html |  5 +---
 5 files changed, 32 insertions(+), 40 deletions(-)
 create mode 100644 templates/client/includes/banner_blocks/aside2.html

diff --git a/templates/client/base_catalog.html b/templates/client/base_catalog.html
index 42d7fcaa..c3dad2cc 100644
--- a/templates/client/base_catalog.html
+++ b/templates/client/base_catalog.html
@@ -52,6 +52,8 @@
                 {% endblock %}
                     {% include 'client/includes/side_confs.html' %}
                     <hr />
+                    {% include 'client/includes/banner_blocks/aside2.html' %}
+                    <hr />
                     <div class="s-news-list">
                         {% include 'client/includes/news.html' with news=news_list %}
                     </div>
diff --git a/templates/client/blank.html b/templates/client/blank.html
index 169d8388..4db2da11 100644
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@@ -164,14 +164,6 @@ This template include basic anf main styles and js files,
     {% if not request.COOKIES.popover_test1 %}
     {% if theme_for_filter %}
 
-
-        {% if theme_for_filter.id == 2 %}
-            {% if False|random_social %}
-                {% include 'client/popups/auto_modal.html' %}
-            {% else %}
-                {% include 'client/popups/auto_banner.html' %}
-            {% endif %}
-        {% endif %}
         {% if theme_for_filter.id == 54 or theme_for_filter.id == 26 or theme_for_filter.id == 22 or theme_for_filter.id == 15 or theme_for_filter.id == 44 or theme_for_filter.id == 30 %}
             {% with r=False|random3 %}
             {% if r == 1 %}
@@ -187,18 +179,11 @@ This template include basic anf main styles and js files,
         {% endif %}
 
         {% if theme_for_filter.id == 32 %}
-            {% with r=False|random5 %}
+            {% with r=False|random3 %}
                 {% if r == 1 %}
-                    {% include 'client/popups/auto_modal.html' %}
-                {% endif %}
-
-                {% if r == 2 %}
-                    {% include 'client/popups/auto_banner.html' %}
-                {% endif %}
-                {% if r == 3 %}
                     {% include 'client/popups/cemat_modal.html' %}
                 {% endif %}
-                {% if r == 4 %}
+                {% if r == 2 %}
                     {% include 'client/popups/cemat_banner1.html' %}
                 {% endif %}
                 {% if r == 0 %}
diff --git a/templates/client/exposition/exposition_detail.html b/templates/client/exposition/exposition_detail.html
index 8a365de1..7cc0cb3d 100644
--- a/templates/client/exposition/exposition_detail.html
+++ b/templates/client/exposition/exposition_detail.html
@@ -34,21 +34,14 @@
 
     {% with theme_ids=object.theme_ids %}
     {% if 32 in theme_ids %}
-        {% with r=False|random5 %}
-            {% if r == 1 %}
-                {% include 'client/popups/auto_modal.html' %}
-            {% endif %}
-
-            {% if r == 2 %}
-                {% include 'client/popups/auto_banner.html' %}
-            {% endif %}
-            {% if r == 3 %}
+        {% with r=False|random3 %}
+            {% if r == 0 %}
                 {% include 'client/popups/cemat_modal.html' %}
             {% endif %}
-            {% if r == 4 %}
+            {% if r == 1 %}
                 {% include 'client/popups/cemat_banner1.html' %}
             {% endif %}
-            {% if r == 5 %}
+            {% if r == 2 %}
                 {% include 'client/popups/cemat_banner2.html' %}
             {% endif %}
         {% endwith %}
@@ -65,14 +58,7 @@
                 {% endif %}
             {% endif %}
             {% endwith %}
-        {% else %}
-            {% if 2 in theme_ids %}
-                {% if False|random_social %}
-                    {% include 'client/popups/auto_modal.html' %}
-                {% else %}
-                    {% include 'client/popups/auto_banner.html' %}
-                {% endif %}
-            {% endif %}
+
         {% endif %}
     {% endif %}
     {% endwith %}
diff --git a/templates/client/includes/banner_blocks/aside2.html b/templates/client/includes/banner_blocks/aside2.html
new file mode 100644
index 00000000..b8bc1003
--- /dev/null
+++ b/templates/client/includes/banner_blocks/aside2.html
@@ -0,0 +1,22 @@
+<div id="aside_2">
+<!-- Яндекс.Директ -->
+<script type="text/javascript">
+yandex_partner_id = 58151;
+yandex_site_bg_color = 'FFFFF';
+yandex_ad_format = 'direct';
+yandex_font_size = 1;
+yandex_direct_type = 'vertical';
+yandex_direct_limit = 3;
+yandex_direct_title_font_size = 3;
+yandex_direct_links_underline = false;
+yandex_direct_title_color = '666666';
+yandex_direct_url_color = '000000';
+yandex_direct_text_color = '000000';
+yandex_direct_hover_color = 'FF8000';
+yandex_direct_sitelinks_color = 'FF8000';
+yandex_direct_favicon = false;
+yandex_no_sitelinks = false;
+document.write('<scr'+'ipt type="text/javascript" src="//an.yandex.ru/system/context.js"></scr'+'ipt>');
+</script>
+
+</div>
\ No newline at end of file
diff --git a/templates/client/includes/banners/under_search.html b/templates/client/includes/banners/under_search.html
index 4d80cf36..f2c3f38f 100644
--- a/templates/client/includes/banners/under_search.html
+++ b/templates/client/includes/banners/under_search.html
@@ -2,7 +2,7 @@
 {% load template_filters %}
 
 <div class="abn">
-    {% with r=False|random4 %}
+    {% with r=False|random3 %}
         {% ifequal r 0 %}
             <a target="_blank" href="/redirect/redirect/57/"><img src="{% static 'client/img/partners/cemat15_900x130_bilet.gif' %}" alt="" /></a>
         {% endifequal %}
@@ -10,9 +10,6 @@
             <a target="_blank" href="/redirect/redirect/58/"><img src="{% static 'client/img/partners/beach.png' %}" alt="" /></a>
         {% endifequal %}
         {% ifequal r 2 %}
-            <a target="_blank" href="/redirect/redirect/59/"><img src="{% static 'client/img/partners/mims15_900x130_bilet.gif' %}" alt="" /></a>
-        {% endifequal %}
-        {% ifequal r 3 %}
             <a target="_blank" href="/redirect/redirect/61/"><img src="{% static 'client/img/partners/IPSA_2015_web_900x130.gif' %}" alt="" /></a>
         {% endifequal %}
     {% endwith %}