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

static/client/css/main.css

@@ -13079,6 +13079,18 @@ button.gray:hover {
     cursor: pointer;
 }
 
+.filters input[type=checkbox] + label span{
+    display: inline-block;
+    vertical-align: top;
+    width: -webkit-calc(100% - 20px);
+    width: calc(100% - 20px);
+}
+
+.filters input[type=checkbox] + label span i{
+    font-style: normal;
+    color: #b3b3b3;
+}
+
 .filters input[type=checkbox] + label:hover{
     background: #eee;
 }

static/client/js/scripts.js

@@ -97,13 +97,22 @@ $(document).ready(function () {
 
     $('.filter_form').on('change', 'input[type="checkbox"]', function(event) {
         event.preventDefault();
-        var params = $('.filter_form').serialize();
+        var $form = $('.filter_form'),
+            params = $form.serialize(),
+            $loader = $('#wait-ajax');
+
+        $loader.show();
+
+        $.ajax({
+            url: $form.attr('action'),
+            type: $form.attr('method'),
+            data: $form.serialize(),
+        })
+        .done(function(data) {
+            console.log(data);
+            $loader.hode();
+        })
 
-        console.log(params)
-        console.log(window.location);
-        console.log('------')
-
-        window.location.search = params;
     });
 
     $('.filter_form_clear_all').on('click', function(event) {

static/client/js/vendor.js

@@ -5014,13 +5014,22 @@ $(document).ready(function () {
 
     $('.filter_form').on('change', 'input[type="checkbox"]', function(event) {
         event.preventDefault();
-        var params = $('.filter_form').serialize();
+        var $form = $('.filter_form'),
+            params = $form.serialize(),
+            $loader = $('#wait-ajax');
+
+        $loader.show();
+
+        $.ajax({
+            url: $form.attr('action'),
+            type: $form.attr('method'),
+            data: $form.serialize(),
+        })
+        .done(function(data) {
+            console.log(data);
+            $loader.hode();
+        })
 
-        console.log(params)
-        console.log(window.location);
-        console.log('------')
-
-        window.location.search = params;
     });
 
     $('.filter_form_clear_all').on('click', function(event) {