1240: рэндеринг рекламы

10 years ago · 3bee605b95
parent c9bf6da34b
commit 3bee605b95
14 changed files with 111 additions and 43 deletions
--- a/3
+++ b/3
@ -25,6 +25,9 @@ run:
 run-public:
 	@PYTHONPATH=$(PYTHONPATH):. DJANGO_SETTINGS_MODULE=$(project_name).settings ipython manage.py runserver 0.0.0.0:8000

+shell:
+	@PYTHONPATH=$(PYTHONPATH):. DJANGO_SETTINGS_MODULE=$(project_name).settings python manage.py shell
+
 makemessages:
 	-@ipython manage.py makemessages --all

--- a/static/client/html-cut/subscribe.html
+++ b/static/client/html-cut/subscribe.html
@ -875,8 +875,8 @@
 					//--></script><!--/LiveInternet-->
 					</li>
 					<li>
-						<a href="http://yandex.ru/cy?base=0&amp;host=expomap.ru" rel="nofollow">
-							<img src="http://www.yandex.ru/cycounter?expomap.ru"
+						<a href="//yandex.ru/cy?base=0&amp;host=expomap.ru" rel="nofollow">
+							<img src="//www.yandex.ru/cycounter?expomap.ru"
 								 width="88"
 								 height="31"
 								 alt="Яндекс цитирования"
@ -887,8 +887,8 @@
 						<!-- begin of Top100 code -->
 						<script id="top100Counter" type="text/javascript" src="http://counter.rambler.ru/top100.jcn?2916249"></script>
 						<noscript>
-							<a href="http://top100.rambler.ru/navi/2916249/">
-								<img src="http://counter.rambler.ru/top100.cnt?2916249" alt="Rambler's Top100" border="0" />
+							<a href="//top100.rambler.ru/navi/2916249/">
+								<img src="//counter.rambler.ru/top100.cnt?2916249" alt="Rambler's Top100" border="0" />
 							</a>
 						</noscript>
 						<!-- end of Top100 code -->
--- a/static/client/js/rejs/banners.js
+++ b/static/client/js/rejs/banners.js
@ -38,6 +38,15 @@
        return API_URL_ROOT + "?" + search.join("&");
    };

+    var runCallback = function (callback, arg) {
+        try {
+            callback(JSON.parse(arg));
+        } catch (error) {
+            // do nothing
+        }
+        console.info('callback Done');
+    };
+
    var getBanners = function (url, callback) {
        var xhr = new XMLHttpRequest();
        xhr.open("GET", url, true);
@ -45,10 +54,13 @@
        xhr.onreadystatechange = function (event) {
            if (event.target.readyState === 4) {
                if (event.target.status === 200) {
-                    try {
-                        callback(JSON.parse(event.target.responseText));
-                    } catch (error) {
-                        // do nothing
+                    if (document.readyState === "loading") {
+                        console.info('setting DOMContentLoaded event listener');
+                        document.addEventListener("DOMContentLoaded", function() {
+                            runCallback(callback, event.target.responseText);
+                        });
+                    } else {
+                        runCallback(callback, event.target.responseText);
                    }
                }
            }
@ -109,5 +121,6 @@
        getBanners(getUrl(), insertBanners);
    };

-    window.addEventListener("load", main);
+    // window.addEventListener("load", main);
+    document.addEventListener("DOMContentLoaded", main);
 })();
--- a/static/client/js/rejs/tops.js
+++ b/static/client/js/rejs/tops.js
@ -34,6 +34,15 @@
        return API_URL_ROOT + "?" + search.join("&");
    };

+    var runCallback = function (callback, arg) {
+        try {
+            callback(arg);
+        } catch (error) {
+            // do nothing
+        }
+        console.info('callback Done');
+    };
+
    var getTops = function (url, callback) {
        var xhr = new XMLHttpRequest();
        xhr.open("GET", url, true);
@ -41,10 +50,14 @@
        xhr.onreadystatechange = function (event) {
            if (event.target.readyState === 4) {
                if (event.target.status === 200) {
-                    try {
-                        callback(event.target.responseText);
-                    } catch (error) {
-                        // do nothing
+                    console.info(document.readyState);
+                    if (document.readyState === "loading") {
+                        console.info('setting DOMContentLoaded event listener');
+                        document.addEventListener("DOMContentLoaded", function() {
+                            runCallback(callback, event.target.responseText);
+                        });
+                    } else {
+                        runCallback(callback, event.target.responseText);
                    }
                }
            }
@ -64,6 +77,14 @@
    var main = function () {
        getTops(getUrl(), insertTops);
    };
+    // main();
+    // window.addEventListener("load", main);
+    document.addEventListener("DOMContentLoaded", main);
+
+    // function ready() {
+    // console.info( 'DOM готов' );
+    // // alert( "Размеры картинки: " + img.offsetWidth + "x" + img.offsetHeight );
+    // }

-    window.addEventListener("load", main);
+    // document.addEventListener("DOMContentLoaded", ready);
 })();
--- a/templates/client/accounts/feed.html
+++ b/templates/client/accounts/feed.html
@ -13,6 +13,11 @@
       <h1>{% trans 'Моя лента событий' %}</h1>
   </div>
 {% endblock %}
+{% if object_list %}
+  {% block head_scripts %}
+    <script type="text/javascript" src="{% static 'client/js/rejs/tops.js' %}"></script>
+  {% endblock head_scripts %}
+{% endif %}
 {% block page_body %}
 	<div class="page-body clearfix events-feed-page">
 		<div class="events-filter-wrap" id="events-filter-wrap">
--- a/templates/client/accounts/user_events.html
+++ b/templates/client/accounts/user_events.html
@ -15,11 +15,16 @@
    <div class="page-title">
           <h1>{% if meta %}{{ meta.h1 }}{% else %}{{ event_type }}{% endif %}</h1>
    </div>
-
 {% endblock %}

+{% if object_list %}
+  {% block head_scripts %}
+    <script type="text/javascript" src="{% static 'client/js/rejs/tops.js' %}"></script>
+  {% endblock head_scripts %}
+{% endif %}
+
 {% block content_list %}
        {% with object_list=object_list %}
            {% include 'includes/exposition/exposition_list.html' %}
        {% endwith %}
-{% endblock %}
+{% endblock %}
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@ -45,9 +45,22 @@ This template include basic anf main styles and js files,
 	<script src="{% static 'client/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js' %}"></script>
 	<script src="{% static 'client/js/vendor/jquery-1.10.1.min.js' %}"></script>
 	<script src="{% static 'client/js/jquery-ui-1.10.4.custom.min.js' %}"  type="text/javascript"></script>
+
    {% block head_scripts %}

    {% endblock %}
+
+    <!--test expo_b -->
+    <script>
+        window.sendData = {
+            "theme": [{{ themes|join:", " }}],
+            "country": "{{ country }}",
+            "city": "{{ city }}",
+            "tag": "{{ tag }}"
+        };
+    </script>
+    <script type="text/javascript" src="{% static 'client/js/rejs/banners.js' %}" async></script>
+
 	{% if request.GET.debug == '1' %}
 		<script src="{% static 'client/js/_modules/block.common.js' %}"></script>
 	{% else %}
@ -177,15 +190,6 @@ This template include basic anf main styles and js files,
 {% endif %}
 <div id="wait-ajax" class="wait-ajax" style="display:none;"><img src="{% static 'client/img/ajax-loader.gif' %}" alt=""/></div>

-<!--test expo_b -->
-    <script>
-        window.sendData = {
-            "theme": [{{ themes|join:", " }}],
-            "country": "{{ country }}",
-            "city": "{{ city }}",
-            "tag": "{{ tag }}"
-        };
-    </script>
-    <script type="text/javascript" src="{% static 'client/js/rejs/banners.js' %}"></script>
+    
 </body>

--- a/templates/client/city/city.html
+++ b/templates/client/city/city.html
@ -12,6 +12,12 @@
 {% block page_title %}
 {% endblock %}

+{% if object.get_events %}
+  {% block head_scripts %}
+    <script type="text/javascript" src="{% static 'client/js/rejs/tops.js' %}"></script>
+  {% endblock head_scripts %}
+{% endif %}
+
 {% block content_list %}
 <div class="m-article">
    <div class="item-wrap place clearfix">
@ -141,4 +147,4 @@
 </div>
 {% endif %}

-{% endblock %}
+{% endblock %}
--- a/templates/client/country/country.html
+++ b/templates/client/country/country.html
@ -12,6 +12,12 @@
 {% block page_title %}
 {% endblock %}

+{% if object.get_events %}
+  {% block head_scripts %}
+    <script type="text/javascript" src="{% static 'client/js/rejs/tops.js' %}"></script>
+  {% endblock head_scripts %}
+{% endif %}
+
 {% block content_list %}
 <div class="m-article">
    <div class="item-wrap place clearfix">
@ -178,4 +184,4 @@
    {% include 'includes/organiser/organiser_list.html' with object_list=object.get_organisers %}
 </div>
 {% endif %}
-{% endblock %}
+{% endblock %}
--- a/templates/client/exposition/catalog.html
+++ b/templates/client/exposition/catalog.html
@ -21,6 +21,11 @@
    </div>
 {% endblock %}

+{% if object_list %}
+  {% block head_scripts %}
+    <script type="text/javascript" src="{% static 'client/js/rejs/tops.js' %}"></script>
+  {% endblock head_scripts %}
+{% endif %}

 {% block page_title %}
        <div class="page-title">
@ -38,4 +43,4 @@

 {% block paginator %}
    {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
-{% endblock %}
+{% endblock %}
--- a/templates/client/exposition/catalog_theme.html
+++ b/templates/client/exposition/catalog_theme.html
@ -1,6 +1,14 @@
 {% extends 'base_catalog.html' %}
 {% load template_filters %}
 {% load i18n %}
+{% load static %}
+
+{% if object_list %}
+  {% block head_scripts %}
+    <script type="text/javascript" src="{% static 'client/js/rejs/tops.js' %}"></script>
+  {% endblock head_scripts %}
+{% endif %}
+

 {% block bread_scrumbs %}
    <div class="bread-crumbs">
@ -46,7 +54,6 @@
    </div>
 {% endblock %}

-
 {% block page_title %}
        <div class="page-title">
            <h1>{% if meta %}{{ meta.h1 }}{% else %}{% trans 'Выставки' %}: <strong>{{ filter_object.name }}</strong>{% endif %}</h1>
@ -61,4 +68,4 @@

 {% block paginator %}
    {% include 'includes/catalog_paginator.html' with page_obj=page_obj %}
-{% endblock %}
+{% endblock %}
--- a/templates/client/includes/banners/tops.html
+++ b/templates/client/includes/banners/tops.html
@ -1,7 +1 @@
-{% load static %}
-
-<div id="expo_top_events">
-
-</div>
-
-<script type="text/javascript" src="{% static 'client/js/rejs/tops.js' %}"></script>
+<div id="expo_top_events"></div>
--- a/templates/client/includes/footer.html
+++ b/templates/client/includes/footer.html
@ -58,8 +58,8 @@
 					//--></script><!--/LiveInternet-->
 					</li>
 					<li>
-						<a href="http://yandex.ru/cy?base=0&amp;host=expomap.ru" rel="nofollow">
-							<img src="http://www.yandex.ru/cycounter?expomap.ru"
+						<a href="//yandex.ru/cy?base=0&amp;host=expomap.ru" rel="nofollow">
+							<img src="//www.yandex.ru/cycounter?expomap.ru"
 								 width="88"
 								 height="31"
 								 alt="Яндекс цитирования"
@ -68,10 +68,10 @@
 					</li>
 					<li>
 						<!-- begin of Top100 code -->
-						<script id="top100Counter" type="text/javascript" src="http://counter.rambler.ru/top100.jcn?2916249"></script>
+						<script id="top100Counter" type="text/javascript" src="//counter.rambler.ru/top100.jcn?2916249"></script>
 						<noscript>
 							<a href="http://top100.rambler.ru/navi/2916249/">
-								<img src="http://counter.rambler.ru/top100.cnt?2916249" alt="Rambler's Top100" border="0" />
+								<img src="//counter.rambler.ru/top100.cnt?2916249" alt="Rambler's Top100" border="0" />
 							</a>

 						</noscript>
--- a/templates/client/includes/social_widjet.html
+++ b/templates/client/includes/social_widjet.html
@ -7,7 +7,6 @@
    <script type="text/javascript">
        VK.Widgets.Group("vk_groups", {mode: 0, width: "200", height: "400", color1: 'FFFFFF', color2: '2B587A', color3: '5B7FA6'}, 27368557);
    </script>
-</script>
 {% else %}
    <div id="fb-root"></div>
    <script>(function(d, s, id) {