From 0ef2a8d2e2bc64df0c977c1e63e949b4c0663436 Mon Sep 17 00:00:00 2001
From: Kotiuk Nazarii <kotzillla@gmail.com>
Date: Fri, 4 Sep 2015 02:16:23 +0300
Subject: [PATCH 1/2] google analitic

---
 templates/client/blank.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/templates/client/blank.html b/templates/client/blank.html
index 00219448..526f8aec 100644
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@@ -77,6 +77,15 @@ This template include basic anf main styles and js files,
 			socialInputMask:['http://','https://']
 		});
 	</script>
+    <!-- Google Tag Manager -->
+    <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-P5C6GR"
+    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+    '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-P5C6GR');</script>
+    <!-- End Google Tag Manager -->
 
  <!--test expo_b -->
     <script>

From 6bcc90412aa13a7cd0600ad2846d5fed7ceb7b7e Mon Sep 17 00:00:00 2001
From: Nazar Kotjuk <kotzillla@gmail.com>
Date: Thu, 17 Sep 2015 15:20:03 +0300
Subject: [PATCH 2/2] Template hot fixes

---
 expobanner/admin.py                           |  2 +-
 expobanner/admin_urls.py                      |  2 +-
 functions/models_methods.py                   |  6 ++-
 templates/client/blank.html                   |  1 +
 .../client/includes/article/blog_list.html    |  2 +-
 .../client/includes/article/news_list.html    |  2 +-
 .../client/includes/banners/aside_2.html      | 15 +++----
 .../client/includes/banners/aside_4.html      |  9 ++++
 .../includes/banners/catalog_inner.html       | 35 +++++-----------
 .../includes/banners/catalog_inner_2.html     | 21 ++++++++++
 .../client/includes/banners/detail_inner.html | 41 +++++++++----------
 .../includes/banners/detail_inner_3.html      | 11 +++++
 .../client/includes/banners/popup_2.html      |  2 +
 .../client/includes/company/company_list.html |  2 +-
 .../includes/company/company_object.html      |  1 +
 .../includes/conference/conference_list.html  |  2 +-
 .../conference/conference_object.html         |  1 +
 .../includes/exposition/exposition_list.html  |  2 +-
 .../exposition/exposition_object.html         |  3 +-
 .../client/includes/exposition/members.html   |  2 +-
 .../includes/exposition/search_result.html    |  2 +-
 .../client/includes/exposition/visitors.html  |  2 +-
 .../client/includes/place/place_list.html     |  2 +-
 .../client/includes/place/place_object.html   |  1 +
 24 files changed, 102 insertions(+), 67 deletions(-)
 create mode 100644 templates/client/includes/banners/detail_inner_3.html
 create mode 100644 templates/client/includes/banners/popup_2.html

diff --git a/expobanner/admin.py b/expobanner/admin.py
index 311c83f8..cfcaa599 100644
--- a/expobanner/admin.py
+++ b/expobanner/admin.py
@@ -241,4 +241,4 @@ class TopUpdate(UpdateView):
         context = super(TopUpdate, self).get_context_data(**kwargs)
         obj = self.object
         context['exposition'] = obj.get_event()
-        return context
+        return context
\ No newline at end of file
diff --git a/expobanner/admin_urls.py b/expobanner/admin_urls.py
index d91abfca..cce3e1aa 100644
--- a/expobanner/admin_urls.py
+++ b/expobanner/admin_urls.py
@@ -29,7 +29,7 @@ urlpatterns = patterns('expobanner.admin',
     url(r'^top/list/$', TopList.as_view(), name='expobanner-list_top'),
     url(r'^top/(?P<pk>\d+)/edit/$', TopUpdate.as_view(), name='expobanner-update_top'),
     url(r'^top/$', TopCreate.as_view(), name='expobanner-create_top'),
-    url(r'^top/(?P<pk>\d+)/stat/$', PaidStat.as_view(), name='expobanner_stat_top'),
+    url(r'^top/(?P<pk>\d+)/stat/$', MainStat.as_view(), name='expobanner_stat_top'),
     # main page
     url(r'^main/list/$', MainList.as_view(), name='expobanner-list_main'),
     url(r'^main/(?P<pk>\d+)/edit/$', MainUpdate.as_view(), name='expobanner-update_main'),
diff --git a/functions/models_methods.py b/functions/models_methods.py
index 064667ac..c5c45e58 100644
--- a/functions/models_methods.py
+++ b/functions/models_methods.py
@@ -30,7 +30,11 @@ class ExpoManager(TranslationManager):
         key = 'expo_main_page_key_%s'%lang
         result = cache.get(key)
         if not result:
-            result = list(self.language(lang).select_related('country', 'city', 'place', 'main').prefetch_related('tag').filter(main__isnull=False))
+            result = list(self.language(lang).
+                          select_related('country', 'city', 'place', 'main').
+                          prefetch_related('tag').
+                          filter(main__isnull=False).
+                          filter(main__public=True))
             cache.set(key, result, 45)
 
         return result
diff --git a/templates/client/blank.html b/templates/client/blank.html
index 04a4d77e..594550da 100644
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@@ -137,6 +137,7 @@ This template include basic anf main styles and js files,
 
 	{% include 'client/popups/callback.html' %}
     {% include 'client/includes/banners/popup.html' %}
+    {% include 'client/includes/banners/popup_2.html' %}
     {% block popup_banner %}
     {% endblock %}
 	{# if user doesnt have url-  show form #}
diff --git a/templates/client/includes/article/blog_list.html b/templates/client/includes/article/blog_list.html
index 0c70bd85..afd7969d 100644
--- a/templates/client/includes/article/blog_list.html
+++ b/templates/client/includes/article/blog_list.html
@@ -14,7 +14,7 @@
                     {% include 'client/includes/banners/catalog_inner_2.html' %}
             {% endif %}
 
-            {% if forloop.counter == 8 %}
+            {% if forloop.counter == 10 %}
                 {% include 'client/includes/banners/catalog_inner.html' %}
             {%endif %}
 		{% endfor %}
diff --git a/templates/client/includes/article/news_list.html b/templates/client/includes/article/news_list.html
index b2cc424b..8171901d 100644
--- a/templates/client/includes/article/news_list.html
+++ b/templates/client/includes/article/news_list.html
@@ -14,7 +14,7 @@
                 {% include 'client/includes/banners/catalog_inner_2.html' %}
         {% endif %}
 
-        {% if forloop.counter == 8 %}
+        {% if forloop.counter == 10 %}
             {% include 'client/includes/banners/catalog_inner.html' %}
         {%endif %}
 	{% endfor %}
diff --git a/templates/client/includes/banners/aside_2.html b/templates/client/includes/banners/aside_2.html
index 439bfe68..0c637c72 100644
--- a/templates/client/includes/banners/aside_2.html
+++ b/templates/client/includes/banners/aside_2.html
@@ -5,17 +5,18 @@
         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_type = 'posterVertical';
+        yandex_direct_border_type = 'ad';
+        yandex_direct_limit = 2;
         yandex_direct_title_font_size = 3;
         yandex_direct_links_underline = false;
-        yandex_direct_title_color = '666666';
-        yandex_direct_url_color = '000000';
+        yandex_direct_border_color = 'CCCCCC';
+        yandex_direct_title_color = '333333';
+        yandex_direct_url_color = '666666';
         yandex_direct_text_color = '000000';
         yandex_direct_hover_color = 'FF8000';
-        yandex_direct_sitelinks_color = 'FF8000';
-        yandex_direct_favicon = false;
+        yandex_direct_sitelinks_color = '333333';
+        yandex_direct_favicon = true;
         yandex_no_sitelinks = false;
         document.write('<scr'+'ipt type="text/javascript" src="//an.yandex.ru/system/context.js"></scr'+'ipt>');
         </script>
diff --git a/templates/client/includes/banners/aside_4.html b/templates/client/includes/banners/aside_4.html
index 94d6023e..28a2f1c6 100644
--- a/templates/client/includes/banners/aside_4.html
+++ b/templates/client/includes/banners/aside_4.html
@@ -1,4 +1,13 @@
 <div class="sbnr">
     <div class="sbnr-wrap" id="expo_b_aside_4">
+        <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+        <!-- 180х300 -->
+        <ins class="adsbygoogle"
+        style="display:inline-block;width:180px;height:300px"
+        data-ad-client="ca-pub-5242360491829403"
+        data-ad-slot="6657149578"></ins>
+        <script>
+        (adsbygoogle = window.adsbygoogle || []).push({});
+        </script>
     </div>
 </div>
\ No newline at end of file
diff --git a/templates/client/includes/banners/catalog_inner.html b/templates/client/includes/banners/catalog_inner.html
index ccf1add4..272f9963 100644
--- a/templates/client/includes/banners/catalog_inner.html
+++ b/templates/client/includes/banners/catalog_inner.html
@@ -1,26 +1,11 @@
-<div id="expo_b_catalog_inner">
-    <script type="text/javascript">
-		yandex_partner_id = 58151;
-		yandex_site_bg_color = 'FFFFFF';
-		yandex_ad_format = 'direct';
-		yandex_font_size = 1;
-		yandex_direct_type = 'horizontal';
-		yandex_direct_border_type = 'block';
-		yandex_direct_limit = 3;
-		yandex_direct_title_font_size = 3;
-		yandex_direct_border_radius = true;
-		yandex_direct_links_underline = false;
-		yandex_direct_header_bg_color = 'FEEAC7';
-		yandex_direct_bg_color = 'FFF9F0';
-		yandex_direct_border_color = 'FBE5C0';
-		yandex_direct_title_color = '666666';
-		yandex_direct_url_color = '000000';
-		yandex_direct_text_color = '000000';
-		yandex_direct_hover_color = 'FF3333';
-		yandex_direct_sitelinks_color = '666666';
-		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 class="abn" id="expo_b_catalog_inner">
+    <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+    <!-- Горизонтальный -->
+    <ins class="adsbygoogle"
+    style="display:inline-block;width:728px;height:90px"
+    data-ad-client="ca-pub-5242360491829403"
+    data-ad-slot="6420652378"></ins>
+    <script>
+        (adsbygoogle = window.adsbygoogle || []).push({});
+    </script>
 </div>
\ No newline at end of file
diff --git a/templates/client/includes/banners/catalog_inner_2.html b/templates/client/includes/banners/catalog_inner_2.html
index b8ec5c0f..fd12557e 100644
--- a/templates/client/includes/banners/catalog_inner_2.html
+++ b/templates/client/includes/banners/catalog_inner_2.html
@@ -1,2 +1,23 @@
 <div id="expo_b_catalog_inner_2">
+    <!-- Яндекс.Директ -->
+    <script type="text/javascript">
+        yandex_partner_id = 58151;
+        yandex_site_bg_color = 'FFFFF';
+        yandex_ad_format = 'direct';
+        yandex_direct_type = 'posterHorizontal';
+        yandex_direct_border_type = 'block';
+        yandex_direct_limit = 3;
+        yandex_direct_title_font_size = 3;
+        yandex_direct_border_radius = true;
+        yandex_direct_links_underline = false;
+        yandex_direct_border_color = 'FBE5C0';
+        yandex_direct_title_color = '333333';
+        yandex_direct_url_color = '666666';
+        yandex_direct_text_color = '000000';
+        yandex_direct_hover_color = 'FF8000';
+        yandex_direct_sitelinks_color = '333333';
+        yandex_direct_favicon = true;
+        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/detail_inner.html b/templates/client/includes/banners/detail_inner.html
index 6d0760aa..e28563bd 100644
--- a/templates/client/includes/banners/detail_inner.html
+++ b/templates/client/includes/banners/detail_inner.html
@@ -1,25 +1,22 @@
 <div id="expo_b_detail_inner">
     <script type="text/javascript">
-				yandex_partner_id = 58151;
-				yandex_site_bg_color = 'FFFFFF';
-				yandex_ad_format = 'direct';
-				yandex_font_size = 1;
-				yandex_direct_type = 'horizontal';
-				yandex_direct_border_type = 'block';
-				yandex_direct_limit = 3;
-				yandex_direct_title_font_size = 3;
-				yandex_direct_border_radius = true;
-				yandex_direct_links_underline = false;
-				yandex_direct_header_bg_color = 'FEEAC7';
-				yandex_direct_bg_color = 'FFF9F0';
-				yandex_direct_border_color = 'FBE5C0';
-				yandex_direct_title_color = '666666';
-				yandex_direct_url_color = '000000';
-				yandex_direct_text_color = '000000';
-				yandex_direct_hover_color = 'FF3333';
-				yandex_direct_sitelinks_color = '666666';
-				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>
+        yandex_partner_id = 58151;
+        yandex_site_bg_color = 'FFFFF';
+        yandex_ad_format = 'direct';
+        yandex_direct_type = 'posterHorizontal';
+        yandex_direct_border_type = 'block';
+        yandex_direct_limit = 3;
+        yandex_direct_title_font_size = 3;
+        yandex_direct_border_radius = true;
+        yandex_direct_links_underline = false;
+        yandex_direct_border_color = 'FBE5C0';
+        yandex_direct_title_color = '333333';
+        yandex_direct_url_color = '666666';
+        yandex_direct_text_color = '000000';
+        yandex_direct_hover_color = 'FF8000';
+        yandex_direct_sitelinks_color = '333333';
+        yandex_direct_favicon = true;
+        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/detail_inner_3.html b/templates/client/includes/banners/detail_inner_3.html
new file mode 100644
index 00000000..7315e28e
--- /dev/null
+++ b/templates/client/includes/banners/detail_inner_3.html
@@ -0,0 +1,11 @@
+<div class="abn" id="expo_b_detail_inner_3">
+    <script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+    <!-- Горизонтальный -->
+    <ins class="adsbygoogle"
+    style="display:inline-block;width:728px;height:90px"
+    data-ad-client="ca-pub-5242360491829403"
+    data-ad-slot="6420652378"></ins>
+    <script>
+        (adsbygoogle = window.adsbygoogle || []).push({});
+    </script>
+</div>
\ No newline at end of file
diff --git a/templates/client/includes/banners/popup_2.html b/templates/client/includes/banners/popup_2.html
new file mode 100644
index 00000000..75c55929
--- /dev/null
+++ b/templates/client/includes/banners/popup_2.html
@@ -0,0 +1,2 @@
+<div id="expo_b_popup_2" class="popup-window"  style="width:700px;">
+</div>
\ No newline at end of file
diff --git a/templates/client/includes/company/company_list.html b/templates/client/includes/company/company_list.html
index 89614691..b0089a78 100644
--- a/templates/client/includes/company/company_list.html
+++ b/templates/client/includes/company/company_list.html
@@ -64,7 +64,7 @@
             {% include 'client/includes/banners/catalog_inner_2.html' %}
     {% endif %}
 
-	{% if forloop.counter == 8 %}
+	{% if forloop.counter == 10 %}
         {% include 'client/includes/banners/catalog_inner.html' %}
 	{%endif %}
     {% endfor %}
diff --git a/templates/client/includes/company/company_object.html b/templates/client/includes/company/company_object.html
index 57bb11b5..93489d5c 100644
--- a/templates/client/includes/company/company_object.html
+++ b/templates/client/includes/company/company_object.html
@@ -216,6 +216,7 @@
             <a class="button more" href="/expo/members/{{ company.url }}">{% trans 'Все события' %}</a>
             {% endif %}
         </div>
+        {% include 'client/includes/banners/detail_inner_3.html' %}
 		{% if company.get_expositions_number > 0 or company.get_conferences_number > 0 or company.get_seminars_number > 0 %}
         	<hr />
 		{% endif %}
diff --git a/templates/client/includes/conference/conference_list.html b/templates/client/includes/conference/conference_list.html
index c1d2487f..d3084307 100644
--- a/templates/client/includes/conference/conference_list.html
+++ b/templates/client/includes/conference/conference_list.html
@@ -96,7 +96,7 @@
                 {% include 'client/includes/banners/catalog_inner_2.html' %}
         {% endif %}
 
-        {% if forloop.counter == 8 %}
+        {% if forloop.counter == 10 %}
             {% include 'client/includes/banners/catalog_inner.html' %}
         {%endif %}
         {% endfor %}
diff --git a/templates/client/includes/conference/conference_object.html b/templates/client/includes/conference/conference_object.html
index 02b61d28..aed18bdc 100644
--- a/templates/client/includes/conference/conference_object.html
+++ b/templates/client/includes/conference/conference_object.html
@@ -332,6 +332,7 @@
 		</ul>
 	</div>
 	{% endif %}
+    {% include 'client/includes/banners/detail_inner_3.html' %}
 	<div class="e-cat look-also">
 		<div class="sect-title">{% trans 'Смотрите также:' %}</div>
 		<a href="{{ event.catalog }}city/{{ event.city.url }}/">{% trans "Конференции" %} {% if request.LANGUAGE_CODE == 'ru' and event.city.inflect %}{{ event.city.inflect }}{% else %}{% trans 'in' %} {{ event.city.name }}{% endif %}</a>
diff --git a/templates/client/includes/exposition/exposition_list.html b/templates/client/includes/exposition/exposition_list.html
index 6f27536d..5730ceb8 100644
--- a/templates/client/includes/exposition/exposition_list.html
+++ b/templates/client/includes/exposition/exposition_list.html
@@ -104,7 +104,7 @@
             {% include 'client/includes/banners/catalog_inner_2.html' %}
     {% endif %}
 
-	{% if forloop.counter == 8 %}
+	{% if forloop.counter == 10 %}
         {% include 'client/includes/banners/catalog_inner.html' %}
 	{%endif %}
 	{% endfor %}
diff --git a/templates/client/includes/exposition/exposition_object.html b/templates/client/includes/exposition/exposition_object.html
index dc783ff0..737182a9 100644
--- a/templates/client/includes/exposition/exposition_object.html
+++ b/templates/client/includes/exposition/exposition_object.html
@@ -67,7 +67,7 @@
                             </div>
                         </header>
                     </div>
-
+\1
 				{% endif %}
 				<hr />
 				<div class="i-buttons clearfix">
@@ -352,6 +352,7 @@
 			{% endfor %}
 		</ul>
 	</div>
+    {% include 'client/includes/banners/detail_inner_3.html' %}
 	{% endif %}
 	<div class="e-cat look-also">
 		<div class="sect-title">{% trans 'Смотрите также:' %}</div>
diff --git a/templates/client/includes/exposition/members.html b/templates/client/includes/exposition/members.html
index d0bd4e4a..ee143f72 100644
--- a/templates/client/includes/exposition/members.html
+++ b/templates/client/includes/exposition/members.html
@@ -53,7 +53,7 @@
             {% include 'client/includes/banners/catalog_inner_2.html' %}
     {% endif %}
 
-	{% if forloop.counter == 8 %}
+	{% if forloop.counter == 10 %}
         {% include 'client/includes/banners/catalog_inner.html' %}
 	{%endif %}
     {% endfor %}
diff --git a/templates/client/includes/exposition/search_result.html b/templates/client/includes/exposition/search_result.html
index 93bc23af..5f791b9d 100644
--- a/templates/client/includes/exposition/search_result.html
+++ b/templates/client/includes/exposition/search_result.html
@@ -87,7 +87,7 @@
             {% include 'client/includes/banners/catalog_inner_2.html' %}
     {% endif %}
 
-    {% if forloop.counter == 8 %}
+    {% if forloop.counter == 10 %}
         {% include 'client/includes/banners/catalog_inner.html' %}
     {%endif %}
 	{% endfor %}
diff --git a/templates/client/includes/exposition/visitors.html b/templates/client/includes/exposition/visitors.html
index 0958316b..d6254aab 100644
--- a/templates/client/includes/exposition/visitors.html
+++ b/templates/client/includes/exposition/visitors.html
@@ -55,7 +55,7 @@
             {% include 'client/includes/banners/catalog_inner_2.html' %}
     {% endif %}
 
-	{% if forloop.counter == 8 %}
+	{% if forloop.counter == 10 %}
         {% include 'client/includes/banners/catalog_inner.html' %}
 	{%endif %}
 {% endfor %}
diff --git a/templates/client/includes/place/place_list.html b/templates/client/includes/place/place_list.html
index 936a8bf6..69ef1376 100644
--- a/templates/client/includes/place/place_list.html
+++ b/templates/client/includes/place/place_list.html
@@ -52,7 +52,7 @@
                     {% include 'client/includes/banners/catalog_inner_2.html' %}
             {% endif %}
 
-            {% if forloop.counter == 8 %}
+            {% if forloop.counter == 10 %}
                 {% include 'client/includes/banners/catalog_inner.html' %}
             {%endif %}
         {% endfor %}
diff --git a/templates/client/includes/place/place_object.html b/templates/client/includes/place/place_object.html
index 9d6b5e10..4be3f158 100644
--- a/templates/client/includes/place/place_object.html
+++ b/templates/client/includes/place/place_object.html
@@ -330,6 +330,7 @@
 		</ul>
 	</div>
 	{% endif %}
+    {% include 'client/includes/banners/detail_inner_3.html' %}
 {% endblock %}
 
 {% block scripts %}