diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css index eaec9296b..8d2a263b3 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list.css +++ b/addons/default/visiosoft/advs-module/resources/css/list.css @@ -123,4 +123,23 @@ .result-text span:last-child { color: #8f0100; font-weight: 500; +} + +a.sort-by-open-dropdown:hover { + color: #8598AA !important; +} + +.sort-by-selected-text { + font-size: 15px; + font-weight: 500; + color: #8598AA; +} + +.list-view-type a:hover { + color: #8598AA !important; +} + +.list-view-type a small { + font-weight: 500; + color: #8598AA; } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/images/date-icon.svg b/addons/default/visiosoft/advs-module/resources/images/date-icon.svg new file mode 100644 index 000000000..827eb75a1 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/date-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/gallery-icon.svg b/addons/default/visiosoft/advs-module/resources/images/gallery-icon.svg new file mode 100644 index 000000000..2e919a789 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/gallery-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/list-icon.svg b/addons/default/visiosoft/advs-module/resources/images/list-icon.svg new file mode 100644 index 000000000..2c9720bf9 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/list-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/map-icon.svg b/addons/default/visiosoft/advs-module/resources/images/map-icon.svg new file mode 100644 index 000000000..d7a5c3d73 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/map-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/price-icon.svg b/addons/default/visiosoft/advs-module/resources/images/price-icon.svg new file mode 100644 index 000000000..1931d8fce --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/price-icon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/sort-by-icon.svg b/addons/default/visiosoft/advs-module/resources/images/sort-by-icon.svg new file mode 100644 index 000000000..fff7b0fc0 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/sort-by-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/default/visiosoft/advs-module/resources/images/table-icon.svg b/addons/default/visiosoft/advs-module/resources/images/table-icon.svg new file mode 100644 index 000000000..f754604eb --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/images/table-icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig index 98c82d17b..e50d02321 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig @@ -1,27 +1,31 @@
{% if setting_value('visiosoft.module.location::list_page_location') %} - - + + map icon {{ trans("visiosoft.module.advs::field.show_display_mode.map") }} {% endif %}
- - + + list icon {{ trans('visiosoft.module.advs::field.show_list_view.name') }}
- - + + table icon {{ trans('visiosoft.module.advs::field.show_table_view.name') }}
- - + + gallery icon {{ trans('visiosoft.module.advs::field.gallery') }}
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index a205563a0..bd87c0b30 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -52,10 +52,11 @@
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig index 6042046ab..479055cbd 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-sort-by.twig @@ -1,6 +1,6 @@
-
- +
+ sort bu icon
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig index c7cd9f17b..f411f6b22 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig @@ -1,10 +1,10 @@
diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 25cc5db05..63394d354 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -247,13 +247,13 @@ class AdvsController extends PublicController if ($categoryId) { $seo_keywords = $this->category_model->getMeta_keywords($categoryId->id); - $seo_description = $this->category_model->getMeta_description($categoryId->id) . ' ' . - implode(',', $seo_keywords); + $seo_description = $this->category_model->getMeta_description($categoryId->id); $seo_title = $this->category_model->getMeta_title($categoryId->id); $this->template->set('og_description', $seo_description); $this->template->set('meta_description', $seo_description); $this->template->set('meta_title', $seo_title); + $this->template->set('meta_keywords', implode(', ', $seo_keywords)); $mainCats = $this->category_model->getMains($categoryId->id); $current_cat = $this->category_model->getCat($categoryId->id); diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig index b7aa909a6..9758f1cec 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig @@ -5,6 +5,7 @@ + diff --git a/addons/default/visiosoft/location-module/resources/images/location-icon.svg b/addons/default/visiosoft/location-module/resources/images/location-icon.svg new file mode 100644 index 000000000..76b73fb6c --- /dev/null +++ b/addons/default/visiosoft/location-module/resources/images/location-icon.svg @@ -0,0 +1,5 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="19.715" height="19.715" viewBox="0 0 19.715 19.715"> + <g id="locationa2_icon" data-name="locationa2 icon" transform="translate(-1144.436 3144.463)"> + <path id="Icon_open-location" data-name="Icon open-location" d="M16.81,0,0,8.4l6.3,2.1,2.1,6.3Z" transform="translate(1146 -3143.122)" fill="none" stroke="#212529" stroke-width="1.2"/> + </g> +</svg> diff --git a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig index 80a68280f..02f7b51ff 100644 --- a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig +++ b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig @@ -1,22 +1,23 @@ {% if setting_value('visiosoft.module.location::list_page_location') %} -<div class="card mb-3"> - <div class="card-header breadcrumb mb-0" id="locationHeading"> - <h5 class="mb-0"> - <button class="btn btn-link text-dark" data-toggle="collapse" data-target="#location" - aria-expanded="true" aria-controls="location"> - <i class="fas fa-location-arrow"></i> - {{ trans("visiosoft.module.location::addon.title") }} - </button> - </h5> + <div class="card mb-3"> + <div class="card-header breadcrumb mb-0" id="locationHeading"> + <h5 class="mb-0"> + <button class="btn btn-link text-dark d-flex align-items-center" data-toggle="collapse" + data-target="#location" aria-expanded="true" aria-controls="location"> + <img src="{{ img('visiosoft.module.location::images/location-icon.svg').url }}" class="mr-2" + alt="location icon"> + <span>{{ trans("visiosoft.module.location::addon.title") }}</span> + </button> + </h5> + </div> + <div id="location" class="collapse show overflow-auto" aria-labelledby="locationHeading" + data-parent="#filter"> + {% include "visiosoft.module.location::ads-list/partials/location-fields" %} + </div> </div> - <div id="location" class="collapse show overflow-auto" aria-labelledby="locationHeading" - data-parent="#filter"> - {% include "visiosoft.module.location::ads-list/partials/location-fields" %} - </div> -</div> -<script> - var select_trans = "{{ trans('visiosoft.module.location::field.pick_option.name') }}"; -</script> -{{ asset_add("scripts.js", "visiosoft.module.location::js/filterLocation.js") }} -{{ asset_add("styles.css", "visiosoft.module.location::css/filterLocation.css") }} + <script> + var select_trans = "{{ trans('visiosoft.module.location::field.pick_option.name') }}"; + </script> + {{ asset_add("scripts.js", "visiosoft.module.location::js/filterLocation.js") }} + {{ asset_add("styles.css", "visiosoft.module.location::css/filterLocation.css") }} {% endif %} \ No newline at end of file