diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/detail.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/detail.twig deleted file mode 100644 index c4d9469f7..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/detail.twig +++ /dev/null @@ -1,20 +0,0 @@ -{% extends "theme::layouts/default" %} -{% block ogdata %} - - {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/ogdata" %} - -{% endblock %} - -{% block content %} - - {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/breadcrumb" %} - - {% include "visiosoft.module.advs::ad-detail/partials/ad-status" %} - - {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/main" %} - - {{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/sahibinden.css") }} - {{ asset_add("scripts.js", "visiosoft.module.advs::js/viewed.js") }} - {{ asset_add("styles.css", "visiosoft.module.advs::css/detail.css") }} - {{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/detail.css") }} -{% endblock %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/main.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/main.twig deleted file mode 100644 index ddbd03b1a..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/main.twig +++ /dev/null @@ -1,165 +0,0 @@ -
-
-
-
-
-
-

- {{ adv.title }} -

-
- -
- {{ addBlock('ad-detail/title/action', {'adv_id':adv.id, 'sahibinden':true})|raw }} - - - - - - - - - -
- -
- -
-
- {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/slider" %} - -
- {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/detail" %} -
- -
-
-
-
- {{ addBlock('ad-details/user-image', {'userId': adv.created_by_id})|raw }} -
{{ adv.first_name }} {{ adv.last_name }}
-
-
-

{{ trans('visiosoft.theme.sahibinden::field.member_since.name') }} {{ user(adv.create_by_id).created_at|date('F Y') }}

- {% if profile.file.url is not null %} - - {% endif %} -
-
    -
  • - {% include 'visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/list-link' %} -
    • - {{ addBlock('ad-detail/seller/action',{'seller_id':adv.created_by_id, 'sahibinden':true})|raw }} -
-
-
- {% set user = adv.created_by %} -
    - {% if user.gsm_phone is not null %} -
  • -
    - - {{ trans('visiosoft.theme.sahibinden::field.mobile.name') }} - -
    -
    {{ user.gsm_phone }}
    -
    • - {% endif %} - - {% if user.office_phone is not empty %} -
  • -
    - - {{ trans('visiosoft.theme.sahibinden::field.office_phone.name') }} - -
    -
    {{ user.office_phone }}
    -
    • - {% endif %} - - {% if user.land_phone is not empty %} -
  • -
    - - {{ trans('visiosoft.theme.sahibinden::field.land_phone.name') }} - -
    -
    {{ user.land_phone }}
    -
    • - {% endif %} -
- {% if user.gsm_phone is not null %} -
- - {{ asset_add('scripts.js','visiosoft.theme.sahibinden::js/phoneCheck.js') }} -
- - - {% endif %} - {{ addBlock('ad-detail/contact-with', {'adv': adv, 'showTheme': false})|raw }} -
-
- {{ addBlock('ad-detail/widget', {'ad': adv, 'price': adv.price, 'id': adv.id, 'cat1': categories['cat1']})|raw }} - {{ addBlock('ad-detail/widget-details', {'adv': adv})|raw }} - {% if setting_value('visiosoft.theme.sahibinden::show_security_tips') %} -
-
- {{ trans('visiosoft.theme.sahibinden::field.security_tips.name') }} -
-

- {{ setting_value('visiosoft.theme.sahibinden::security_tips_msg') }} -

-
- {% endif %} -
-
-
- - {% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/content" %} -
-
-
-
-{% if user.gsm_phone is not null %} - -{% endif %} - -{% include "visiosoft.module.advs::ad-detail/partials/dropleft-edit" %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/breadcrumb.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/breadcrumb.twig deleted file mode 100644 index dc2086a8f..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/breadcrumb.twig +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/content.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/content.twig deleted file mode 100644 index df54baa69..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/content.twig +++ /dev/null @@ -1,76 +0,0 @@ -
-
-
- -
- - - - - - - {{ addBlock('ad-detail/content',{'features':features,'adv':adv, 'profile': profile, 'show':true})|raw }} - -
-
-
-
-{{ addBlock('ad-detail/section',{'adv':adv})|raw }} -
- {{ setting_value('visiosoft.theme.sahibinden::detail_bottom')|raw }} -
-
- {{ setting_value('visiosoft.theme.sahibinden::detail_bottom_mobile')|raw }} -
diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/detail.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/detail.twig deleted file mode 100644 index 72e0d6ff4..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/detail.twig +++ /dev/null @@ -1,58 +0,0 @@ -{% set district = getDistrict(adv.district.getObject().value) %} -{% set neighborhood = getNeighborhood(adv.neighborhood.getObject().value) %} -
-
-

- {{ adv.price.currency(null,'currency') }} - - {{ addBlock('ad-detail/details',{'adv':adv,'theme':'sahibinden'})|raw }} - - - {{ addBlock('ad-detail/priceField',{'adv':adv})|raw }} - - -

-

- {% set lastCatId = categories|last['id'] %} - {% if setting_value('visiosoft.theme.sahibinden::show_country') %} - {{ adv.country_name }} - / - {% endif %} - - {{ adv.city_name }} - - {% if district %} - / - - {{ district.name }} - - {% endif %} - {% if neighborhood %} - / - - {{ neighborhood.name }} - - {% endif %} -

-
-
- -
-
\ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/list-link.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/list-link.twig deleted file mode 100644 index e3ece0d62..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/list-link.twig +++ /dev/null @@ -1,7 +0,0 @@ -{% if addBlock('store/link') is null %} - - {{ trans('visiosoft.theme.sahibinden::field.other_ads.name') }} - -{% else %} - {{ addBlock('store/link', {'userId': adv.created_by_id})|raw }} -{% endif %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/ogdata.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/ogdata.twig deleted file mode 100644 index 37079c10f..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/ogdata.twig +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/slider.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/slider.twig deleted file mode 100644 index b4183c4c0..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/ad-detail/partials/slider.twig +++ /dev/null @@ -1,69 +0,0 @@ -
- {% if blocks('ad-item-picture-block-area') is null %} -
- - {% set advPhoto = '' %} - {% if count(adv.files) == 0 %} - {% set advPhoto = img('visiosoft.module.advs::images/no-image.png').url %} - - {% else %} - {% for image in adv.getViewPhotoUrl %} - - {% if loop.index == 1 %} - {% set advPhoto = image %} - {% endif %} - {% endfor %} - - {% endif %} -
-
-
-
- - - {{ trans('visiosoft.theme.sahibinden::field.mega_photo.name') }} - -
-
- -
-
-
- {% else %} - {{ blocks('ad-item-picture-block-area') }} - {% endif %} - {{ asset_add("styles.css", "visiosoft.module.advs::css/fotorama.css") }} -
-{% if adv.video_url %} - - {{ asset_add("scripts.js", "visiosoft.module.cloudinary::js/close-btn.js") }} -{% endif %} -{{ asset_add("scripts.js", "visiosoft.module.advs::js/fotorama.js") }} -{{ asset_add("scripts.js", "visiosoft.theme.sahibinden::js/slider.js") }} diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/list.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/list.twig deleted file mode 100644 index 2f2aef362..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/list.twig +++ /dev/null @@ -1,67 +0,0 @@ -{% extends "theme::layouts/default" %} - -{% block content %} - - - {% include "visiosoft.module.advs::list/partials/breadcrumb" %} - - -
-
- - {{ addBlock('ads-list/user-section', {'store': store})|raw }} - -
-
- {% include "visiosoft.module.advs::list/partials/list-filter" %} -
-
-
-
-
- {% include "visiosoft.module.advs::list/partials/list-sort-by" %} -
-
- {% include "visiosoft.module.advs::list/partials/display-mode" %} -
-
-
- - - {{ addBlock('ads-list/row-bottom',{'show_favorite_search':true})|raw }} -
- {{ addBlock('ads-list/row',{'topfields':topfields,'advs':advs})|raw }} -
- {% block listContent %} - {% include "visiosoft.module.advs::list/partials/ads" %} - {% endblock %} -
- {% include "visiosoft.module.advs::list/partials/pagination" %} - - {{ addBlock('ads-list/row-bottom')|raw }} - - {#
#} -
-
-
-
-
- {% include "visiosoft.module.advs::list/partials/filter-modal" %} - {% include "visiosoft.module.advs::list/partials/sort-modal" %} - - - {{ asset_add("scripts.js", "visiosoft.module.advs::js/list.js") }} - {{ asset_add("styles.css", "visiosoft.module.advs::css/list.css") }} - {{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/list.css") }} -{% endblock %} -{% block customjs %} - {{ addBlock('ads-list/list',{'adv':adv})|raw }} -{% endblock %} diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/ads.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/ads.twig deleted file mode 100644 index 4ca79aa12..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/ads.twig +++ /dev/null @@ -1,41 +0,0 @@ -{{ addBlock('ad-list/partials/ads',{'featured_advs':featured_advs})|raw }} -{% for adv in advs %} -
- -
-
- {{ adv.name }} -
-
-
-
-

{{ adv.name }}

-
-
- {{ adv.cat1_name }}, {{ adv.cat2_name }} -
-
-
-
-
-
- {{ adv.price.currency(null,'currency') }} -
- {% if setting_value('visiosoft.module.location::list_page_location') %} -
- {{ adv.city_name }} {{ adv.country_name }} -
- {% endif %} -
-
-
- -
-
-
- {{ addBlock('list/extra-actions', {'ad': adv})|raw }} -
-
-
-{% endfor %} diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/breadcrumb.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/breadcrumb.twig deleted file mode 100644 index dd628087e..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/breadcrumb.twig +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/main.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/main.twig deleted file mode 100644 index 9ccb280fa..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/main.twig +++ /dev/null @@ -1,36 +0,0 @@ - -
-
- - {% include "visiosoft.module.advs::list/partials/user-section" %} - -
-
- {% include "visiosoft.module.advs::list/partials/list-filter" %} -
-
-
- -
- -
- {% include "visiosoft.module.advs::list/partials/list-sort-by" %} -
-
- {% include "visiosoft.module.advs::list/partials/display-mode" %} -
-
- {{ addBlock('ads-list/row',{'topfields':topfields})|raw }} -
- {% block listContent %} - {% include "visiosoft.module.advs::list/partials/ads" %} - {% endblock %} -
- {% include "visiosoft.module.advs::list/partials/pagination" %} - - {#
#} -
-
-
-
-
\ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/price-filter.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/price-filter.twig deleted file mode 100644 index c21f9131f..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/list/partials/price-filter.twig +++ /dev/null @@ -1,55 +0,0 @@ -
-
-
-
-
- {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} - {% set active_currencies2 = setting_value('visiosoft.module.advs::enabled_currencies') %} - {% set selected_currency = setting_value('streams::currency') %} - {% if app.request.get('currency') %} - {% set selected_currency = app.request.get('currency') %} - {% endif %} - - {% for currency in active_currencies %} - - {% endfor %} - - -
-
- -
-
- - -
-
-
-
- -
-
- -
-
-
-
-
\ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/new-ad/preview/partials/preview-window.twig b/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/new-ad/preview/partials/preview-window.twig deleted file mode 100644 index 8ce32ccaa..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/addons/advs-module/new-ad/preview/partials/preview-window.twig +++ /dev/null @@ -1,8 +0,0 @@ - -{% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/partials/breadcrumb" %} - - -{% include "visiosoft.theme.sahibinden::addons/visiosoft/advs-module/ad-detail/main" %} - -{{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/sahibinden.css") }} -{{ asset_add("styles.css", "visiosoft.theme.sahibinden::css/detail.css") }} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/index/default.twig b/addons/default/visiosoft/base-theme/resources/views/index/default.twig index 01fc2a7b1..6e64049c5 100644 --- a/addons/default/visiosoft/base-theme/resources/views/index/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/index/default.twig @@ -1,65 +1,76 @@ -{{ addBlock('index_top')|raw }} +
-
-
- {% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %} -
-

{{ trans('theme::field.latest_ads') }}

-
-
- {{ trans('theme::field.show_all') }} -
- {% endif %} -
-
-
- {% for latestAd in latestAds() %} -
-
-
- -
- -
- + {{ addBlock('index_top')|raw }} + +
+
{% include "visiosoft.theme.base::partials/categories" %}
+
+
+ {% if setting_value('visiosoft.theme.base::latest_and_view_all_btn') %} +
+

{{ trans('theme::field.latest_ads') }}

- -
- {% if setting_value('visiosoft.theme.base::price_fields') %} -
- {{ latestAd.price }} {{ latestAd.currency }} -
- {% endif %} -
- -

{{ latestAd.name }}

- -
- {% if setting_value('visiosoft.module.location::home_page_location') %} -
- - - {{ latestAd.city_name }}, {{ latestAd.country_name }} - -
- {% endif %} - {% if setting_value('visiosoft.theme.base::date_fields') %} -
- - - {{ latestAd.created_at|date('d/m/Y') }} - -
- {% endif %} +
+ {{ trans('theme::field.show_all') }}
-
+ {% endif %} +
- {% endfor %} -
-
-
-{{ addBlock('index')|raw }} + +
+ {% for latestAd in latestAds() %} +
+
+
+ +
+ +
+ +
+ +
+ {% if setting_value('visiosoft.theme.base::price_fields') %} +
+ {{ latestAd.price }} {{ latestAd.currency }} +
+ {% endif %} +
+ +

{{ latestAd.name }}

+ +
+ {% if setting_value('visiosoft.module.location::home_page_location') %} +
+ + + {{ latestAd.city_name }}, {{ latestAd.country_name }} + +
+ {% endif %} + {% if setting_value('visiosoft.theme.base::date_fields') %} +
+ + + {{ latestAd.created_at|date('d/m/Y') }} + +
+ {% endif %} +
+
+
+ {% endfor %} +
+
+
+ + + + {{ addBlock('index')|raw }} + + +
\ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig index 7faa77ccc..076ec6afd 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig @@ -35,7 +35,6 @@ {% include "theme::partials/footer" %} -{% include "theme::partials/settings" %} {% include "theme::partials/assets" %} diff --git a/addons/default/visiosoft/base-theme/resources/views/notifications/email.twig b/addons/default/visiosoft/base-theme/resources/views/notifications/email.twig deleted file mode 100644 index e296b1b31..000000000 --- a/addons/default/visiosoft/base-theme/resources/views/notifications/email.twig +++ /dev/null @@ -1,192 +0,0 @@ - - - {% block head %} - - - - - - {{ title ?: setting_value('streams::name','Visiosoft LTD.') }} - - - - - {% endblock %} - - {% set style = { - 'body': 'margin: 0; padding: 0; width: 100%; background-color: #F2F4F6;', - 'email-wrapper': 'width: 100%; margin: 0; padding: 0; background-color: #F2F4F6;', - - 'email-masthead': 'padding: 25px 0; text-align: center;', - 'email-masthead_name': 'font-size: 16px; font-weight: bold; color: #2F3133; text-decoration: none; text-shadow: 0 1px 0 white;', - - 'email-body': 'width: 100%; margin: 0; padding: 0; border-top: 1px solid #EDEFF2; border-bottom: 1px solid #EDEFF2; background-color: #FFF;', - 'email-body_inner': 'width: auto; max-width: 570px; margin: 0 auto; padding: 0;', - 'email-body_cell': 'padding: 35px;', - - 'email-footer': 'width: auto; max-width: 570px; margin: 0 auto; padding: 0; text-align: center;', - 'email-footer_cell': 'color: #AEAEAE; padding: 35px; text-align: center;', - - 'body_action': 'width: 100%; margin: 30px auto; padding: 0; text-align: center;', - 'body_sub': 'margin-top: 25px; padding-top: 25px; border-top: 1px solid #EDEFF2;', - - 'anchor': 'color: #3869D4;', - 'header-1': 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;', - 'paragraph': 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;', - 'paragraph-sub': 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em; max-width: 570px; word-wrap: break-word;', - 'paragraph-center': 'text-align: center;', - - 'button': 'display: block; display: inline-block; width: 200px; min-height: 20px; padding: 10px; background-color: #3869D4; border-radius: 3px; color: #ffffff; font-size: 15px; line-height: 25px; text-align: center; text-decoration: none; -webkit-text-size-adjust: none;', - - 'button--green': 'background-color: #22BC66;', - 'button--red': 'background-color: #dc4d2f;', - 'button--blue': 'background-color: #3869D4;' - } %} - - {% set fontFamily = 'font-family: Arial, \'Helvetica Neue\', Helvetica, sans-serif;' %} - - - - - - -
- - - {% block logo %} - - - - - {% endblock %} - - {% block body %} - - - - - {% endblock %} - - {% block footer %} - - - - - {% endblock %} -
- - {{ title ?: setting_value('streams::name','Visiosoft LTD.') }} - -
- - - - -
- - {% block greeting %} - -

- {{ greeting ?: (level == 'error' ? 'Whoops!' : 'Hello!') }} -

- {% endblock %} - - {% block intro %} - - {% for line in introLines %} -

- {% autoescape 'js' %} - {{ line|raw }} - {% endautoescape %} -

- {% endfor %} - {% endblock %} - - {% block action %} - - {% if actionText %} - - - - -
- {% if level == 'success' %} - {% set actionColor = 'button--green' %} - {% elseif level == 'error' %} - {% set actionColor = 'button--red' %} - {% else %} - {% set actionColor = 'button--blue' %} - {% endif %} - - - {% autoescape 'js' %} - {{ actionText|raw }} - {% endautoescape %} - -
- {% endif %} - {% endblock %} - - {% block outro %} - - {% for line in outroLines %} -

- {% autoescape 'js' %} - {{ line|raw }} - {% endautoescape %} -

- {% endfor %} - {% endblock %} - - {% block salutation %} - -

- {{ salutation ?:'Regards' }},
{{ setting_value('streams::name','Visiosoft LTD.') }} -

- {% endblock %} - - {% block subcopy %} - - {% if actionText is defined %} - - - - -
-

- If you’re having trouble clicking the "{{ actionText }}" button, copy and paste the URL below into your web browser: -

- -

- - {{ actionUrl }} - -

-
- {% endif %} - {% endblock %} -
-
- - - - -
-

- © - {{ 'now'|date('Y') }} - {{ setting_value('streams::name','Visiosoft LTD.') }}. All rights reserved. -

-
-
-
- - diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig index 0c9932310..e010aa1b4 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig @@ -24,7 +24,7 @@ {{ asset_style("theme.css") }} -{% include "visiosoft.theme.base::partials/styles" %} +{#{% include "visiosoft.theme.base::partials/styles" %}#} {# Custom Theme Components #} \ No newline at end of file