Merge branch 'stage5' of bitbucket.org:Bonus_05/expomap into stage5

static/client/js/scripts.js

@@ -60,6 +60,8 @@ $(document).ready(function () {
         var search_string = '',
             $link = $(this);
 
+        $link.html('<img src="/static/client/img/wait.gif">');
+
         $.each(window.sendData, function(i, val) {
             var key = i;
 
@@ -82,7 +84,10 @@ $(document).ready(function () {
             data: search_string,
         })
         .done(function(data) {
-            console.log(data);
+            if (data.success) {
+                $('#filter_form_wraper').html(data.form);
+                set_filter_block_height();
+            }
         });
 
     });
@@ -173,7 +178,7 @@ $(document).ready(function () {
     //});
 
 
-	$('.filter_block_label').on('click', function(event) {
+	$('#filter_form_wraper').on('click', '.filter_block_label', function(event) {
 		event.preventDefault();
 		var $this = $(this),
             target = '#' +  $this.attr('for');

static/client/js/vendor.js

@@ -4977,6 +4977,8 @@ $(document).ready(function () {
         var search_string = '',
             $link = $(this);
 
+        $link.html('<img src="/static/client/img/wait.gif">');
+
         $.each(window.sendData, function(i, val) {
             var key = i;
 
@@ -4999,7 +5001,10 @@ $(document).ready(function () {
             data: search_string,
         })
         .done(function(data) {
-            console.log(data);
+            if (data.success) {
+                $('#filter_form_wraper').html(data.form);
+                set_filter_block_height();
+            }
         });
 
     });
@@ -5090,7 +5095,7 @@ $(document).ready(function () {
     //});
 
 
-	$('.filter_block_label').on('click', function(event) {
+	$('#filter_form_wraper').on('click', '.filter_block_label', function(event) {
 		event.preventDefault();
 		var $this = $(this),
             target = '#' +  $this.attr('for');

templates/client/includes/events/filter_form.html

@@ -25,6 +25,6 @@
             {{ field.errors }}
         {% endfor %}
 
-        <button type="submit">{% trans "Применить" %}</button>
+        {# <button type="submit">{% trans "Применить" %}</button> #}
     </div>
 </form>