From 7f81e9e600b0e872ac5343a484c45cb458bd4a30 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 1 Jan 2020 16:07:44 +0300 Subject: [PATCH 1/3] #605 --- .../advs-module/resources/views/list/partials/ads.twig | 8 +++++--- .../visiosoft/advs-module/resources/views/list/table.twig | 8 +++++--- .../base-theme/resources/views/index/default.twig | 2 ++ .../location-module/resources/config/settings.php | 6 ------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig index 107b59d93..299f9f869 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig @@ -21,9 +21,11 @@
{{ adv.price.currency }}
-
- {{ adv.city_name }} {{ adv.country_name }} -
+ {% if setting_value('visiosoft.module.location::list_page_location') %} +
+ {{ adv.city_name }} {{ adv.country_name }} +
+ {% endif %} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/table.twig b/addons/default/visiosoft/advs-module/resources/views/list/table.twig index 82a3e0343..8dcd90142 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/table.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/table.twig @@ -11,9 +11,11 @@ class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }} {{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }} - {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }} - / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }} + {% if setting_value('visiosoft.module.location::list_page_location') %} + {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }} + / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }} + {% endif %} {{ addBlock('ads-list/table-column',{'seenList':seenList})|raw }} 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 5f4ce757e..316e5601a 100644 --- a/addons/default/visiosoft/base-theme/resources/views/index/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/index/default.twig @@ -33,12 +33,14 @@

{{ latestAd.name }}

+ {% if setting_value('visiosoft.module.location::home_page_location') %}
{{ latestAd.city_name }}, {{ latestAd.country_name }}
+ {% endif %}
diff --git a/addons/default/visiosoft/location-module/resources/config/settings.php b/addons/default/visiosoft/location-module/resources/config/settings.php index e324dc088..4a153a68c 100644 --- a/addons/default/visiosoft/location-module/resources/config/settings.php +++ b/addons/default/visiosoft/location-module/resources/config/settings.php @@ -19,10 +19,4 @@ return [ 'default_value' => true, ], ], - 'show_search_location_btn' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => true, - ], - ], ]; From 25f1be5a1617ff51d66430e454b60af48fd65bc7 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 1 Jan 2020 17:49:15 +0300 Subject: [PATCH 2/3] #640 --- .../addons/anomaly/users-module/login.twig | 47 +++++++++++++++++++ .../addons/anomaly/users-module/register.twig | 45 ++++++++++++++++++ 2 files changed, 92 insertions(+) create mode 100644 addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig create mode 100644 addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig new file mode 100644 index 000000000..edfbeb15c --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig @@ -0,0 +1,47 @@ +{% extends "theme::layouts/default" %} + +{% block content %} +
+
+ {% set form = form('login').redirect(request_get('redirect', '/')) + .actions( + {'submit': + {'type':'primary', + 'text':' '~trans('anomaly.module.users::button.login'), + 'class':'w-100 py-2' + } + }).get() %} + {{ form_open({ + 'class': 'row form ' ~ form.options.class , + 'enctype': 'multipart/form-data', + 'url': 'advs/save_adv', + })|raw }} +
+ {{ form.fields.email|raw }} +
+
+ {{ form.fields.password|raw }} +
+
+ +
+ +
+
+{% endblock %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig new file mode 100644 index 000000000..40d3dde02 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig @@ -0,0 +1,45 @@ +{% extends "theme::layouts/default" %} + +{% block content %} +
+
+ {% set form = form('register').redirect(request_get('redirect', '/')) + .actions( + {'submit': + {'type':'success', + 'text':' '~trans('anomaly.module.users::button.register'), + 'class':'w-100 py-2' + } + }).get() %} + {{ form_open({ + 'class': 'row form ' ~ form.options.class , + 'enctype': 'multipart/form-data', + 'url': 'advs/save_adv', + })|raw }} +
+ {{ form.fields.display_name|raw }} +
+
+ {{ form.fields.username|raw }} +
+
+ {{ form.fields.email|raw }} +
+
+ {{ form.fields.password|raw }} +
+
+
+ {{ form.actions|raw }} +
+ + +
+
+
+{% endblock %} \ No newline at end of file From 6321ef6ca93444c81e04c8bc82ee8341091bd341 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 1 Jan 2020 17:54:01 +0300 Subject: [PATCH 3/3] remove cat links when you posting ad --- .../advs-module/resources/views/new-ad/new-create.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index 4a73c5331..c67b768ee 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -6,7 +6,7 @@