From 4933d602d69ab4d0810c16bad4095788aed3e1a3 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 15 Aug 2019 10:28:18 +0300 Subject: [PATCH 1/2] #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 @@

{{ trans("visiosoft.module.advs::field.categories") }}

+ class="pull-right">
-
+
{% for maincat in mainCats %} {% if maincat.files[0].path != "" %} {% else %}{% else %}{% endif %}{{ maincat.name }} {% for subcat in subCats %}
    @@ -36,198 +37,216 @@
+
+ + + +
+ +
+
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
+
+
+
+ + {% for key,value in checkboxes %} +
-
- -

{{ trans("visiosoft.module.advs::field.location") }}

+
-
+
-
    -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
  • - - -
  • -
-
-
-
- - {% for key,value in checkboxes %} - -
- - - -
- -
- {% for key, val in value %} -
-
    - {% for key1, value1 in val %} -
  • - +
      + {% for key1, value1 in val %} +
    • + {{ value1 }} -
    • - {% endfor %} -
    -
- {% endfor %} -
-
-
- {% endfor %} + > {{ value1 }} + + {% endfor %} + +
+ {% endfor %} +
+
+ + {% endfor %} - {% for key,value in textfields %} - -
- - + {% for key,value in textfields %} + +
+ + -
- -
- -
-
-
- {% endfor %} +
+ +
+ +
+
+
+ {% endfor %} - {% for key,value in ranges %} - - -
- - - -
- -
- - - - -
-
-
- {% endfor %} + {% for key,value in ranges %}
+ +
+ +
+ + - + +
+
+
+ {% endfor %} + + +
+ + +
+ +
+
+
+ {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} + - + +
+
+
+
+
+
+ {% if entries('advs').isEnabled('searchbydistance') %} + -
+
-
- {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} - - - -
+ + + + +
- {% if entries('advs').isEnabled('searchbydistance') %} - -
- -
-
+ {{ asset_add("scripts.js", "visiosoft.module.searchbydistance::js/script.js") }} + {% endif %} +
+ +
+
- - - - -
-
-
- {{ asset_add("scripts.js", "visiosoft.module.searchbydistance::js/script.js") }} - {% endif %} -
- -
-
- - - + + {{ 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.

+ {% if setting_value('visiosoft.theme.default::template') == "s" %} + {% endif %} + + {% include "theme::partials/s-search-modal" %} From 75b327f09e4bb54bd35862e7bb2bb274a3bf7ed2 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 15 Aug 2019 11:41:58 +0300 Subject: [PATCH 2/2] #382 --- .../resources/views/advs/table.twig | 5 +++- .../resources/css/default/main.css | 28 ++++++++++++++++++ .../resources/css/default/responsive.css | 6 ++++ .../resources/images/scroll-screen.gif | Bin 0 -> 52908 bytes .../resources/js/scroll-screen.js | 3 ++ .../resources/lang/en/fields.php | 2 ++ .../resources/lang/tr/fields.php | 2 ++ .../resources/views/partials/footer.twig | 1 - .../resources/views/scroll-modal.twig | 10 +++++++ 9 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 addons/default/visiosoft/default-theme/resources/images/scroll-screen.gif create mode 100644 addons/default/visiosoft/default-theme/resources/js/scroll-screen.js create mode 100644 addons/default/visiosoft/default-theme/resources/views/scroll-modal.twig diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/table.twig b/addons/default/visiosoft/advs-module/resources/views/advs/table.twig index d3a69273b..824a8b7ab 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/table.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/table.twig @@ -45,7 +45,7 @@
-