From 4933d602d69ab4d0810c16bad4095788aed3e1a3 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 15 Aug 2019 10:28:18 +0300
Subject: [PATCH] #382

---
 .../resources/views/partials/list-filter.twig | 349 +++++++++---------
 .../resources/css/default/main.css            |  22 ++
 .../resources/css/default/responsive.css      |   5 +
 .../resources/views/partials/footer.twig      |   4 +
 4 files changed, 215 insertions(+), 165 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig
index 764a1f4b8..fc126f274 100644
--- a/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig
@@ -10,17 +10,18 @@
                 <div class="panel-heading">
                     <a data-toggle="collapse" data-parent="#accordion" href="#accordion-one">
                         <h4 class="panel-title">{{ trans("visiosoft.module.advs::field.categories") }}<span
-                                    class="pull-right"><i class="fa fa-minus"></i></span></h4>
+                                    class="pull-right"><i class="fa fa-plus"></i></span></h4>
                     </a>
                 </div><!-- panel-heading -->
-                <div id="accordion-one" class="panel-collapse collapse in">
+                <div id="accordion-one" class="panel-collapse collapse">
                     <!-- panel-body -->
                     <div class="panel-body">
                         {% for maincat in mainCats %}
                             <a class="main-cat-item"
                                href="{% if(type == "list") %}{{ url_route('visiosoft.module.advs::list') }}{% else %}{{ url_route('advs_map_list') }}{% endif %}?cat={{ maincat.id }}"> {% if maincat.files[0].path != "" %}
                                     <img class="catIcon" src="{{ url('files/' ~ maincat.files[0].path) }}"
-                                         alt="">{% else %}<img class="catIcon" src="{{ img('theme::images/plus-categories.png').url }}"
+                                         alt="">{% else %}<img class="catIcon"
+                                                               src="{{ img('theme::images/plus-categories.png').url }}"
                                                                alt="">{% endif %}{{ maincat.name }}</a>
                             {% for subcat in subCats %}
                                 <ul>
@@ -36,198 +37,216 @@
                 </div>
             </div><!-- panel -->
 
+            <div class="panel-default panel-faq">
+                <!-- panel-heading -->
+                <div class="panel-heading active-faq">
+                    <a data-toggle="collapse" data-parent="#accordion" href="#accordion-location">
+                        <h4 class="panel-title">{{ trans("visiosoft.module.advs::field.location") }}<span
+                                    class="pull-right"><i class="fa fa-plus"></i></span></h4>
+                    </a>
+                </div><!-- panel-heading -->
+
+                <div id="accordion-location" class="panel-collapse collapse">
+                    <!-- panel-body -->
+                    <div class="panel-body">
+                        <ul id="list-items" class="filter-list-items">
+                            <li>
+                                <label class="label-filter-location">{{ trans("visiosoft.module.location::field.country.name") }}</label>
+                                <select class="form-control" name="country" id="countries">
+                                    {% for country in countries %}
+                                        <option value="{{ country.id }}">{{ country.name }}</option>
+                                    {% endfor %}
+                                </select>
+                            </li>
+                            <li>
+                                <label class="label-filter-location">{{ trans("visiosoft.module.location::field.city.name") }}</label>
+                                <select class="form-control" name="city[]" id="cities" multiple>
+                                    {% for city in cities %}
+                                        <option value="{{ city.id }}">{{ city.name }}</option>
+                                    {% endfor %}
+                                </select>
+                            </li>
+                            <li>
+                                <label class="label-filter-location">{{ trans("visiosoft.module.location::field.district.name") }}</label>
+                                <select class="form-control" name="district" id="districts">
+                                    {% for district in districts %}
+                                        <option value="{{ district.id }}">{{ district.name }}</option>
+                                    {% endfor %}
+                                </select>
+                            </li>
+                            <li>
+                                <label class="label-filter-location">{{ trans("visiosoft.module.location::field.neighborhood.name") }}</label>
+                                <select class="form-control" name="neighborhood" id="neighborhoods">
+                                    {% for neighborhood in neighborhoods %}
+                                        <option value="{{ neighborhood.id }}">{{ neighborhood.name }}</option>
+                                    {% endfor %}
+                                </select>
+                            </li>
+                            <li>
+                                <label class="label-filter-location">{{ trans("visiosoft.module.location::field.village.name") }}</label>
+                                <select class="form-control" name="village" id="village">
+                                    {% for village in villages %}
+                                        <option value="{{ village.id }}">{{ village.name }}</option>
+                                    {% endfor %}
+                                </select>
+                            </li>
+                        </ul>
+                    </div><!-- panel-body -->
+                </div>
+            </div><!-- panel -->
+
+            {% for key,value in checkboxes %}
+                <!-- panel -->
                 <div class="panel-default panel-faq">
                     <!-- panel-heading -->
-                    <div class="panel-heading active-faq">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#accordion-location">
-                            <h4 class="panel-title">{{ trans("visiosoft.module.advs::field.location") }}<span class="pull-right"><i class="fa fa-plus"></i></span></h4>
+                    <div class="panel-heading">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#accordion-{{ loop.index }}">
+                            <h4 class="panel-title">{{ value.name }}<span class="pull-right"><i class="fa fa-plus"></i></span>
+                            </h4>
                         </a>
                     </div><!-- panel-heading -->
 
-                    <div id="accordion-location" class="panel-collapse collapse collapse in">
+                    <div id="accordion-{{ loop.index }}" class="panel-collapse">
                         <!-- panel-body -->
                         <div class="panel-body">
-                            <ul id="list-items" class="filter-list-items">
-                                <li>
-                                    <label class="label-filter-location">{{ trans("visiosoft.module.location::field.country.name") }}</label>
-                                    <select class="form-control" name="country" id="countries">
-                                        {% for country in countries %}
-                                            <option value="{{ country.id }}">{{ country.name }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </li>
-                                <li>
-                                    <label class="label-filter-location">{{ trans("visiosoft.module.location::field.city.name") }}</label>
-                                    <select class="form-control" name="city[]" id="cities" multiple>
-                                        {% for city in cities %}
-                                            <option value="{{ city.id }}">{{ city.name }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </li>
-                                <li>
-                                    <label class="label-filter-location">{{ trans("visiosoft.module.location::field.district.name") }}</label>
-                                    <select class="form-control" name="district" id="districts">
-                                        {% for district in districts %}
-                                            <option value="{{ district.id }}">{{ district.name }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </li>
-                                <li>
-                                    <label class="label-filter-location">{{ trans("visiosoft.module.location::field.neighborhood.name") }}</label>
-                                    <select class="form-control" name="neighborhood" id="neighborhoods">
-                                        {% for neighborhood in neighborhoods %}
-                                            <option value="{{ neighborhood.id }}">{{ neighborhood.name }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </li>
-                                <li>
-                                    <label class="label-filter-location">{{ trans("visiosoft.module.location::field.village.name") }}</label>
-                                    <select class="form-control" name="village" id="village">
-                                        {% for village in villages %}
-                                            <option value="{{ village.id }}">{{ village.name }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </li>
-                            </ul>
-                        </div><!-- panel-body -->
-                    </div>
-                </div><!-- panel -->
-
-                {% for key,value in checkboxes %}
-                    <!-- panel -->
-                    <div class="panel-default panel-faq">
-                        <!-- panel-heading -->
-                        <div class="panel-heading">
-                            <a data-toggle="collapse" data-parent="#accordion" href="#accordion-{{ loop.index }}">
-                                <h4 class="panel-title">{{ value.name }}<span class="pull-right"><i class="fa fa-plus"></i></span></h4>
-                            </a>
-                        </div><!-- panel-heading -->
-
-                        <div id="accordion-{{ loop.index }}" class="panel-collapse">
-                            <!-- panel-body -->
-                            <div class="panel-body">
-                                {% for key, val in value %}
-                                    <div class="input-outer">
-                                        <ul>
-                                            {% for key1, value1 in val %}
-                                                <li class="cf-li-item">
-                                                    <input value="{{ key1 }}" type="checkbox" name="cf_{{ value.id }}[]" id=""
+                            {% for key, val in value %}
+                                <div class="input-outer">
+                                    <ul>
+                                        {% for key1, value1 in val %}
+                                            <li class="cf-li-item">
+                                                <input value="{{ key1 }}" type="checkbox" name="cf_{{ value.id }}[]"
+                                                       id=""
                                                         {% if key1 in app.request.get('cf_'~ value.id) %}
                                                             checked
                                                         {% endif %}
-                                                    > <span class="span{{ key1 }}">{{ value1 }}</span>
-                                                </li>
-                                            {% endfor %}
-                                        </ul>
-                                    </div>
-                                {% endfor %}
-                            </div><!-- panel-body -->
-                        </div>
-                    </div><!-- panel -->
-                {% endfor %}
+                                                > <span class="span{{ key1 }}">{{ value1 }}</span>
+                                            </li>
+                                        {% endfor %}
+                                    </ul>
+                                </div>
+                            {% endfor %}
+                        </div><!-- panel-body -->
+                    </div>
+                </div><!-- panel -->
+            {% endfor %}
 
-                {% for key,value in textfields %}
-                    <!-- panel -->
-                    <div class="panel-default panel-faq">
-                        <!-- panel-heading -->
-                        <div class="panel-heading">
-                            <a data-toggle="collapse" data-parent="#accordion" href="#accordion-{{ loop.index }}">
-                                <h4 class="panel-title">{{ key }}<span class="pull-right"><i class="fa fa-plus"></i></span></h4>
-                            </a>
-                        </div><!-- panel-heading -->
+            {% for key,value in textfields %}
+                <!-- panel -->
+                <div class="panel-default panel-faq">
+                    <!-- panel-heading -->
+                    <div class="panel-heading">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#accordion-{{ loop.index }}">
+                            <h4 class="panel-title">{{ key }}<span class="pull-right"><i class="fa fa-plus"></i></span>
+                            </h4>
+                        </a>
+                    </div><!-- panel-heading -->
 
-                        <div id="accordion-{{ loop.index }}" class="panel-collapse collapse">
-                            <!-- panel-body -->
-                            <div class="panel-body">
-                                <input name="{{ key }}" type="text" class="form-control" value="">
-                            </div><!-- panel-body -->
-                        </div>
-                    </div><!-- panel -->
-                {% endfor %}
+                    <div id="accordion-{{ loop.index }}" class="panel-collapse collapse">
+                        <!-- panel-body -->
+                        <div class="panel-body">
+                            <input name="{{ key }}" type="text" class="form-control" value="">
+                        </div><!-- panel-body -->
+                    </div>
+                </div><!-- panel -->
+            {% endfor %}
 
 
-                {% for key,value in ranges %}
-                
-                    <!-- panel -->
-                    <div class="panel-default panel-faq">
-                        <!-- panel-heading -->
-                        <div class="panel-heading">
-                            <a data-toggle="collapse" data-parent="#accordion" href="#accordion-range{{ value.id }}">
-                                <h4 class="panel-title">{{ value.name }}<span class="pull-right"><i class="fa fa-minus"></i></span></h4>
-                            </a>
-                        </div><!-- panel-heading -->
-
-                        <div id="accordion-range{{ value.id }}" class="panel-collapse collapse in">
-                            <!-- panel-body -->
-                            <div class="panel-body">
-
-                                <input type="number" class="price-input" value="{{ app.request.get('min_cf_'~ value.id) }}" name="min_cf_{{ value.id }}" min="0" placeholder="Min"> - <input class="price-input" type="number" value="{{ app.request.get('max_cf_'~ value.id) }}" name="max_cf_{{ value.id }}" placeholder="Max">
-
-                            </div><!-- panel-body -->
-                        </div>
-                    </div><!-- panel -->
-                {% endfor %}
+            {% for key,value in ranges %}
 
                 <!-- panel -->
                 <div class="panel-default panel-faq">
                     <!-- panel-heading -->
                     <div class="panel-heading">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#accordion-three">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#accordion-range{{ value.id }}">
+                            <h4 class="panel-title">{{ value.name }}<span class="pull-right"><i class="fa fa-plus"></i></span>
+                            </h4>
+                        </a>
+                    </div><!-- panel-heading -->
+
+                    <div id="accordion-range{{ value.id }}" class="panel-collapse collapse">
+                        <!-- panel-body -->
+                        <div class="panel-body">
+
+                            <input type="number" class="price-input" value="{{ app.request.get('min_cf_'~ value.id) }}"
+                                   name="min_cf_{{ value.id }}" min="0" placeholder="Min"> - <input class="price-input"
+                                                                                                    type="number"
+                                                                                                    value="{{ app.request.get('max_cf_'~ value.id) }}"
+                                                                                                    name="max_cf_{{ value.id }}"
+                                                                                                    placeholder="Max">
+
+                        </div><!-- panel-body -->
+                    </div>
+                </div><!-- panel -->
+            {% endfor %}
+
+            <!-- panel -->
+            <div class="panel-default panel-faq">
+                <!-- panel-heading -->
+                <div class="panel-heading">
+                    <a data-toggle="collapse" data-parent="#accordion" href="#accordion-three">
+                        <h4 class="panel-title">
+                            Price
+                            <span class="pull-right"><i class="fa fa-plus"></i></span>
+                        </h4>
+                    </a>
+                </div><!-- panel-heading -->
+                <div id="accordion-three" class="panel-collapse collapse" aria-expanded="true" style="">
+                    <!-- panel-body -->
+                    <div class="panel-body">
+                        <div class="price-range"><!--price-range-->
+                            <div class="price">
+                                {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %}
+                                <input type="number" class="price-input" value="{{ request.min_price }}"
+                                       name="min_price" min="0" placeholder="Min"> - <input class="price-input"
+                                                                                            type="number"
+                                                                                            value="{{ request.max_price }}"
+                                                                                            name="max_price"
+                                                                                            placeholder="Max">
+                                <select name="currency" id="currency">
+                                    {% for currency in active_currencies %}
+                                        <option value="{{ currency }}">{{ currency }}</option>
+                                    {% endfor %}
+                                </select>
+                            </div>
+                        </div><!--/price-range-->
+                    </div><!-- panel-body -->
+                </div>
+            </div>
+            <div class="panel-default panel-faq">
+                {% if entries('advs').isEnabled('searchbydistance') %}
+                    <div class="panel-heading">
+                        <a data-toggle="collapse" data-parent="#accordion" href="#accordion-four">
                             <h4 class="panel-title">
-                                Price
+                                {{ trans("visiosoft.module.searchbydistance::field.searchbydistance") }}
                                 <span class="pull-right"><i class="fa fa-plus"></i></span>
                             </h4>
                         </a>
                     </div><!-- panel-heading -->
-                    <div id="accordion-three" class="panel-collapse collapse in" aria-expanded="true" style="">
+                    <div id="accordion-four" class="panel-collapse collapse" aria-expanded="true" style="">
                         <!-- panel-body -->
                         <div class="panel-body">
                             <div class="price-range"><!--price-range-->
-                                <div class="price">
-                                    {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %}
-                                    <input type="number" class="price-input" value="{{ request.min_price }}" name="min_price" min="0" placeholder="Min"> - <input class="price-input" type="number" value="{{ request.max_price }}" name="max_price" placeholder="Max">
-                                    <select name="currency" id="currency">
-                                        {% for currency in active_currencies %}
-                                        <option value="{{ currency }}">{{ currency }}</option>
-                                        {% endfor %}
-                                    </select>
-                                </div>
+
+                                <select name="distance" id="distance" class="form-control">
+                                    <option value="10" {{ request.distance==10 ? 'selected' : '' }}>10</option>
+                                    <option value="20" {{ request.distance==20 ? 'selected' : '' }}>20</option>
+                                    <option value="50" {{ request.distance==50 ? 'selected' : '' }}>50</option>
+                                </select>
+
+                                <input type="hidden" name="dlong" id="distlong">
+                                <input type="hidden" name="dlat" id="distlat">
                             </div><!--/price-range-->
                         </div><!-- panel-body -->
                     </div>
-                    {% if entries('advs').isEnabled('searchbydistance') %}
-                        <div class="panel-heading">
-                            <a data-toggle="collapse" data-parent="#accordion" href="#accordion-four">
-                                <h4 class="panel-title">
-                                    {{ trans("visiosoft.module.searchbydistance::field.searchbydistance") }}
-                                    <span class="pull-right"><i class="fa fa-plus"></i></span>
-                                </h4>
-                            </a>
-                        </div><!-- panel-heading -->
-                        <div id="accordion-four" class="panel-collapse collapse in" aria-expanded="true" style="">
-                            <!-- panel-body -->
-                            <div class="panel-body">
-                                <div class="price-range"><!--price-range-->
+                    {{ asset_add("scripts.js", "visiosoft.module.searchbydistance::js/script.js") }}
+                {% endif %}
+                <div id="search-button">
+                    <button type="submit"
+                            class="btn btn-default">{{ trans("visiosoft.module.advs::field.search") }}</button>
+                </div>
+            </div><!-- panel -->
 
-                                        <select name="distance" id="distance" class="form-control">
-                                        <option value="10" {{ request.distance==10 ? 'selected' : '' }}>10</option>
-                                        <option value="20" {{ request.distance==20 ? 'selected' : '' }}>20</option>
-                                        <option value="50" {{ request.distance==50 ? 'selected' : '' }}>50</option>
-                                        </select>
-
-                                    <input type="hidden" name="dlong" id="distlong">
-                                    <input type="hidden" name="dlat" id="distlat">
-                                </div><!--/price-range-->
-                            </div><!-- panel-body -->
-                        </div>
-                        {{ asset_add("scripts.js", "visiosoft.module.searchbydistance::js/script.js") }}
-                    {% endif %}
-                    <div id="search-button">
-                        <button type="submit" class="btn btn-default">{{ trans("visiosoft.module.advs::field.search") }}</button>
-                    </div>
-                </div><!-- panel -->
-
-            </div><!-- panel-group -->
-        </div>
+        </div><!-- panel-group -->
+    </div>
 </div><!-- accordion-->
 {{ asset_add("scripts.js", "visiosoft.module.advs::js/filterLocation.js") }}
diff --git a/addons/default/visiosoft/default-theme/resources/css/default/main.css b/addons/default/visiosoft/default-theme/resources/css/default/main.css
index 8799a4d21..dd5a74416 100755
--- a/addons/default/visiosoft/default-theme/resources/css/default/main.css
+++ b/addons/default/visiosoft/default-theme/resources/css/default/main.css
@@ -5935,4 +5935,26 @@ input[name="username"] {
 .panel-faq .panel-collapse .panel-body {
     max-height: 200px;
     overflow: scroll;
+}
+::-webkit-scrollbar {
+    -webkit-appearance: none;
+}
+::-webkit-scrollbar:vertical {
+    width: 12px;
+}
+::-webkit-scrollbar:horizontal {
+    height: 12px;
+}
+::-webkit-scrollbar-thumb {
+    background-color: rgba(0, 0, 0, .5);
+    border-radius: 10px;
+    border: 2px solid #ffffff;
+}
+::-webkit-scrollbar-track {
+    border-radius: 10px;
+    background-color: #ffffff;
+}
+
+.recommended-ads h4 {
+    display: inline-block !important;
 }
\ No newline at end of file
diff --git a/addons/default/visiosoft/default-theme/resources/css/default/responsive.css b/addons/default/visiosoft/default-theme/resources/css/default/responsive.css
index 413a232a9..2a6940b2a 100644
--- a/addons/default/visiosoft/default-theme/resources/css/default/responsive.css
+++ b/addons/default/visiosoft/default-theme/resources/css/default/responsive.css
@@ -1740,6 +1740,11 @@
 
 /* XS Portrait */
 @media (max-width: 479px) {
+    .favorite-searches {
+        margin-bottom: 10px;
+        padding-bottom: 15px;
+        height:auto;
+    }
     .user-images .img-responsive {
         margin: auto;
         border-radius: 35px;
diff --git a/addons/default/visiosoft/default-theme/resources/views/partials/footer.twig b/addons/default/visiosoft/default-theme/resources/views/partials/footer.twig
index b296b2349..cc7dd7861 100644
--- a/addons/default/visiosoft/default-theme/resources/views/partials/footer.twig
+++ b/addons/default/visiosoft/default-theme/resources/views/partials/footer.twig
@@ -101,6 +101,7 @@
                     Inc.</a></p>
         </div>
     </div><!-- footer-bottom -->
+    {% if setting_value('visiosoft.theme.default::template') == "s" %}
         <div class="row s-bottom-bar navbar-fixed-bottom visible-xs text-center">
             <div class="col-xs-2 center-block d-flex showcase-btn">
                 <a style="color: #999;">
@@ -128,6 +129,9 @@
                 </a>
             </div>
         </div>
+    {% endif %}
+
+
 </footer>
 
 {% include "theme::partials/s-search-modal" %}