Merge pull request #132 from openclassify/vedatakd

#460 reformat base theme

addons/default/visiosoft/advs-module/resources/lang/tr/field.php

@@ -133,7 +133,7 @@ return [
     "list-page" => "Liste Sayfası",
     "search" => "Arama",
     "recommended" => "Sizin için Önerilen İlanlar",
-    "sort_by" => "Göre sırala",
+    "sort_by" => "Sırala",
     "pick_option" => "Bir seçenek seçin",
     "price_high" => "Fiyat pahalıdan ucuza",
     "price-low" => "Fiyat Düşük Yüksek",

addons/default/visiosoft/advs-module/src/Adv/AdvModel.php

@@ -313,7 +313,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
     public function AddAdsDefaultCoverImage($ad)
     {
         if ($ad->cover_photo == null) {
-            $ad->cover_photo = $this->dispatch(new MakeImageInstance('theme::images/no-image-ads.jpg', 'img'))->url();
+            $ad->cover_photo = $this->dispatch(new MakeImageInstance('visiosoft.theme.base::images/no-image-ads.jpg', 'img'))->url();
         } else {
             $ad->cover_photo = url($ad->cover_photo);
         }
@@ -324,7 +324,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
     {
         $adv = $this->find($id);
         if ($adv == null or $adv->cover_photo == null) {
-            $cover_photo = $this->dispatch(new MakeImageInstance('theme::images/no-image-ads.jpg', 'img'))->url();
+            $cover_photo = $this->dispatch(new MakeImageInstance('visiosoft.theme.base::images/no-image-ads.jpg', 'img'))->url();
         } else {
             $cover_photo = url($adv->cover_photo);
         }

addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php

@@ -213,7 +213,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
                     $query = $query->orderBy('price', 'asc');
                     break;
                 case "sort_time":
-                    $query = $query->orderBy('created_at', 'desc');
+                    $query = $query->orderBy('advs_advs.created_at', 'desc');
                     break;
             }
         } else {
@@ -238,10 +238,10 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
     {
         $country = CountryModel::query()->where('location_countries.id', $adv->country_id)->first();
         $city = CityModel::query()->where('location_cities.id', $adv->city)->first();
-        if($country != null) {
+        if ($country != null) {
             $adv->setAttribute('country_name', $country->name);
         }
-        if($city != null) {
+        if ($city != null) {
             $adv->setAttribute('city_name', $city->name);
         }
         return $adv;

addons/default/visiosoft/advs-module/src/Seed/Blocks/left-home-banner-area.twig

@@ -1,3 +1,3 @@
 <div class="advertisement">
-    <a href="#"><img src="{{ img('theme::images/ads/2.jpg').url }}" alt="Images" class="img-responsive"></a>
+    <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/2.jpg').url }}" alt="Images" class="img-responsive"></a>
 </div>

addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-en.twig

@@ -3,7 +3,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-secure">
-            <img src="{{ img('theme::images/icon/13.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/13.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -15,7 +15,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-support">
-            <img src="{{ img('theme::images/icon/14.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/14.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -28,7 +28,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-trading">
-            <img src="{{ img('theme::images/icon/15.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/15.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 

addons/default/visiosoft/advs-module/src/Seed/Blocks/list-item-right-sidebar-tr.twig

@@ -3,7 +3,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-secure">
-            <img src="{{ img('theme::images/icon/13.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/13.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -15,7 +15,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-support">
-            <img src="{{ img('theme::images/icon/14.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/14.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -28,7 +28,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-trading">
-            <img src="{{ img('theme::images/icon/15.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/15.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
 
@@ -40,7 +40,7 @@
     <div class="single-cta">
         <!-- cta-icon -->
         <div class="cta-icon icon-trading">
-            <img src="{{ img('theme::images/icon/14.png').url }}" alt="Icon"
+            <img src="{{ img('visiosoft.theme.base::images/icon/14.png').url }}" alt="Icon"
                  class="img-responsive">
         </div><!-- cta-icon -->
         <h5>Yardıma mı ihtiyacınız var?</h5>

addons/default/visiosoft/advs-module/src/Seed/Blocks/middle-home-banner-area.twig

@@ -1,3 +1,3 @@
 <div class="ad-section text-center">
-    <a href="#"><img src="{{ img('theme::images/ads/3.jpg').url }}" alt="Image" class="img-responsive"></a>
+    <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/3.jpg').url }}" alt="Image" class="img-responsive"></a>
 </div>

addons/default/visiosoft/advs-module/src/Seed/Blocks/right-home-banner-area.twig

@@ -1,3 +1,3 @@
 <div class="advertisement text-center">
-    <a href="#"><img src="{{ img('theme::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>
+    <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>
 </div>

addons/default/visiosoft/base-theme/resources/css/default/main.css

@@ -465,7 +465,7 @@ textarea {
  ========================================================================== */
 #main {
     background-image: linear-gradient(to bottom, #0c3483 0%, #a2b6df 100%, #6b8cce 100%, #a2b6df 100%);
-    /*background-image: url("{{ img('theme::images/bg/main.png').url }}");*/
+    /*background-image: url("{{ img('visiosoft.theme.base::images/bg/main.png').url }}");*/
     background-repeat: no-repeat;
     background-position: top center;
     background-color: #f7f7f7;
@@ -1018,7 +1018,7 @@ a.verified i {
 }
 
 .oc-item1 {
-    border: 1px solid #f3f3f3;
+    border: 1px solid #e4e1e1;
     margin: 18px 0;
     min-height: 152px;
     border-radius: 2px;
@@ -1127,7 +1127,7 @@ a.verified i {
 
 /* Download */
 #download {
-    background-image: url("{{ img('theme::images/bg/1.png').url }}");
+    background-image: url("{{ img('visiosoft.theme.base::images/bg/1.png').url }}");
     padding: 55px 0 90px;
 }
 
@@ -1512,7 +1512,6 @@ a.verified i {
 }
 
 .recommended-ads {
-    margin-bottom: 0;
     display: inline-block;
 }
 
@@ -4294,7 +4293,7 @@ a.verified i {
  ========================================================================== */
 
 #scrollUp {
-    background-image: url("{{ img('theme::images/top.png').url }}");
+    background-image: url("{{ img('visiosoft.theme.base::images/top.png').url }}");
     bottom: 60px;
     right: 20px;
     width: 38px; /* Width of image */
@@ -4856,7 +4855,6 @@ input, select, a, .transition,
 
 .favorite-searches {
     width: 100%;
-    height: 80px;
     display: inline-block;
     margin-top: 40px;
     border: 1px solid #dedede;
@@ -5497,7 +5495,7 @@ input[name="username"] {
     background-repeat: no-repeat;
     background-size: 50% 45%;
     background-position: center;
-    background-image: url("{{ img('theme::images/cart-add-icon.png').url }}");
+    background-image: url("{{ img('visiosoft.theme.base::images/cart-add-icon.png').url }}");
 }
 
 .lds-ripple {
@@ -5776,7 +5774,7 @@ input[name="username"] {
 }
 
 .viewType {
-    color: #5b8dbd !important;
+    color: #6f6f6f !important;
 }
 
 .table-image {
@@ -5996,4 +5994,18 @@ input[name="username"] {
     transform: rotate(45deg);
     -webkit-transform: rotate(0deg);
     overflow: hidden;
-}
+}
+.search-filter-button {
+    width: 100%;
+}
+.list-header {
+    border-bottom: 1px solid #f6f6f6;
+}
+.list-header .sort-by-list {
+    margin: 25px;
+    font-size: 18px;
+}
+
+.list-header .sort-by-list h5{
+    font-size: 18px;
+}

addons/default/visiosoft/base-theme/resources/font-awesome/css/all.css

@@ -4305,8 +4305,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: normal;
   font-display: auto;
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.eot") }}');
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.eot") }}');
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.eot") }}') format("embedded-opentype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.woff2") }}') format("woff2"), url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.woff") }}') format("woff"), url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.ttf") }}') format("truetype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-brands-400.svg#fontawesome") }}') format("svg"); }
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.eot") }}') format("embedded-opentype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.woff2") }}') format("woff2"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.woff") }}') format("woff"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.ttf") }}') format("truetype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-brands-400.svg#fontawesome") }}') format("svg"); }
 
 .fab {
   font-family: 'Font Awesome 5 Brands'; }
@@ -4315,8 +4315,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 400;
   font-display: auto;
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.eot") }}');
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.eot") }}');
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.eot") }}') format("embedded-opentype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.woff2") }}') format("woff2"), url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.woff") }}') format("woff"), url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.ttf") }}') format("truetype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-regular-400.svg#fontawesome") }}') format("svg"); }
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.eot") }}') format("embedded-opentype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.woff2") }}') format("woff2"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.woff") }}') format("woff"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.ttf") }}') format("truetype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-regular-400.svg#fontawesome") }}') format("svg"); }
 
 .far {
   font-family: 'Font Awesome 5 Free';
@@ -4326,8 +4326,8 @@ readers do not read off random characters that represent icons */
   font-style: normal;
   font-weight: 900;
   font-display: auto;
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.eot") }}');
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.eot") }}');
-  src: url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.eot") }}') format("embedded-opentype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.woff2") }}') format("woff2"), url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.woff") }}') format("woff"), url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.ttf") }}') format("truetype"), url('{{ asset_path("theme::font-awesome/webfonts/fa-solid-900.svg#fontawesome") }}') format("svg"); }
+  src: url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.eot") }}') format("embedded-opentype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.woff2") }}') format("woff2"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.woff") }}') format("woff"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.ttf") }}') format("truetype"), url('{{ asset_path("visiosoft.theme.base::font-awesome/webfonts/fa-solid-900.svg#fontawesome") }}') format("svg"); }
 
 .fa,
 .fas {

addons/default/visiosoft/base-theme/resources/lang/en/fields.php

@@ -30,4 +30,7 @@ return [
     'content' => [
         'name' => 'Content',
     ],
+    'price' => [
+        'name' => 'Price'
+    ],
 ];

addons/default/visiosoft/base-theme/resources/lang/en/message.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+    'filter_by_search_msg' => 'Filter By Search.',
+];
+

addons/default/visiosoft/base-theme/resources/lang/tr/fields.php

@@ -1,8 +1,8 @@
 <?php
 
 return [
-   'post_ad' => 'İlanınızı Gönderin',
+    'post_ad' => 'İlanınızı Gönderin',
-   'featured_ads' => "Öne Çıkan İlanlar",
+    'featured_ads' => "Öne Çıkan İlanlar",
     'trending_ads' => 'Popüler İlanlar',
     'join-us' => 'Üye Ol',
     'sign-in' => 'Üye Girişi',
@@ -19,7 +19,6 @@ return [
     'recent_ads' => 'Son ilanlar',
 
 
-
     'email' => [
         'name' => 'Email Adresi',
     ],
@@ -32,4 +31,7 @@ return [
     'content' => [
         'name' => 'Açıklama',
     ],
+    'price' => [
+        'name' => 'Fiyat'
+    ],
 ];

addons/default/visiosoft/base-theme/resources/lang/tr/message.php

@@ -0,0 +1,5 @@
+<?php
+
+return [
+    'filter_by_search_msg' => 'Aramanızı Daraltın.',
+];

addons/default/visiosoft/base-theme/resources/scss/bootstrap/_glyphicons.scss

@@ -11,11 +11,11 @@
   // Import the fonts
   @font-face {
     font-family: 'Glyphicons Halflings';
-      src: url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.eot") }}');
+      src: url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.eot") }}');
-      src: url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.eot") }}') format('embedded-opentype'),
+      src: url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.eot") }}') format('embedded-opentype'),
-      url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.woff") }}') format('woff'),
+      url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.woff") }}') format('woff'),
-      url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.ttf") }}') format('truetype'),
+      url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.ttf") }}') format('truetype'),
-      url('{{ asset_path("theme::fonts/bootstrap/glyphicons-halflings-regular.svg") }}') format('svg');
+      url('{{ asset_path("visiosoft.theme.base::fonts/bootstrap/glyphicons-halflings-regular.svg") }}') format('svg');
       font-weight: normal;
       font-style: normal;
   }

addons/default/visiosoft/base-theme/resources/scss/font-awesome/_path.scss

@@ -3,11 +3,11 @@
 
 @font-face {
     font-family: 'FontAwesome';
-    src: url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.eot") }}');
+    src: url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.eot") }}');
-    src: url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.eot") }}') format('embedded-opentype'),
+    src: url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.eot") }}') format('embedded-opentype'),
-    url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.woff") }}') format('woff'),
+    url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.woff") }}') format('woff'),
-    url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.ttf") }}') format('truetype'),
+    url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.ttf") }}') format('truetype'),
-    url('{{ asset_path("theme::fonts/font-awesome/fontawesome-webfont.svg") }}') format('svg');
+    url('{{ asset_path("visiosoft.theme.base::fonts/font-awesome/fontawesome-webfont.svg") }}') format('svg');
     font-weight: normal;
     font-style: normal;
 }

addons/default/visiosoft/base-theme/resources/views/ad-detail/detail.twig

@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('ad-detail') %}
 
 {% block ogdata %}
     <meta property="og:site_name"
@@ -19,7 +19,7 @@
     <section id="main" class="clearfix details-page">
         <div class="container">
 
-            {% include "theme::partials/messages" %}
+            {% include "visiosoft.theme.base::partials/messages" %}
 
             <!-- breadcrumb -->
             <div class="breadcrumb-section">
@@ -38,10 +38,10 @@
             <div class="section slider">
                 <div class="row">
 
-                    {% include "theme::ad-detail/partials/slider" %}
+                    {% include "visiosoft.theme.base::ad-detail/partials/slider" %}
 
                     <div class="col-md-5">
-                        {% include "theme::ad-detail/partials/detail" %}
+                        {% include "visiosoft.theme.base::ad-detail/partials/detail" %}
                     </div>
                 </div>
 

addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/detail.twig

@@ -14,7 +14,7 @@
         <h2 class="ad-price">
             <b>{{ adv.price.format() }}</b> {{ adv.currency }}
 
-            {% include "theme::ad-detail/partials/author-button" %}
+            {% include "visiosoft.theme.base::ad-detail/partials/author-button" %}
 
         </h2>
 
@@ -99,7 +99,7 @@
 
             <!-- social-links -->
             <div class="social-links">
-                {% include "theme::ad-detail/partials/social" %}
+                {% include "visiosoft.theme.base::ad-detail/partials/social" %}
             </div>
             <!-- social-links -->
 

addons/default/visiosoft/base-theme/resources/views/ad-detail/partials/slider.twig

@@ -7,8 +7,8 @@
              data-thumbheight="48">
             {% set advPhoto = '' %}
             {% if count(adv.files) == 0 %}
-                {% set advPhoto = img('theme::images/no-image.png').url %}
+                {% set advPhoto = img('visiosoft.theme.base::images/no-image.png').url %}
-                <a href="{{ image }}"><img src="{{ img('theme::images/no-image.png').url }}"></a>
+                <a href="{{ image }}"><img src="{{ img('visiosoft.theme.base::images/no-image.png').url }}"></a>
             {% else %}
                 {% for image in adv.getViewPhotoUrl %}
                     <a href="{{ image }}"><img src="{{ image }}"></a>

addons/default/visiosoft/base-theme/resources/views/addons/anomaly/pages-module/page.twig

@@ -4,12 +4,12 @@
     {% block page %}
         {% if (request_path() == '/') %}
         {% if setting_value('visiosoft.theme.base::template') == "s" %}
-            {% include "theme::indexes/s-index" %}
+            {% include "visiosoft.theme.base::indexes/s-index" %}
         {% else %}
-            {% include "theme::indexes/index" %}
+            {% include "visiosoft.theme.base::indexes/index" %}
         {% endif %}
         {% elseif (request_path() == 'contact') %}
-            {% include "theme::page/contact" %}
+            {% include "visiosoft.theme.base::page/contact" %}
         {% else %}
 <section id="main">
     <div class="container">

addons/default/visiosoft/base-theme/resources/views/errors/403.twig

@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 
 {% block content %}
 

addons/default/visiosoft/base-theme/resources/views/errors/404.twig

@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 
 {% block content %}
 

addons/default/visiosoft/base-theme/resources/views/errors/500.twig

@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 
 {% block content %}
 

addons/default/visiosoft/base-theme/resources/views/home/featured.twig

@@ -73,7 +73,7 @@
                         {% if homepageAdvs['homepage_left_advertisement_place'] %}
                             <!-- ad-section -->
                             <div class="ad-section text-center">
-                                <a href="#"><img src="{{ img('theme::images/ads/3.jpg').url }}" alt="Image"
+                                <a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/3.jpg').url }}" alt="Image"
                                                  class="img-responsive"></a>
                             </div><!-- ad-section -->
                         {% endif %}

addons/default/visiosoft/base-theme/resources/views/indexes/index.twig

@@ -2,7 +2,7 @@
     <div class="container">
         <!-- banner -->
         <div class="banner-section text-center">
-            {% include "theme::partials/messages" %}
+            {% include "visiosoft.theme.base::partials/messages" %}
             {{ content|raw }}
             <!-- banner-form -->
             <div class="banner-form">
@@ -14,7 +14,7 @@
                                 <div class="form-group ">
                                     {% set cities = entries('location','cities').orderBy('slug').get() %}
                                     <select id="cities" name="city[]" class="form-control">
-                                        <option selected disabled>{{ trans('theme::fields.city') }}</option>
+                                        <option selected disabled>{{ trans('visiosoft.theme.base::fields.city') }}</option>
                                         {% for city in cities %}
                                             <option value="{{ city.id }}">{{ city.name }}</option>
                                         {% endfor %}
@@ -32,7 +32,7 @@
                                             <a href="#" class="btn btn-default" data-toggle="dropdown" role="button"
                                                aria-haspopup="true" aria-expanded="false">
                                             <span class="selected-category-item"
-                                                  style="display: inline-block;">{{ trans('theme::fields.categories') }}</span>
+                                                  style="display: inline-block;">{{ trans('visiosoft.theme.base::fields.categories') }}</span>
                                             </a>
                                             <ul class="dropdown-menu cat-dropdown-menu">
                                                 {% for cat in cats %}
@@ -58,13 +58,13 @@
                             {% set search_on_map_btn = setting_value('visiosoft.theme.base::show_home_search_on_map_btn') %}
                             <div class="{% if search_on_map_btn != 1 %} col-md-4 {% else %}col-md-1 {% endif %} home-search-field">
                                 <button type="submit" class="btn btn-default pl-5 pr-5 search-button"><i
-                                            class="fa fa-search"></i> {{ trans('theme::fields.search') }}
+                                            class="fa fa-search"></i> {{ trans('visiosoft.theme.base::fields.search') }}
                                 </button>
                             </div>
                             {% if search_on_map_btn %}
                                 <div class="col-md-3 home-search-field">
                                     <button type="button" class="btn btn-default map-search-button pl-5 pr-5 "><i
-                                                class="fa fa-map-marker"></i> {{ trans('theme::fields.search_map') }}
+                                                class="fa fa-map-marker"></i> {{ trans('visiosoft.theme.base::fields.search_map') }}
                                     </button>
                                 </div>
                             {% endif %}
@@ -76,7 +76,7 @@
                         <div class="last-search">
                             <a href="{{ app.request.cookies.get('last_search') }}" class="btn btn-default center-block">
                                 <i class="fa fa-history"></i>
-                                {{ trans('theme::fields.last_search') }}</a>
+                                {{ trans('visiosoft.theme.base::fields.last_search') }}</a>
                         </div>
                     {% endif %}
                 {% endif %}
@@ -96,7 +96,7 @@
                                 <div class="row">
                                     <div class="col-sm-12">
                                         <div class="section-title featured-top">
-                                            <h4>{{ trans('theme::fields.featured_ads') }}</h4>
+                                            <h4>{{ trans('visiosoft.theme.base::fields.featured_ads') }}</h4>
                                         </div>
                                     </div>
                                 </div>
@@ -173,10 +173,10 @@
                             <!-- Nav tabs -->
                             <ul class="nav nav-tabs" role="tablist">
                                 <li role="presentation" class="active"><a href="#recent-ads"
-                                                                          data-toggle="tab">{{ trans('theme::fields.recent_ads') }}</a>
+                                                                          data-toggle="tab">{{ trans('visiosoft.theme.base::fields.recent_ads') }}</a>
                                 </li>
                                 <li role="presentation"><a href="#popular"
-                                                           data-toggle="tab">{{ trans('theme::fields.trending_ads') }}</a>
+                                                           data-toggle="tab">{{ trans('visiosoft.theme.base::fields.trending_ads') }}</a>
                                 </li>
                             </ul>
                         </div>
@@ -325,7 +325,7 @@
                 <div class="hidden-xs hidden-sm col-md-2">
                     {#{% if homepageAdvs['homepage_right_advertisement_place'] %}#}
                     {#<div class="advertisement text-center">#}
-                    {#<a href="#"><img src="{{ img('theme::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>#}
+                    {#<a href="#"><img src="{{ img('visiosoft.theme.base::images/ads/1.jpg').url }}" alt="Images" class="img-responsive"></a>#}
                     {#</div>#}
                     {{ blocks('right-home-banner-area') }}
 

addons/default/visiosoft/base-theme/resources/views/indexes/indexcar.twig

@@ -1,10 +1,10 @@
-{% include "theme::home/carsearch" %}
+{% include "visiosoft.theme.base::home/carsearch" %}
 <div class="page">
     <div class="container">
 
-        {% include "theme::home/featured" %}
+        {% include "visiosoft.theme.base::home/featured" %}
-        {% include "theme::home/trend" %}
+        {% include "visiosoft.theme.base::home/trend" %}
-        {% include "theme::home/singlecta" %}
+        {% include "visiosoft.theme.base::home/singlecta" %}
 
 
     </div>

addons/default/visiosoft/base-theme/resources/views/indexes/s-index.twig

@@ -1,26 +1,26 @@
 <div class="col-xs-12 col-sm-12 col-md-12 text-center s-home-banner visible-xs">
     <div class="col-md-12 visible-xs">
-        {% set banner_default = img('theme::images/s-home-banner.png').url %}
+        {% set banner_default = img('visiosoft.theme.base::images/s-home-banner.png').url %}
-        {{ setting_value('visiosoft.default.theme::s-type-banner-mobile-code','<img src="'~banner_default~'">')|raw }}
+        {{ setting_value('visiosoft.default.visiosoft.theme.base::s-type-banner-mobile-code','<img src="'~banner_default~'">')|raw }}
     </div>
 </div>
-{% include "theme::partials/s-mobile-categories" %}
+{% include "visiosoft.theme.base::partials/s-mobile-categories" %}
 
 <div class="container s-container">
 
-    {% include "theme::partials/categories-s" %}
+    {% include "visiosoft.theme.base::partials/categories-s" %}
 
     <div class="col-sm-9 s-home-show">
         <div class="row s-home-showcase">
             <div class="col-xs-12 col-sm-12 col-md-12 text-center s-home-banner hidden-xs">
                 <div class="col-md-12 hidden-xs">
-                    {% set banner_default = img('theme::images/s-home-banner-web.png').url %}
+                    {% set banner_default = img('visiosoft.theme.base::images/s-home-banner-web.png').url %}
-                    {{ setting_value('visiosoft.default.theme::s-type-banner-code','<img src="'~banner_default~'"/>')|raw }}
+                    {{ setting_value('visiosoft.default.visiosoft.theme.base::s-type-banner-code','<img src="'~banner_default~'"/>')|raw }}
                 </div>
             </div>
-            {% include "theme::partials/home-showcase-s" %}
+            {% include "visiosoft.theme.base::partials/home-showcase-s" %}
             <div class="col-md-12 s-container">
-                {% include "theme::partials/home-latest-s" %}
+                {% include "visiosoft.theme.base::partials/home-latest-s" %}
             </div>
 
         </div>

addons/default/visiosoft/base-theme/resources/views/layouts/default.twig

@@ -12,14 +12,14 @@
 <html>
 
 <head>
-    {% include "theme::partials/metadata" %}
+    {% include "visiosoft.theme.base::partials/metadata" %}
     {% block ogdata %}
         {% if app.request.pathInfo == "/" %}
         <meta property="og:site_name" content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}"/>
         <meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description)) }}"/>
         <meta property="og:title" content="{{ template.get('og_title', trans(template.meta_title)) }}"/>
         <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
-        <meta property="og:image" content="{{ entries('advs').isOgImage(img('theme::images/logo-horizontal.png').url) }}">
+        <meta property="og:image" content="{{ entries('advs').isOgImage(img('visiosoft.theme.base::images/logo-horizontal.png').url) }}">
         <meta property="og:type" content="website"/>
         {% endif %}
     {% endblock %}
@@ -28,15 +28,15 @@
 
 <body>
 
-{% include "theme::partials/header" %}
+{% include "visiosoft.theme.base::partials/header" %}
 
 {% block content %}{% endblock %}
 
 {% if entries('advs').isEnabled('pushnotifications') %}
 {% include "visiosoft.module.pushnotifications::pushbar" %}
 {% endif %}
-{% include "theme::partials/footer" %}
+{% include "visiosoft.theme.base::partials/footer" %}
-{% include "theme::partials/assets" %}
+{% include "visiosoft.theme.base::partials/assets" %}
 
 {% block customjs %}{% endblock %}
 

addons/default/visiosoft/base-theme/resources/views/list/list.twig

@@ -1,261 +1,57 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('list') %}
+
 {% block content %}
-    <!-- main -->
     <section id="main" class="clearfix category-page">
+
         <div class="container">
-            {% include "theme::partials/messages" %}
-            <div class="breadcrumb-section">
-                <!-- breadcrumb -->
-                <ol class="breadcrumb">
-                    <li><a href="/">{{ trans("visiosoft.module.advs::field.home") }}</a></li>
-                    {% if app.request.get('cat')%}
-                        {% for category_breadcrumbs in mainCats.first.getMains(app.request.get('cat')) %}
-                            <li><a href="{{ url_route('visiosoft.module.advs::list_cat', [category_breadcrumbs.id]) }}">{{ category_breadcrumbs.val }}</a></li>
-                        {% endfor %}
-                    {% endif %}
-                </ol><!-- breadcrumb -->
-                {% if app.request.get('cat') %}
-                    <h2 class="title">{{ mainCats.first.getCategoryName(app.request.get('cat')) }}</h2>
-                {% endif %}
-            </div>
-            <div class="category-info">
-                <div class="row">
-                    {% if app.request.get('user') != null or app.request.get('user') != "" %}
-                        <div class="col-md-12 upper-list-banner">
-                            <div class="upper-list-user">
-                                <div class="upper-list-img">
-                                    <a href=""><img src="{{ userProfile.file.url}}" alt=""></a>
-                                </div>
-                                <div class="upper-list-info">
-                                    {{ user.first_name }} {{ user.last_name }}
-                                </div>
-                            </div>
-                            {% if userProfile.adv_listing_banner.url == ''  %}
-                                <img src="{{ img('theme::images/bg/1.png').url }}">
-                            {% else %}
-                                <img src="{{ userProfile.adv_listing_banner.url }}">
-                            {% endif %}
-                        </div>
-                    {% endif %}
-                    <!-- accordion-->
-                    <form action="{{ url_route('visiosoft.module.advs::list') }}" method="get">
-                        {% include "visiosoft.theme.base::list/partials/list-filter" %}
 
-                        <!-- recommended-ads -->
+            {% include "visiosoft.theme.base::partials/messages" %}
-                        <div class="col-sm-8 col-md-9">
-                            <div class="section recommended-ads">
-                                <!-- featured-top -->
-                                {% include "visiosoft.theme.base::list/partials/display-mode" %}
-                                <div class="featured-top">
-                                    {% if app.request.get('cat') %}
-                                        <h4>{{ trans("visiosoft.module.advs::field.search_ads_result_message.name",{'name':mainCats.first.getCategoryName(app.request.get('cat')),'count':count(advs)+count(featured_advs) }) }}</h4>
-                                    {% else %}
-                                        <h4>{{ trans("visiosoft.module.advs::field.recommended") }}</h4>
-                                    {% endif %}
-                                    <div class="dropdown pull-right">
 
-                                        <!-- category-change -->
+            <!-- breadcrumb -->
-                                        <div class="dropdown">
+            {% include "visiosoft.theme.base::list/partials/breadcrumb" %}
-                                            <h5>{{ trans("visiosoft.module.advs::field.sort_by") }}:</h5>
+            <!-- breadcrumb -->
-                                            <a data-toggle="dropdown" class="sort-by-open-dropdown" href="#" aria-expanded="false">
-                                                <span class="sort-by-selected-text">{{ trans("visiosoft.module.advs::field.pick_option") }}</span><i class="fa fa-caret-square-o-down"></i></a>
-                                            <ul class="dropdown-menu sort-by-dropdown" x-placement="bottom-start" >
-                                                <li><a href="#" data-value="sort_price_up" class="sort-by-item">{{ trans("visiosoft.module.advs::field.price_high") }}</a></li>
-                                                <li><a href="#" data-value="sort_price_down" class="sort-by-item">{{ trans("visiosoft.module.advs::field.price-low") }}</a></li>
-                                                <li><a href="#" data-value="sort_time" class="sort-by-item">{{ trans("visiosoft.module.advs::field.newest") }}</a></li>
-                                            </ul>
-                                        </div><!-- category-change -->
-                                    </div>
-                                </div>
-                                {% if entries('advs').isEnabled('customfields') %}
-                                    {% include "visiosoft.module.customfields::selecttop" %}
-                                {% endif %}
-                                <div class="category-tabs">
 
-                                </div>
+            {% block listContent %}
+                <div class="category-info">
 
-                                {% for adv in featured_advs %}
+                    <div class="row">
-                                {% if adv.doping != null %}
-                                <div class="oc-item1 featured_adv_item row">
-                                    {% else %}
-                                    <div class="oc-item1 row">
-                                        {% endif %}
-                                        <!-- item-image -->
-                                        <div class="item-image-box col-sm-4">
-                                            <div class="item-image">
-                                                <a href="{{ adv.detail_url }}">
-                                                    {% set advPhoto = adv.cover_photo %}
-                                                    {% if adv.is_get_adv == "1" and adv.stock == "0" and entries('advs').isEnabled('carts') %}
-                                                        <div class="corner-ribbon top-right sticky blue">{{ trans('visiosoft.module.advs::field.sold_out.name') }}</div>
-                                                    {% endif %}
-                                                    <img src="{{ adv.cover_photo }}" alt="Image" class="img-responsive"></a>
-                                            </div><!-- item-image -->
-                                        </div>
 
-                                        <!-- rending-text -->
+                        {% include "visiosoft.theme.base::list/partials/user-section" %}
-                                        <div class="item-info col-sm-8">
-                                            <!-- ad-info -->
-                                            <div class="ad-info">
-                                                <h3 class="item-price">{{ adv.price }} {{ adv.currency }}</h3>
-                                                <h4 class="item-title bengali"><a href="{{ adv.detail_url }}">{{ adv.name }}</a></h4>
-                                                <div class="item-cat">
-                                                    <span><a href="#">{{ adv.cat1_name }}</a></span>
-                                                    {% if adv.cat2_name != "" %}
-                                                        / <span><a href="#">{{ adv.cat2_name }}</a></span>
-                                                    {% endif %}
-                                                </div>
-                                            </div><!-- ad-info -->
 
-                                            <!-- ad-meta -->
+                        <form action="{{ url_route('visiosoft.module.advs::list') }}" method="get">
-                                            <div class="ad-meta">
-                                                <div class="meta-content">
-                                                    <span class="dated"><a href="#">{{ adv.created_at|date("d/m/Y") }} </a></span>
-                                                </div>
-                                                <!-- item-info-right -->
-                                                <div class="user-option pull-right">
-                                                    {% if adv.isAdVideo is defined and adv.isAdVideo != null %}
-                                                        <a data-toggle="tooltip" data-id="{{ adv.id }}" class="ad-info-right-bar-video" data-placement="top"
-                                                           title="<video controls loop class='img-responsive video-ad-tooltip-{{ adv.id }}' style='text-align: center; width: 100%'>
-                                                    <source src='{{ adv.isAdVideo }}' class='video-src' type='video/mp4' />
-                                                    </video>">
-                                                            <i class="fa fa-film"></i> </a>
-                                                    {% endif %}
-                                                    <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
-                                                    <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
 
-                                                    {% if entries('advs').isEnabled('comparisons') %}
+                            {% include "visiosoft.theme.base::list/partials/list-filter" %}
 
-                                                        {% include "visiosoft.module.comparisons::comparebtn" %}
+                            <div class="col-sm-8 col-md-9">
 
-                                                    {% endif %}
+                                {% include "visiosoft.theme.base::list/partials/list-section" %}
-                                                </div><!-- item-info-right -->
-                                            </div><!-- ad-meta -->
-                                        </div><!-- item-info -->
-                                    </div><!-- oc-item -->
-                                    {% endfor %}
 
-                                    {% for adv in advs %}
-                                    <!-- oc-item -->
-                                    {% if adv.doping != null %}
-                                    <div class="oc-item1 featured_adv_item row">
-                                        {% else %}
-                                        <div class="oc-item1 row">
-                                            {% endif %}
-                                            <!-- item-image -->
-                                            <div class="item-image-box col-sm-4">
-                                                <div class="item-image">
-                                                    <a href="{{ adv.detail_url }}">
-                                                        {% set advPhoto = adv.cover_photo %}
-                                                        {% if adv.is_get_adv == "1" and adv.stock == "0" and entries('advs').isEnabled('carts') %}
-                                                            <div class="corner-ribbon top-right sticky blue">{{ trans('visiosoft.module.advs::field.sold_out.name') }}</div>
-                                                        {% endif %}
-                                                        <img src="{{ adv.cover_photo }}" alt="Image" class="img-responsive"></a>
-                                                </div><!-- item-image -->
-                                            </div>
-
-                                            <!-- rending-text -->
-                                            <div class="item-info col-sm-8">
-                                                <!-- ad-info -->
-                                                <div class="ad-info">
-                                                    <h3 class="item-price">{{ adv.price }} {{ adv.currency }}</h3>
-                                                    <h4 class="item-title bengali"><a href="{{ adv.detail_url }}">{{ adv.name }}</a></h4>
-                                                    <div class="item-cat">
-                                                        <span><a href="#">{{ adv.cat1_name }}</a></span>
-                                                        {% if adv.cat2_name != "" %}
-                                                            / <span><a href="#">{{ adv.cat2_name }}</a></span>
-                                                        {% endif %}
-                                                    </div>
-                                                </div><!-- ad-info -->
-
-                                                <!-- ad-meta -->
-                                                <div class="ad-meta">
-                                                    <div class="meta-content">
-                                                        <span class="dated"><a href="#">{{ adv.created_at|date("d/m/Y") }} </a></span>
-                                                    </div>
-                                                    <!-- item-info-right -->
-                                                    <div class="user-option pull-right">
-                                                        {% if adv.isAdVideo is defined and adv.isAdVideo != null %}
-                                                            <a data-toggle="tooltip" data-id="{{ adv.id }}" class="ad-info-right-bar-video" data-placement="top"
-                                                               title="<video controls loop class='img-responsive video-ad-tooltip-{{ adv.id }}' style='text-align: center; width: 100%'>
-                                                    <source src='{{ adv.isAdVideo }}' class='video-src' type='video/mp4' />
-                                                    </video>"></a>
-                                                        {% endif %}
-                                                        <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
-                                                        <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
-
-                                                        {% if entries('advs').isEnabled('comparisons') %}
-                                                            {% include "visiosoft.module.comparisons::comparebtn" %}
-                                                        {% endif %}
-
-                                                    </div><!-- item-info-right -->
-                                                </div><!-- ad-meta -->
-                                            </div><!-- item-info -->
-                                        </div><!-- oc-item -->
-                                        <!-- ad-section -->
-                                        {% endfor %}
-                                        <!-- pagination  -->
-                                        <div class="text-center">
-                                            <div class="tool-pagination">
-                                                {{ advs.links()|raw }}
-                                            </div>
-                                        </div><!-- pagination  -->
-                                        {% if entries('advs').isEnabled('favs') %}
-                                            <div class="favorite-searches">
-                                                <div class="search-fav-icon col-md-1">
-                                                    <i class="fa fa-search"></i>
-                                                </div>
-                                                <div class="search-fav-tex col-md-8">
-                                                    <h4>{{ trans("visiosoft.module.advs::field.my_favorite_searches") }}</h4><br>
-                                                    <p>{{ trans("visiosoft.module.advs::field.search_desc") }}</p>
-                                                </div>
-                                                <div class="search-fav-button col-md-3">
-                                                    <button class="btn btn-success" type="button" id="save-search">{{ trans("visiosoft.module.advs::field.add_to_favorites") }}</button>
-                                                </div>
-                                            </div>
-                                        {% endif %}
-                                    </div>
-                                </div><!-- recommended-ads -->
 
                             </div>
-                        </div>
-                        <div class="col-md-2"></div>
-                    </form>
 
-                </div><!-- container -->
+                        </form>
-            </div>
+
+                    </div>
+                </div>
+            {% endblock %}
+
+
         </div>
+
     </section>
 
-
-
-    </section><!-- main -->
-
-    <div id="search-fav-modal" class="modal fade" role="dialog">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header message-header">
-                    <h4 class="modal-title">{{ trans("visiosoft.module.advs::field.add_to_favorites") }}</h4>
-                </div>
-                <form action="{{ url_route("visiosoft.module.favs::add_search") }}" method="POST">
-                    <div class="modal-body search-fav-body">
-                        <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        <input name="url" type="hidden" value="{{ app.request.getRequestUri }}">
-                        <input placeholder="{{ trans("visiosoft.module.advs::field.search_name") }}" class="form-control" type="text" name="item_name" required>
-                    </div>
-                    <div class="modal-footer message-footer">
-                        <button id="send-fav-search" class="btn btn-success"  type="submit">{{ trans("visiosoft.module.advs::field.send") }}</button>
-
-                    </div>
-                </form>
-            </div>
-        </div>
-    </div>
     <script>
         var select_trans = "{{ trans('visiosoft.module.advs::field.pick_option') }}";
     </script>
-    {{ asset_add("scripts.js", "visiosoft.theme.base::js/admin-list.js") }}
+
+    {% if entries('advs').isEnabled('favs') %}
+        {% include "visiosoft.module.favs::list/favorites-modal" %}
+    {% endif %}
+
+    {{ asset_add("scripts.js", "visiosoft.theme.base::js/list.js") }}
 
     {% if entries('advs').isEnabled('comparisons') %}
         {% include "visiosoft.module.comparisons::comparison" %}
     {% endif %}
+
 {% endblock %}

addons/default/visiosoft/base-theme/resources/views/list/map.twig

@@ -1,32 +1,22 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::list/list" %}
-{% block content %}
+{% block listContent %}
-    <!-- main -->
+    <div class="category-info">
-    <section id="main" class="clearfix category-page">
+        <div class="row">
-        <div class="container">
+            {% include "visiosoft.theme.base::list/partials/list-filter" %}
-            <div class="breadcrumb-section">
+            <div class="col-sm-8 col-md-9">
-                <!-- breadcrumb -->
+                <div class="section recommended-ads ">
-                <ol class="breadcrumb">
+                    {% include "visiosoft.theme.base::list/partials/display-mode" %}
-                    <li><a href="/">{{ trans('visiosoft.module.advs::field.home') }}</a></li>
+                    <div class="listMap">
-                </ol><!-- breadcrumb -->
+                        <div id="map"></div>
-            </div>
-
-            <div class="category-info">
-                <div class="row">
-                    <!-- accordion-->
-                    {% include "visiosoft.theme.base::list/partials/list-filter" %}
-                    <div class="col-sm-8 col-md-9">
-                        <div class="section recommended-ads listMap">
-                            <!-- featured-top -->
-                            {% include "visiosoft.theme.base::list/partials/display-mode" %}
-                            <div id="map"></div>
-                        </div>
                     </div>
-
+                    {% if entries('advs').isEnabled('favs') %}
+                        {% include "visiosoft.module.favs::list/favorites-section" %}
+                    {% endif %}
                 </div>
             </div>
-        </div><!-- container -->
+
-    </section><!-- main -->
+        </div>
-    {{ asset_add("scripts.js", "visiosoft.theme.base::js/admin-list.js") }}
+    </div>
 {% endblock %}
 
 {% block customjs %}

addons/default/visiosoft/base-theme/resources/views/list/partials/ads.twig

@@ -0,0 +1,69 @@
+{% for adv in advs %}
+    <!-- oc-item -->
+    {% if adv.doping != null %}
+        <div class="oc-item1 featured_adv_item row">
+    {% else %}
+        <div class="oc-item1 row">
+    {% endif %}
+    <!-- item-image -->
+    <div class="item-image-box col-sm-4">
+        <div class="item-image">
+            <a href="{{ adv.detail_url }}">
+                {% set advPhoto = adv.cover_photo %}
+                {% if adv.is_get_adv == "1" and adv.stock == "0" and entries('advs').isEnabled('carts') %}
+                    <div class="corner-ribbon top-right sticky blue">{{ trans('visiosoft.module.advs::field.sold_out.name') }}</div>
+                {% endif %}
+                <img src="{{ adv.cover_photo }}" alt="Image"
+                     class="img-responsive"></a>
+        </div><!-- item-image -->
+    </div>
+
+    <!-- rending-text -->
+    <div class="item-info col-sm-8">
+        <!-- ad-info -->
+        <div class="ad-info">
+            <h3 class="item-price">{{ adv.price }} {{ adv.currency }}</h3>
+            <h4 class="item-title bengali"><a
+                        href="{{ adv.detail_url }}">{{ adv.name }}</a></h4>
+            <div class="item-cat">
+                <span><a href="#">{{ adv.cat1_name }}</a></span>
+                {% if adv.cat2_name != "" %}
+                    / <span><a href="#">{{ adv.cat2_name }}</a></span>
+                {% endif %}
+            </div>
+        </div><!-- ad-info -->
+
+        <!-- ad-meta -->
+        <div class="ad-meta">
+            <div class="meta-content">
+                <span class="dated">
+                    <a href="#">{{ adv.created_at|date("d/m/Y") }} </a>
+                </span>
+            </div>
+            <!-- item-info-right -->
+            <div class="user-option pull-right">
+                {% if adv.isAdVideo is defined and adv.isAdVideo != null %}
+                    <a data-toggle="tooltip" data-id="{{ adv.id }}"
+                       class="ad-info-right-bar-video" data-placement="top"
+                       title="<video controls loop class='img-responsive video-ad-tooltip-{{ adv.id }}' style='text-align: center; width: 100%'>
+                                                    <source src='{{ adv.isAdVideo }}' class='video-src' type='video/mp4' />
+                                                    </video>"></a>
+                {% endif %}
+                <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
+                   data-toggle="tooltip" data-placement="top"
+                   title="{{ adv.city_name }}, {{ adv.country_name }}"><i
+                            class="fa fa-map-marker"></i> </a>
+                <a class="online" href="" data-toggle="tooltip"
+                   data-placement="top" title="{{ adv.owner }}"><i
+                            class="fa fa-user"></i> </a>
+
+                {% if entries('advs').isEnabled('comparisons') %}
+                    {% include "visiosoft.module.comparisons::comparebtn" %}
+                {% endif %}
+
+            </div><!-- item-info-right -->
+        </div><!-- ad-meta -->
+    </div><!-- item-info -->
+    </div><!-- oc-item -->
+    <!-- ad-section -->
+{% endfor %}

addons/default/visiosoft/base-theme/resources/views/list/partials/breadcrumb.twig

@@ -0,0 +1,15 @@
+<div class="breadcrumb-section">
+    <ol class="breadcrumb">
+        <li><a href="/">{{ trans("visiosoft.module.advs::field.home") }}</a></li>
+        {% if app.request.get('cat') %}
+            {% for category_breadcrumbs in mainCats.first.getMains(app.request.get('cat')) %}
+                <li>
+                    <a href="{{ url_route('visiosoft.module.advs::list_cat', [category_breadcrumbs.id]) }}">{{ category_breadcrumbs.val }}</a>
+                </li>
+            {% endfor %}
+        {% endif %}
+    </ol>
+    {% if app.request.get('cat') %}
+        <h2 class="title">{{ mainCats.first.getCategoryName(app.request.get('cat')) }}</h2>
+    {% endif %}
+</div>

addons/default/visiosoft/base-theme/resources/views/list/partials/featured-ads.twig

@@ -0,0 +1,67 @@
+{% for adv in featured_advs %}
+
+    {% if adv.doping != null %}
+        <div class="oc-item1 featured_adv_item row">
+    {% else %}
+        <div class="oc-item1 row">
+    {% endif %}
+    <!-- item-image -->
+    <div class="item-image-box col-sm-4">
+        <div class="item-image">
+            <a href="{{ adv.detail_url }}">
+                {% set advPhoto = adv.cover_photo %}
+                {% if adv.is_get_adv == "1" and adv.stock == "0" and entries('advs').isEnabled('carts') %}
+                    <div class="corner-ribbon top-right sticky blue">{{ trans('visiosoft.module.advs::field.sold_out.name') }}</div>
+                {% endif %}
+                <img src="{{ adv.cover_photo }}" alt="Image" class="img-responsive"></a>
+        </div><!-- item-image -->
+    </div>
+
+    <!-- rending-text -->
+    <div class="item-info col-sm-8">
+        <!-- ad-info -->
+        <div class="ad-info">
+            <h3 class="item-price">{{ adv.price }} {{ adv.currency }}</h3>
+            <h4 class="item-title bengali"><a
+                        href="{{ adv.detail_url }}">{{ adv.name }}</a></h4>
+            <div class="item-cat">
+                <span><a href="#">{{ adv.cat1_name }}</a></span>
+                {% if adv.cat2_name != "" %}
+                    / <span><a href="#">{{ adv.cat2_name }}</a></span>
+                {% endif %}
+            </div>
+        </div><!-- ad-info -->
+
+        <!-- ad-meta -->
+        <div class="ad-meta">
+            <div class="meta-content">
+                                                    <span class="dated"><a
+                                                                href="#">{{ adv.created_at|date("d/m/Y") }} </a></span>
+            </div>
+            <!-- item-info-right -->
+            <div class="user-option pull-right">
+                {% if adv.isAdVideo is defined and adv.isAdVideo != null %}
+                    <a data-toggle="tooltip" data-id="{{ adv.id }}"
+                       class="ad-info-right-bar-video" data-placement="top"
+                       title="<video controls loop class='img-responsive video-ad-tooltip-{{ adv.id }}' style='text-align: center; width: 100%'>
+                                                    <source src='{{ adv.isAdVideo }}' class='video-src' type='video/mp4' />
+                                                    </video>">
+                        <i class="fa fa-film"></i> </a>
+                {% endif %}
+                <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
+                   data-toggle="tooltip" data-placement="top"
+                   title="{{ adv.city_name }}, {{ adv.country_name }}"><i
+                            class="fa fa-map-marker"></i> </a>
+                <a class="online" href="" data-toggle="tooltip" data-placement="top"
+                   title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
+
+                {% if entries('advs').isEnabled('comparisons') %}
+
+                    {% include "visiosoft.module.comparisons::comparebtn" %}
+
+                {% endif %}
+            </div><!-- item-info-right -->
+        </div><!-- ad-meta -->
+    </div><!-- item-info -->
+    </div><!-- oc-item -->
+{% endfor %}

addons/default/visiosoft/base-theme/resources/views/list/partials/list-filter.twig

@@ -2,26 +2,27 @@
     <input type="hidden" name="cat" value="{{ app.request.get('cat') }}">
     <input type="hidden" name="user" value="{{ app.request.get('user') }}">
     <div class="accordion">
-        <!-- panel-group -->
         <div class="panel-group" id="accordion">
-            <!-- panel -->
             <div class="panel-default panel-faq">
-                <!-- panel-heading -->
+
                 <div class="panel-heading active-faq">
                     <a data-toggle="collapse" data-parent="#accordion" href="#accordion-one">
-                        <h4 class="panel-title">{{ trans("visiosoft.module.advs::field.categories") }}<span
+                        <h4 class="panel-title">{{ trans("visiosoft.module.advs::field.categories") }}
-                                    class="pull-right"><i class="fa fa-minus"></i></span></h4>
+                            <span class="pull-right">
+                                <i class="fa fa-minus"></i>
+                            </span>
+                        </h4>
                     </a>
-                </div><!-- panel-heading -->
+                </div>
+
                 <div id="accordion-one" class="panel-collapse collapse in">
-                    <!-- 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 }}"
+                                                               src="{{ img('visiosoft.theme.base::images/plus-categories.png').url }}"
                                                                alt="">{% endif %}{{ maincat.name }}</a>
                             {% for subcat in subCats %}
                                 <ul>
@@ -33,220 +34,71 @@
                                 </ul>
                             {% endfor %}
                         {% endfor %}
-                    </div><!-- panel-body -->
+                    </div>
                 </div>
-            </div><!-- panel -->
+            </div>
-            {% if setting_value('visiosoft.module.location::list_page_location') %}
-                <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-minus"></i></span></h4>
-                        </a>
-                    </div><!-- panel-heading -->
 
-                    <div id="accordion-location" class="panel-collapse collapse in">
+            {% include "visiosoft.module.location::list/filter" %}
-                        <!-- panel-body -->
+
-                        <div class="panel-body">
+            {% if entries('advs').isEnabled('customfields') %}
-                            <ul id="list-items" class="filter-list-items">
+                {% include "visiosoft.module.customfields::list/filter" %}
-                                <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 -->
             {% endif %}
-            {% 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-minus"></i></span>
-                            </h4>
-                        </a>
-                    </div><!-- panel-heading -->
 
-                    <div id="accordion-{{ loop.index }}" class="panel-collapse in">
+            <!-- Price -->
-                        <!-- 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=""
-                                                        {% 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 %}
-
-            {% 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-minus"></i></span>
-                            </h4>
-                        </a>
-                    </div><!-- panel-heading -->
-
-                    <div id="accordion-{{ loop.index }}" class="panel-collapse collapse in">
-                        <!-- 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 %}
-
-            <!-- 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
+                            {{ trans('visiosoft.theme.base::fields.price.name') }}
                             <span class="pull-right"><i class="fa fa-minus"></i></span>
                         </h4>
                     </a>
-                </div><!-- panel-heading -->
+                </div>
+
                 <div id="accordion-three" class="panel-collapse collapse in" aria-expanded="true" style="">
-                    <!-- panel-body -->
                     <div class="panel-body">
-                        <div class="price-range"><!--price-range-->
+                        <div class="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"
+                                       name="min_price" min="0" placeholder="Min"> -
-                                                                                            type="number"
+
-                                                                                            value="{{ request.max_price }}"
+                                <input class="price-input" type="number" value="{{ request.max_price }}"
-                                                                                            name="max_price"
+                                       name="max_price" placeholder="Max">
-                                                                                            placeholder="Max">
+
                                 <select name="currency" id="currency">
                                     {% for currency in active_currencies %}
                                         <option value="{{ currency }}">{{ currency }}</option>
                                     {% endfor %}
                                 </select>
+
                             </div>
-                        </div><!--/price-range-->
+                        </div>
-                    </div><!-- panel-body -->
+                    </div>
                 </div>
             </div>
+            <!-- Price -->
+
+
+            {% if entries('advs').isEnabled('searchbydistance') %}
+                <!--Search By Distance-->
+                {% include "visiosoft.module.searchbydistance::list/filter" %}
+                <!--Search By Distance-->
+            {% endif %}
+
             <div class="panel-default panel-faq">
-                {% if entries('advs').isEnabled('searchbydistance') %}
+                <div class="panel-heading text-center">
-                    <div class="panel-heading">
+                    <div id="search-button">
-                        <a data-toggle="collapse" data-parent="#accordion" href="#accordion-four">
+                        <button type="submit" class="btn btn-primary search-filter-button">
-                            <h4 class="panel-title">
+                            {{ trans("visiosoft.module.advs::field.search") }}
-                                {{ trans("visiosoft.module.searchbydistance::field.searchbydistance") }}
+                        </button>
-                                <span class="pull-right"><i class="fa fa-minus"></i></span>
+                        <h5><font color="#333">{{ trans('visiosoft.theme.base::message.filter_by_search_msg') }}</font></h5>
-                            </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-->
-
-                                <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>
 
-        </div><!-- panel-group -->
+        </div>
     </div>
-</div><!-- accordion-->
+</div>
-{{ asset_add("scripts.js", "visiosoft.theme.base::js/filterLocation.js") }}

addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig

@@ -0,0 +1,40 @@
+<div class="section recommended-ads">
+
+    <div class="row list-header">
+
+        <div class="col-md-6">
+            {% include "visiosoft.theme.base::list/partials/list-sort-by" %}
+        </div>
+        <div class="col-md-6">
+            {% include "visiosoft.theme.base::list/partials/display-mode" %}
+
+        </div>
+    </div>
+
+
+    {% if entries('advs').isEnabled('customfields') %}
+        {% include "visiosoft.module.customfields::selecttop" %}
+    {% endif %}
+
+    <div class="category-tabs"></div>
+
+    {% include "visiosoft.theme.base::list/partials/featured-ads" %}
+
+
+    {% include "visiosoft.theme.base::list/partials/ads" %}
+
+
+    <!-- pagination  -->
+    <div class="text-center">
+        <div class="tool-pagination">
+            {{ advs.links()|raw }}
+        </div>
+    </div>
+    <!-- pagination  -->
+
+
+    {% if entries('advs').isEnabled('favs') %}
+        {% include "visiosoft.module.favs::list/favorites-section" %}
+    {% endif %}
+
+</div>

addons/default/visiosoft/base-theme/resources/views/list/partials/list-sort-by.twig

@@ -0,0 +1,26 @@
+<div class="dropdown pull-left sort-by-list">
+    <div class="dropdown">
+        <h5><i class="fa fa-filter"></i> {{ trans("visiosoft.module.advs::field.sort_by") }}:</h5>
+
+        <a data-toggle="dropdown" class="sort-by-open-dropdown" href="#"
+           aria-expanded="false">
+            <span class="sort-by-selected-text">{{ trans("visiosoft.module.advs::field.pick_option") }}</span>
+            <i class="fa fa-caret-square-o-down"></i>
+        </a>
+
+        <ul class="dropdown-menu" x-placement="bottom-start">
+            <li>
+                <a href="#" data-value="sort_price_up"
+                   class="sort-by-item">{{ trans("visiosoft.module.advs::field.price_high") }}</a>
+            </li>
+            <li>
+                <a href="#" data-value="sort_price_down"
+                   class="sort-by-item">{{ trans("visiosoft.module.advs::field.price-low") }}</a>
+            </li>
+            <li>
+                <a href="#" data-value="sort_time"
+                   class="sort-by-item">{{ trans("visiosoft.module.advs::field.newest") }}</a>
+            </li>
+        </ul>
+    </div>
+</div>

addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig

@@ -0,0 +1,17 @@
+{% if app.request.get('user') != null or app.request.get('user') != "" %}
+    <div class="col-md-12 upper-list-banner">
+        <div class="upper-list-user">
+            <div class="upper-list-img">
+                <a href=""><img src="{{ userProfile.file.url }}" alt=""></a>
+            </div>
+            <div class="upper-list-info">
+                {{ user.first_name }} {{ user.last_name }}
+            </div>
+        </div>
+        {% if userProfile.adv_listing_banner.url == '' %}
+            <img src="{{ img('visiosoft.theme.base::images/bg/1.png').url }}">
+        {% else %}
+            <img src="{{ userProfile.adv_listing_banner.url }}">
+        {% endif %}
+    </div>
+{% endif %}

addons/default/visiosoft/base-theme/resources/views/list/table.twig

@@ -1,169 +1,92 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::list/list" %}
-{% block content %}
+{% block listContent %}
-    <!-- main -->
-    <section id="main" class="clearfix category-page">
-        <div class="container">
-            {% include "theme::partials/messages" %}
-            <div class="breadcrumb-section">
-                <!-- breadcrumb -->
-                <ol class="breadcrumb">
-                    <li>
-                        <a href="/">{{ trans("visiosoft.module.advs::field.home") }}</a>
-                    </li>
-                    {% if app.request.get('cat') %}
-                        {% for category_breadcrumbs in mainCats.first.getMains(app.request.get('cat')) %}
-                            <li>
-                                <a href="{{ url_route('visiosoft.module.advs::list_cat', [category_breadcrumbs.id]) }}">{{ category_breadcrumbs.val }}</a>
-                            </li>
-                        {% endfor %}
-                    {% endif %}
-                </ol><!-- breadcrumb -->
-                {% if app.request.get('cat') %}
-                    <h2 class="title">{{ mainCats.first.getCategoryName(app.request.get('cat')) }}</h2>
-                {% else %}
-                    <h2 class="title">{{ trans("visiosoft.module.advs::field.recommended") }}</h2>
-                {% endif %}
-            </div>
-            <div class="category-info">
-                <div class="row">
-                    {% if app.request.get('user') != null or app.request.get('user') != "" %}
-                        <div class="col-md-12 upper-list-banner">
-                            <div class="upper-list-user">
-                                <div class="upper-list-img">
-                                    <a href=""><img src="{{ userProfile.file.url }}" alt=""></a>
-                                </div>
-                                <div class="upper-list-info">
-                                    {{ user.first_name }} {{ user.last_name }}
-                                </div>
-                            </div>
-                            <img src="https://s0.shbdn.com/assets/images/6075:5c5f1367b540e2e1c931a2c45e936b37.jpg">
-                        </div>
-                    {% endif %}
-                    <!-- accordion-->
-                    <form action="{{ url_route('visiosoft.module.advs::list') }}" method="get">
-                        {% include "visiosoft.theme.base::list/partials/list-filter" %}
 
-                        <!-- recommended-ads -->
+    <div class="category-info">
-                        <div class="col-sm-8 col-md-9">
+        <div class="row">
-                            <div class="section recommended-ads table-recommended-section">
+
-                                <!-- featured-top -->
+            {% include "visiosoft.theme.base::list/partials/user-section" %}
+
+            <form action="{{ url_route('visiosoft.module.advs::list') }}" method="get">
+
+                {% include "visiosoft.theme.base::list/partials/list-filter" %}
+
+                <div class="col-sm-8 col-md-9">
+                    <div class="section recommended-ads">
+
+                        <div class="row">
+
+                            <div class="col-md-6">
+                                    {% include "visiosoft.theme.base::list/partials/list-sort-by" %}
+                            </div>
+                            <div class="col-md-6">
                                 {% include "visiosoft.theme.base::list/partials/display-mode" %}
-                                <div class="featured-top">
-                                    {% if app.request.get('cat') %}
-                                        <h4>{{ trans("visiosoft.module.advs::field.search_ads_result_message.name",{'name':mainCats.first.getCategoryName(app.request.get('cat')),'count':count(advs)+count(featured_advs) }) }}</h4>
-                                    {% else %}
-                                        <h4>{{ trans("visiosoft.module.advs::field.recommended") }}</h4>
-                                    {% endif %}
-                                    <div class="dropdown pull-right">
 
-                                        <!-- category-change -->
-                                        <div class="dropdown">
-                                            <h5>{{ trans("visiosoft.module.advs::field.sort_by") }}:</h5>
-                                            <a data-toggle="dropdown" class="sort-by-open-dropdown" href="#"
-                                               aria-expanded="false">
-                                                <span class="sort-by-selected-text">{{ trans("visiosoft.module.advs::field.pick_option") }}</span><i
-                                                        class="fa fa-caret-square-o-down"></i></a>
-                                            <ul class="dropdown-menu sort-by-dropdown" x-placement="bottom-start">
-                                                <li><a href="#" data-value="all"
-                                                       class="sort-by-item">{{ trans("visiosoft.module.advs::field.pick_option") }}</a>
-                                                </li>
-                                                <li><a href="#" data-value="sort_price_up"
-                                                       class="sort-by-item">{{ trans("visiosoft.module.advs::field.price_high") }}</a>
-                                                </li>
-                                                <li><a href="#" data-value="sort_price_down"
-                                                       class="sort-by-item">{{ trans("visiosoft.module.advs::field.price-low") }}</a>
-                                                </li>
-                                                <li><a href="#" data-value="sort_time"
-                                                       class="sort-by-item">{{ trans("visiosoft.module.advs::field.newest") }}</a>
-                                                </li>
-                                            </ul>
-                                        </div><!-- category-change -->
-                                    </div>
-                                </div>
-                                {% if entries('advs').isEnabled('customfields') %}
-                                    {% include "visiosoft.module.customfields::selecttop" %}
-                                {% endif %}
-                                <div class="category-tabs">
-
-                                </div>
-                                <div class="table-responsive">
-
-                                    <table class="table ads-list-table">
-                                        <thead>
-                                        <tr>
-                                            <th scope="col" colspan="2" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }}</th>
-                                            <th scope="col" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }}</th>
-                                            <th scope="col" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }}</th>
-                                            <th scope="col" class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }} / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
-                                            {% if entries('advs').isEnabled('customfields') %}
-                                                {% include "visiosoft.module.customfields::cftable" %}
-                                            {% endif %}
-                                        </tr>
-                                        </thead>
-                                        <tbody>
-                                        {% include "visiosoft.theme.base::list/partials/table-row" %}
-                                        </tbody>
-                                    </table>
-                                </div>
-                                <!-- pagination  -->
-                                <div class="text-center">
-                                    <div class="tool-pagination">
-                                        {{ advs.links()|raw }}
-                                    </div>
-                                </div><!-- pagination  -->
-                                {% if entries('advs').isEnabled('favs') %}
-                                    <div class="favorite-searches">
-                                        <div class="search-fav-icon col-md-1">
-                                            <i class="fa fa-search"></i>
-                                        </div>
-                                        <div class="search-fav-tex col-md-8">
-                                            <h4>{{ trans("visiosoft.module.advs::field.my_favorite_searches") }}</h4>
-                                            <br>
-                                            <p>{{ trans("visiosoft.module.advs::field.search_desc") }}</p>
-                                        </div>
-                                        <div class="search-fav-button col-md-3">
-                                            <button class="btn btn-success" type="button"
-                                                    id="save-search">{{ trans("visiosoft.module.advs::field.add_to_favorites") }}</button>
-                                        </div>
-                                    </div>
-                                {% endif %}
                             </div>
-                        </div><!-- recommended-ads -->
+                        </div>
-                    </form>
+
-                </div>
+
-            </div>
+
+                        {% if entries('advs').isEnabled('customfields') %}
+                            {% include "visiosoft.module.customfields::selecttop" %}
+                        {% endif %}
+                        <div class="category-tabs">
+
+                        </div>
+                        <div class="table-responsive">
+
+                            <table class="table ads-list-table">
+                                <thead>
+                                <tr>
+                                    <th scope="col" colspan="2"
+                                        class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }}</th>
+                                    <th scope="col"
+                                        class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }}</th>
+                                    <th scope="col"
+                                        class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }}</th>
+                                    <th scope="col"
+                                        class="text-center">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }}
+                                        / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
+                                    {% if entries('advs').isEnabled('customfields') %}
+                                        {% include "visiosoft.module.customfields::cftable" %}
+                                    {% endif %}
+                                </tr>
+                                </thead>
+                                <tbody>
+                                {% include "visiosoft.theme.base::list/partials/table-row" %}
+                                </tbody>
+                            </table>
+                        </div>
+                        <!-- pagination  -->
+                        <div class="text-center">
+                            <div class="tool-pagination">
+                                {{ advs.links()|raw }}
+                            </div>
+                        </div><!-- pagination  -->
+                        {% if entries('advs').isEnabled('favs') %}
+                            <div class="favorite-searches">
+                                <div class="search-fav-icon col-md-1">
+                                    <i class="fa fa-search"></i>
+                                </div>
+                                <div class="search-fav-tex col-md-8">
+                                    <h4>{{ trans("visiosoft.module.advs::field.my_favorite_searches") }}</h4>
+                                    <br>
+                                    <p>{{ trans("visiosoft.module.advs::field.search_desc") }}</p>
+                                </div>
+                                <div class="search-fav-button col-md-3">
+                                    <button class="btn btn-success" type="button"
+                                            id="save-search">{{ trans("visiosoft.module.advs::field.add_to_favorites") }}</button>
+                                </div>
+                            </div>
+                        {% endif %}
+                    </div>
+                </div><!-- recommended-ads -->
             </form>
-
-        </div><!-- container -->
-    </section>
-
-
-
-    </section><!-- main -->
-
-    <div id="search-fav-modal" class="modal fade" role="dialog">
-        <div class="modal-dialog">
-            <div class="modal-content">
-                <div class="modal-header message-header">
-                    <h4 class="modal-title">{{ trans("visiosoft.module.advs::field.add_to_favorites") }}</h4>
-                </div>
-                <form action="{{ url_route("visiosoft.module.favs::add_search") }}" method="POST">
-                    <div class="modal-body search-fav-body">
-                        <input type="hidden" name="_token" value="{{ csrf_token() }}">
-                        <input name="url" type="hidden" value="{{ app.request.getRequestUri }}">
-                        <input placeholder="{{ trans("visiosoft.module.advs::field.search_name") }}"
-                               class="form-control" type="text" name="item_name" required>
-                    </div>
-                    <div class="modal-footer message-footer">
-                        <button id="send-fav-search" class="btn btn-success"
-                                type="submit">{{ trans("visiosoft.module.advs::field.send") }}</button>
-
-                    </div>
-                </form>
-            </div>
         </div>
     </div>
-    {{ asset_add("scripts.js", "visiosoft.theme.base::js/admin-list.js") }}
+
+
+{% endblock %}
+{% block customjs %}
     {{ asset_add("scripts.js", "visiosoft.theme.base::js/list-table.js") }}
-    {% include "theme::scroll-modal" %}
+    {% include "visiosoft.theme.base::scroll-modal" %}
 {% endblock %}

addons/default/visiosoft/base-theme/resources/views/login.twig

@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 {% block content %}
     <section id="main" class="clearfix user-page">
         <div class="container">
@@ -6,7 +6,7 @@
                 <!-- user-login -->
                 <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
                     <div class="user-account">
-                        {% include "theme::partials/messages" %}
+                        {% include "visiosoft.theme.base::partials/messages" %}
                         <h2>User Login</h2>
                         <!-- form -->
                         {% set form = form('login').redirect('/').get() %}
@@ -33,7 +33,7 @@
                         </div><!-- forgot-password -->
                         {% if isActiveSocial == 1 %}
                             <label>Login with:</label>
-                            {% include "theme::loginWith" %}
+                            {% include "visiosoft.theme.base::loginWith" %}
                         {% endif %}
                         {{ form.close()|raw }}
                     </div>

addons/default/visiosoft/base-theme/resources/views/new-ad/edit-cat.twig

@@ -1,4 +1,5 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('edit-cat') %}
+
 {% block content %}
     <section id="main" class="clearfix ad-post-page">
         <div class="container">

addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig

@@ -1,22 +1,12 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('new-ad') %}
+
 {% block content %}
     <section id="main" class="clearfix home-default">
         <div class="container">
-            {% include "theme::partials/messages" %}
+            {% include "visiosoft.theme.base::partials/messages" %}
-            <div class="breadcrumb-section">
+
-                <!-- breadcrumb -->
+            {% include "visiosoft.theme.base::new-ad/partials/breadcrumb" %}
-                <ol class="breadcrumb">
+
-                    <li><a>{{ trans('visiosoft.module.advs::field.home') }}</a></li>
-                    <li>{{ trans('visiosoft.module.advs::field.ad_post') }}</li>
-                </ol><!-- breadcrumb -->
-                <h2 class="title">
-                    {% if entry(id) == null %}
-                        {{ trans('visiosoft.module.advs::field.create_adv') }}
-                    {% else %}
-                        {{ trans('visiosoft.module.advs::field.edit_adv') }}
-                    {% endif %}
-                </h2>
-            </div>
             <div class="adpost-details">
                 <div class="row">
                     <div class="col-md-12">
@@ -51,7 +41,9 @@
                                                 </a>
                                             </li>
                                         {% endfor %}
-                                        <a href="{{ url_route('adv::edit_category',[id]) }}"><i class="fas fa-pencil-alt"></i> {{ trans('visiosoft.module.advs::field.edit_category') }}</a>
+                                        <a href="{{ url_route('adv::edit_category',[id]) }}"><i
+                                                    class="fas fa-pencil-alt"></i> {{ trans('visiosoft.module.advs::field.edit_category') }}
+                                        </a>
                                     </ul>
                                 </div>
                                 <div class="row form-group add-title">
@@ -111,42 +103,12 @@
                                 <div class="row form-group images">
                                     {{ form.fields.files.input |raw }}
                                 </div>
-                                {% for custom_field in custom_fields %}
+
-                                    <div class="row form-group custom-fields">
+
-                                        <label class="col-sm-3 label-title">{{ custom_field.custom_field_label|raw }}</label>
+                                {% include "visiosoft.module.location::new-ad/map" %}
-                                        <div class="col-sm-9">
+
-                                            {{ custom_field.custom_field_input|raw }}
+                                <input value="{{ adv.map_Val }}" name="map_Val" data-max="255" data-mask=""
-                                        </div>
+                                       data-alias="" data-regex=""
-                                    </div>
-                                {% endfor %}
-                                <div class="row form-group location-map">
-                                    <div class="col-sm-4">
-                                        <ul style="padding: 0">
-                                            <li class="country-data" data-content="{{ adv['country_id'] }}"
-                                                data-default="{{ setting_value('visiosoft.module.advs::default_country') }}"
-                                                class="location-field country-data">{{ form.fields.country|raw }}</li>
-                                            <li class="city-data" data-content="{{ adv['city'] }}"
-                                                data-default="{{ setting_value('visiosoft.module.advs::default_city') }}"
-                                                class="location-field city-data">{{ form.fields.city|raw }}</li>
-                                            <li class="district-data" data-content="{{ adv['district'] }}"
-                                                class="location-field district-data">{{ form.fields.district|raw }}</li>
-                                            <li class="neighborhood-data" data-content="{{ adv['neighborhood'] }}"
-                                                class="location-field neighborhood-data">{{ form.fields.neighborhood|raw }}</li>
-                                            <li class="village-data" data-content="{{ adv['village'] }}"
-                                                class="location-field">{{ form.fields.village|raw }}</li>
-                                        </ul>
-                                    </div>
-                                    <div class="col-sm-8">
-                                        <div id="map-canvas" style="
-                                position: relative; overflow: hidden;
-                                transform: translateZ(0px) translateZ(0px) translateZ(0px) translateZ(0px) translateZ(0px) translateZ(0px);
-                                width: 100%;
-                                height:550px;
-                                background-color: rgb(229, 227, 223);
-                            "></div>
-                                    </div>
-                                </div>
-                                <input value="{{adv.map_Val}}" name="map_Val" data-max="255" data-mask="" data-alias="" data-regex=""
                                        type="text" placeholder="" class="hidden d-none mapVal" data-field="map_Val"
                                        data-field_name="map_Val" data-provides="anomaly.field_type.text">
                             </div><!-- section -->

addons/default/visiosoft/base-theme/resources/views/new-ad/partials/breadcrumb.twig

@@ -0,0 +1,7 @@
+<div class="breadcrumb-section">
+    <ol class="breadcrumb">
+        <li><a href="/">{{ trans('visiosoft.module.advs::field.home') }}</a></li>
+        <li>{{ trans('visiosoft.module.advs::field.ad_post') }}</li>
+    </ol>
+    <h2 class="title">{{ trans('visiosoft.module.advs::field.post_free_ad') }}</h2>
+</div>

addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig

@@ -1,16 +1,9 @@
-{% extends "theme::layouts/default" %}
+{% extends layout('post-cat') %}
+
 {% block content %}
     <section id="main" class="clearfix ad-post-page">
         <div class="container">
-            <div class="breadcrumb-section">
+            {% include "visiosoft.theme.base::new-ad/partials/breadcrumb" %}
-                <!-- breadcrumb -->
-                <ol class="breadcrumb">
-                    <li><a href="/">{{ trans('visiosoft.module.advs::field.home') }}</a></li>
-                    <li>{{ trans('visiosoft.module.advs::field.ad_post') }}</li>
-                </ol><!-- breadcrumb -->
-                <h2 class="title">{{ trans('visiosoft.module.advs::field.post_free_ad') }}</h2>
-            </div><!-- banner -->
-
             <div id="ad-cat-section">
                 <form action="{{ url_route('visiosoft.module.advs::post_cat') }}" method="post">
                     <div class="row category-tab">
@@ -126,7 +119,7 @@
         }
 
         #main {
-            background-image: {{ img('theme::images/bg/main.png').url }} !important;
+            background-image: {{ img('visiosoft.theme.base::images/bg/main.png').url }} !important;
         }
 
         .btn-1 {

addons/default/visiosoft/base-theme/resources/views/page/contact.twig

@@ -41,16 +41,16 @@
                         <h2>{{ trans('visiosoft.module.advs::field.send_us_your_feedback') }}</h2>
                         <p>{{ form('contact').to('info@openclassify.com').from(setting_value('streams::email')).
                             handler('\\Anomaly\\ContactPlugin\\Form\\ContactFormHandler@handle').
-                            fields({'email': {'label': trans('theme::fields.email.name'),'type': 'email','required': true,},
+                            fields({'email': {'label': trans('visiosoft.theme.base::fields.email.name'),'type': 'email','required': true,},
-                                'name': {'label': trans('theme::fields.name.name'),'type': 'text','required': true,},
+                                'name': {'label': trans('visiosoft.theme.base::fields.name.name'),'type': 'text','required': true,},
-                                'subject': {'label': trans('theme::fields.subject.name'),'type': 'text','required': true,},
+                                'subject': {'label': trans('visiosoft.theme.base::fields.subject.name'),'type': 'text','required': true,},
-                                'content': {'label': trans('theme::fields.content.name'),'type': 'textarea','required': true,}})
+                                'content': {'label': trans('visiosoft.theme.base::fields.content.name'),'type': 'textarea','required': true,}})
-                            .actions({'submit': {'text': trans('theme::button.send.name')}})|raw }}</p>
+                            .actions({'submit': {'text': trans('visiosoft.theme.base::button.send.name')}})|raw }}</p>
                     </div>
                 </div><!-- feedback -->
             </div><!-- row -->
         </div>
     </div><!-- container -->
 </section><!-- main -->
-{% include "theme::partials/messages" %}
+{% include "visiosoft.theme.base::partials/messages" %}
 {{ asset_add("scripts.js", "visiosoft.theme.base::js/map.js") }}

addons/default/visiosoft/base-theme/resources/views/partials/assets.twig

@@ -1,22 +1,23 @@
+
 {#
     Main CSS can be found in metadata.twig
 #}
 
 {# Core Theme Components #}
-{{ asset_add("theme.js", "theme::js/vendor/jquery.min.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/vendor/jquery.min.js") }}
-{{ asset_add("theme.js", "theme::js/vendor/bootstrap.min.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/vendor/bootstrap.min.js") }}
-{{ asset_add("theme.js", "theme::js/vendor/vue.min.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/vendor/vue.min.js") }}
-{{ asset_add("theme.js", "theme::js/bootstrap-notify.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/bootstrap-notify.js") }}
-{{ asset_add("theme.js", "theme::js/nav.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/nav.js") }}
-{{ asset_add("theme.js", "theme::js/params.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/params.js") }}
-{{ asset_add("theme.js", "theme::js/notification.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/notification.js") }}
-{{ asset_add("theme.js", "theme::js/ajaxLoader.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/ajaxLoader.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.defaultadmin::js/theme/select2.js") }}
 
 
 {# Theme Scripts #}
-{#{{ asset_add("theme.js", "theme::js/plugins/*") }}#}
+{#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#}
-{{ asset_add("theme.js", "theme::js/theme/initialize.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/theme/initialize.js") }}
 
 {{ asset_script("theme.js", ["min"]) }}
 
@@ -31,8 +32,8 @@
 {% for style in asset_styles("styles.css") %}
     {{ style|raw }}
 {% endfor %}
-{{ asset_style("theme::css/default/animate.css") }}
+{{ asset_style("visiosoft.theme.base::css/default/animate.css") }}
-{{ asset_add("visiosoft_default.js", "theme::js/default/*") }}
+{{ asset_add("visiosoft_default.js", "visiosoft.theme.base::js/default/*") }}
 {{ asset_script("visiosoft_default.js") }}
-{{ asset_add("visiosoft_default_custom.js", "theme::js/zcustom.js") }}
+{{ asset_add("visiosoft_default_custom.js", "visiosoft.theme.base::js/zcustom.js") }}
 {{ asset_script("visiosoft_default_custom.js") }}

addons/default/visiosoft/base-theme/resources/views/partials/footer.twig

@@ -134,7 +134,7 @@
 
 </footer>
 
-{% include "theme::partials/s-search-modal" %}
+{% include "visiosoft.theme.base::partials/s-search-modal" %}
 
 
 {% if setting('visiosoft.module.advs::google_statistic_code') != "" %}

addons/default/visiosoft/base-theme/resources/views/partials/header.twig

@@ -1,6 +1,6 @@
 {% if setting_value('visiosoft.theme.base::template') == "s" %}
-    {% include "theme::partials/nav-s" %}
+    {% include "visiosoft.theme.base::partials/nav-s" %}
 {% else %}
-    {% include "theme::partials/nav" %}
+    {% include "visiosoft.theme.base::partials/nav" %}
 {% endif %}
 

addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig

@@ -42,27 +42,27 @@
 {{ favicons(url('files/' ~ file(setting_value('visiosoft.module.advs::favicon')).path)) }}
 
 {# Base Theme Components #}
-{{ asset_add("theme.css", "theme::scss/bootstrap/bootstrap.scss") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::scss/bootstrap/bootstrap.scss") }}
-{{ asset_add("theme.css", "theme::font-awesome/css/all.css") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::font-awesome/css/all.css") }}
 
 {{ asset_add("theme.css", "visiosoft.theme.defaultadmin::css/select2.css") }}
 
 {{ asset_style("theme.css") }}
 {# Specific Build Files #}
-{{ asset_add("build.css", "theme::scss/theme/theme.scss", ["live"]) }}
+{{ asset_add("build.css", "visiosoft.theme.base::scss/theme/theme.scss", ["live"]) }}
 
 {# Specific Build Files #}
-{{ asset_add("build.css", "theme::scss/theme/theme.scss", ["live"]) }}
+{{ asset_add("build.css", "visiosoft.theme.base::scss/theme/theme.scss", ["live"]) }}
 
 {# Include Asset Collections #}
 <style type="text/css">
     {#{{ asset_inline("theme.css", ["min"]) }}#}
-    {{ asset_inline("build.css", ["parse", "min", "watch@theme::scss/theme"]) }}
+    {{ asset_inline("build.css", ["parse", "min", "watch@visiosoft.theme.base::scss/theme"]) }}
 </style>
 
-{{ asset_add("visiosoft_default.css", "theme::css/default/*") }}
+{{ asset_add("visiosoft_default.css", "visiosoft.theme.base::css/default/*") }}
 {% if setting_value('visiosoft.theme.base::template') == "s" %}
-    {{ asset_add("visiosoft_default.css", "theme::css/sahb.css") }}
+    {{ asset_add("visiosoft_default.css", "visiosoft.theme.base::css/sahb.css") }}
 {% endif %}
 
 

addons/default/visiosoft/base-theme/resources/views/partials/nav-s.twig

@@ -48,7 +48,7 @@
                                             class="caret"></span>
                                 </a>
                                 <ul class="dropdown-menu login-user-dropdown-menu">
-                                    {% include "theme::partials/links" %}
+                                    {% include "visiosoft.theme.base::partials/links" %}
                                 </ul>
                             </li>
                             {#                        {% if entries('advs').isEnabled('messages') %}#}
@@ -116,7 +116,7 @@
                         <i class="fa fa-user"></i> <span class="login-username"></span><span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu login-user-dropdown-menu">
-                        {% include "theme::partials/links" %}
+                        {% include "visiosoft.theme.base::partials/links" %}
                     </ul>
                 </li>
                 <li class="new-ads-navigation-mobile-field pull-right">

addons/default/visiosoft/base-theme/resources/views/partials/nav.twig

@@ -11,7 +11,7 @@
                     <a class="navbar-brand" href="/">
                         {% if setting_value('visiosoft.module.advs::logo') == NULL %}
                             <img class="img-responsive" alt="{{ trans(template.meta_title) }}-Logo"
-                                 src="{{ img('theme::images/logo-horizontal.png').url }}">
+                                 src="{{ img('visiosoft.theme.base::images/logo-horizontal.png').url }}">
                         {% else %}
                             <img class="img-responsive"
                                  src="{{ url('files/' ~ file(setting_value('visiosoft.module.advs::logo')).path) }}"
@@ -73,7 +73,7 @@
 
                     <ul class="nav navbar-nav controls-menu-right" style="float: right;">
                         {% set current_locale = entries('advs').getCurrentLocale() %}
-                        {{ languageSwitcher('openclassify-lang', {'toggle_title': '<img alt="'~config('app.locale')~'" src="'~img('theme::images/flags/'~config('app.locale')~'.png').url~'" class="lang-flag" >' ~current_locale~'','toggle_class':'navigation-lang-field-none'}) }}
+                        {{ languageSwitcher('openclassify-lang', {'toggle_title': '<img alt="'~config('app.locale')~'" src="'~img('visiosoft.theme.base::images/flags/'~config('app.locale')~'.png').url~'" class="lang-flag" >' ~current_locale~'','toggle_class':'navigation-lang-field-none'}) }}
 
                         {% if auth_check() %}
                             <li class="dropdown profile-navigation-field">
@@ -88,14 +88,14 @@
                                             class="caret"></span>
                                 </a>
                                 <ul class="dropdown-menu login-user-dropdown-menu">
-                                    {% include "theme::partials/links" %}
+                                    {% include "visiosoft.theme.base::partials/links" %}
                                 </ul>
                             </li>
                         {% else %}
 
                             <li class="dropdown">
                                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><b><i class="fa fa-user"></i>
-                                        {{ trans('theme::fields.login') }}</b> <span
+                                        {{ trans('visiosoft.theme.base::fields.login') }}</b> <span
                                             class="caret"></span></a>
                                 <ul id="login-dp" class="dropdown-menu">
                                     <li>
@@ -189,7 +189,7 @@
                         <i class="fa fa-user"></i> <span class="login-username"></span><span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu login-user-dropdown-menu">
-                        {% include "theme::partials/links" %}
+                        {% include "visiosoft.theme.base::partials/links" %}
                     </ul>
                 </li>
 

addons/default/visiosoft/base-theme/resources/views/passwords/forgot.twig

@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 {% block content %}
     <section id="main" class="clearfix user-page">
         <div class="container">
@@ -6,7 +6,7 @@
                 <!-- user-login -->
                 <div class="col-lg-6 col-lg-offset-3">
                     <div class="user-account">
-                        {% include "theme::partials/messages" %}
+                        {% include "visiosoft.theme.base::partials/messages" %}
                         <h2>Password Forgot</h2>
                         <!-- form -->
                         {% set form = form('forgot_password').redirect(request_get('redirect', '/')).get()  %}

addons/default/visiosoft/base-theme/resources/views/passwords/reset.twig

@@ -7,7 +7,7 @@
                 <!-- user-login -->
                 <div class="col-lg-6 col-lg-offset-3">
                     <div class="user-account">
-                        {% include "theme::partials/messages" %}
+                        {% include "visiosoft.theme.base::partials/messages" %}
                         <h2>Password Reset</h2>
                         <!-- form -->
                         {% set form = form('reset_password').get()  %}

addons/default/visiosoft/base-theme/resources/views/register.twig

@@ -1,4 +1,4 @@
-{% extends "theme::layouts/default" %}
+{% extends "visiosoft.theme.base::layouts/default" %}
 {% block content %}
     <section id="main" class="clearfix user-page">
         <div class="container">
@@ -6,7 +6,7 @@
                 <!-- user-login -->
                 <div class="col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
                     <div class="user-account">
-                        {% include "theme::partials/messages" %}
+                        {% include "visiosoft.theme.base::partials/messages" %}
                         <h2>Create an Account</h2>
                         {% set form = form('register2').redirect(request_get('redirect', '/')).get()  %}
                             {{ form.open()|raw }}

addons/default/visiosoft/base-theme/resources/views/scroll-modal.twig

@@ -1,10 +1,10 @@
 <div id="swipeTableModal" class="modal fade" role="dialog">
     <div class="modal-dialog">
         <div class="modal-body" onclick="$('#swipeTableModal').modal('hide');">
-            <img src="{{ img('theme::images/scroll-screen.gif').url }}">
+            <img src="{{ img('visiosoft.theme.base::images/scroll-screen.gif').url }}">
-            <p>{{ trans('theme::fields.scroll-screen-for-details') }}</p>
+            <p>{{ trans('visiosoft.theme.base::fields.scroll-screen-for-details') }}</p>
-            <button>{{ trans('theme::fields.close') }}</button>
+            <button>{{ trans('visiosoft.theme.base::fields.close') }}</button>
         </div>
     </div>
 </div>
-{{ asset_add("scripts.js", "theme::js/scroll-screen.js") }}
+{{ asset_add("scripts.js", "visiosoft.theme.base::js/scroll-screen.js") }}

addons/default/visiosoft/location-module/resources/views/list/filter.twig

@@ -0,0 +1,61 @@
+{% if setting_value('visiosoft.module.location::list_page_location') %}
+    <div class="panel-default panel-faq">
+        <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-minus"></i>
+                    </span>
+                </h4>
+            </a>
+        </div>
+
+        <div id="accordion-location" class="panel-collapse collapse in">
+            <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>
+        </div>
+    </div>
+{% endif %}
+{{ asset_add("scripts.js", "visiosoft.theme.base::js/filterLocation.js") }}

addons/default/visiosoft/location-module/resources/views/new-ad/map.twig

@@ -0,0 +1,27 @@
+<div class="row form-group location-map">
+    <div class="col-sm-4">
+        <ul style="padding: 0">
+            <li class="country-data" data-content="{{ adv['country_id'] }}"
+                data-default="{{ setting_value('visiosoft.module.advs::default_country') }}"
+                class="location-field country-data">{{ form.fields.country|raw }}</li>
+            <li class="city-data" data-content="{{ adv['city'] }}"
+                data-default="{{ setting_value('visiosoft.module.advs::default_city') }}"
+                class="location-field city-data">{{ form.fields.city|raw }}</li>
+            <li class="district-data" data-content="{{ adv['district'] }}"
+                class="location-field district-data">{{ form.fields.district|raw }}</li>
+            <li class="neighborhood-data" data-content="{{ adv['neighborhood'] }}"
+                class="location-field neighborhood-data">{{ form.fields.neighborhood|raw }}</li>
+            <li class="village-data" data-content="{{ adv['village'] }}"
+                class="location-field">{{ form.fields.village|raw }}</li>
+        </ul>
+    </div>
+    <div class="col-sm-8">
+        <div id="map-canvas" style="
+                                position: relative; overflow: hidden;
+                                transform: translateZ(0px) translateZ(0px) translateZ(0px) translateZ(0px) translateZ(0px) translateZ(0px);
+                                width: 100%;
+                                height:550px;
+                                background-color: rgb(229, 227, 223);
+                            "></div>
+    </div>
+</div>