Merge branch 'develop' of git.general-servers.com:expomap/expomap into develop

templates/client/blank.html

@@ -162,15 +162,11 @@ This template include basic anf main styles and js files,
 
 <!--test expo_b -->
     <script>
-        var places_ids = [];
-        var divs = $('[id^="expo_b_"]');
-        for(var i=0; i<divs.length; i++){places_ids.push($(divs[i]).attr('id'))}
         window.sendData = {
             "theme": [{{ themes|join:", " }}],
             "country": "{{ country }}",
             "city": "{{ city }}",
-            "tag": "{{ tag }}",
+            "tag": "{{ tag }}"
-            "places": places_ids
         };
     </script>
     <script type="text/javascript" src="{% static 'client/js/rejs/banners.js' %}"></script>

templates/client/static_client/js/_modules/block.common.js

@@ -354,7 +354,7 @@ if (EXPO.common){
 				$staticFields = $('.'+validErrorClass);
 				$waiter = $('#wait-ajax:not(.absolute)').css({'z-index': '8031'});
 
-				$('.'+addClass+', .'+remClass).on('click', function(event){
+				$('body').on('click', '.' + addClass + ', .' + remClass, function(event) {
 					addText = self.opt.addCalendarText;
 					remText = self.opt.removeCalendarText;
 					event.preventDefault();

templates/client/static_client/js/rejs/banners.js

@@ -4,18 +4,22 @@
     var API_URL_ROOT = "/expo-b/get-banners/";
 
     var getUrl = function () {
-        var catalog = "";
+        var search = [];
 
         var parts = /^\/([^\/]+)(?:\/|$)/i.exec(location.pathname);
         if (parts) {
-            catalog = parts[1];
+            search.push("catalog=" + encodeURIComponent(parts[1]));
+        } else {
+            search.push("catalog=");
         }
 
-        var data = window.sendData;
+        var elements = $("[id^=\"expo_b_\"]");
+        for (var j = 0; j < elements.length; j++) {
+            search.push("places=" + encodeURIComponent($(elements[j]).attr("id")));
+        }
 
+        var data = window.sendData;
         if (data instanceof Object) {
-            var search = ["catalog=" + catalog];
-
             for (var key in data) {
                 if (data.hasOwnProperty(key)) {
                     var value = data[key];
@@ -29,11 +33,9 @@
                     }
                 }
             }
-
-            return API_URL_ROOT + "?" + search.join("&");
         }
 
-        return API_URL_ROOT;
+        return API_URL_ROOT + "?" + search.join("&");
     };
 
     var getBanners = function (url, callback) {

templates/client/static_client/js/rejs/tops.js

@@ -5,18 +5,17 @@
     var PARENT_ID = "expo_top_events";
 
     var getUrl = function () {
-        var catalog = "";
+        var search = [];
 
         var parts = /^\/([^\/]+)(?:\/|$)/i.exec(location.pathname);
         if (parts) {
-            catalog = parts[1];
+            search.push("catalog=" + encodeURIComponent(parts[1]));
+        } else {
+            search.push("catalog=");
         }
 
         var data = window.sendData;
-
         if (data instanceof Object) {
-            var search = ["catalog=" + catalog];
-
             for (var key in data) {
                 if (data.hasOwnProperty(key)) {
                     var value = data[key];
@@ -30,11 +29,9 @@
                     }
                 }
             }
-
-            return API_URL_ROOT + "?" + search.join("&");
         }
 
-        return API_URL_ROOT;
+        return API_URL_ROOT + "?" + search.join("&");
     };
 
     var getTops = function (url, callback) {