From 9b9d8e1319023d25012dcbe40649ab12b47022dc Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 12 Sep 2019 17:42:34 +0300 Subject: [PATCH 1/5] description multi language --- ...iosoft.module.advs__create_advs_stream.php | 4 +- .../advs-module/resources/js/new-create.js | 92 ++++++++++++++++++- .../resources/views/advs/new-create.twig | 2 +- .../src/Http/Controller/advsController.php | 13 ++- .../resources/config/settings.php | 5 - 5 files changed, 105 insertions(+), 11 deletions(-) diff --git a/addons/default/visiosoft/advs-module/migrations/2018_09_25_211039_visiosoft.module.advs__create_advs_stream.php b/addons/default/visiosoft/advs-module/migrations/2018_09_25_211039_visiosoft.module.advs__create_advs_stream.php index 77c2ed644..96ef7cf30 100644 --- a/addons/default/visiosoft/advs-module/migrations/2018_09_25_211039_visiosoft.module.advs__create_advs_stream.php +++ b/addons/default/visiosoft/advs-module/migrations/2018_09_25_211039_visiosoft.module.advs__create_advs_stream.php @@ -32,7 +32,9 @@ class VisiosoftModuleAdvsCreateAdvsStream extends Migration 'slug' => [ 'required' => true, ], - 'advs_desc', + 'advs_desc' => [ + 'translatable' => true, + ], 'cat1', 'cat2', 'cat3', diff --git a/addons/default/visiosoft/advs-module/resources/js/new-create.js b/addons/default/visiosoft/advs-module/resources/js/new-create.js index e85dae5e0..b94edf40f 100644 --- a/addons/default/visiosoft/advs-module/resources/js/new-create.js +++ b/addons/default/visiosoft/advs-module/resources/js/new-create.js @@ -62,4 +62,94 @@ $('input[name="price"]').on('click', function () { { $(this).val(""); } -}) \ No newline at end of file +}) + +$(document).on('ajaxComplete ready shown.bs.tab', function () { + + // Initialize WYSIWYG editors. + $('textarea[data-field="advs_desc"]:not(.hasEditor)').each(function () { + + /** + * Gather available buttons / plugins. + */ + let textarea = $(this); + + let buttons = textarea.data('available_buttons'); + let plugins = textarea.data('available_plugins'); + + textarea.addClass('hasEditor'); + + textarea.redactor({ + + element: $(this), + + /** + * Initialize the editor icons. + */ + callbacks: { + init: function () { + + let icons = {}; + + $.each(buttons, function (k, v) { + if (v.icon) { + icons[v.button ? v.button : k] = ''; + } + }); + + $.each(plugins, function (k, v) { + if (v.icon) { + icons[v.button ? v.button : k] = ''; + } + }); + + $.each(this.button.all(), $.proxy(function (i, s) { + + let key = $(s).attr('rel'); + + if (typeof icons[key] !== 'undefined') { + let icon = icons[key]; + let button = this.button.get(key); + this.button.setIcon(button, icon); + } + + }, this)); + } + }, + + /** + * Settings + */ + script: false, + structure: true, + linkTooltip: true, + cleanOnPaste: true, + toolbarFixed: false, + imagePosition: true, + imageResizable: true, + breakline: Boolean(textarea.data('breakline')), + removeNewLines: Boolean(textarea.data('remove_new_lines')), + imageFloatMargin: '20px', + removeEmpty: ['strong', 'em', 'p'], + + /** + * Features + */ + minHeight: textarea.data('height'), + placeholder: textarea.attr('placeholder'), + folders: textarea.data('folders').toString().split(','), + buttons: textarea.data('buttons').toString().split(','), + plugins: textarea.data('plugins').toString().split(',') + }); + + textarea.closest('form').on('submit', function () { + textarea.val(textarea.redactor('code.get')); + }); + + if (textarea.is('[readonly]') || textarea.is('[disabled]')) { + textarea.redactor('button.disableAll'); + textarea.redactor('core.editor') + .attr('contenteditable', false); + } + }); +}); diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/advs/new-create.twig index 7ce5e13de..dea8f5a43 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/new-create.twig @@ -105,7 +105,7 @@
- {{ form.fields.advs_desc.input|raw }} + {{ descField|raw }}
{{ form.fields.files.input |raw }} diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 1fe9c3848..7c22d58de 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -557,13 +557,20 @@ class AdvsController extends PublicController AdvModel $advModel ) { - $nameField = HTMLDomParser::str_get_html($advFormBuilder->render($id)->getContent()); - $nameField = $nameField->find('.name', 0); + $Field = HTMLDomParser::str_get_html($advFormBuilder->render($id)->getContent()); + $nameField = $Field->find('.name', 0); if ($nameField !== null) { $nameField = $nameField->innertext(); } else { $nameField = ""; } + + $descField = $Field->find('.advs_desc', 0); + if ($descField !== null) { + $descField = $descField->innertext(); + } else { + $nameField = ""; + } if (!Auth::user()) { redirect('/login?redirect=' . url()->current())->send(); } @@ -607,7 +614,7 @@ class AdvsController extends PublicController $custom_fields = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->edit($adv, $categories, $cats); } - return $this->view->make('visiosoft.module.advs::advs/new-create', compact('id', 'cats_d', 'request', 'Cloudinary', 'cities', 'adv', 'custom_fields', 'nameField')); + return $this->view->make('visiosoft.module.advs::advs/new-create', compact('id', 'cats_d', 'request', 'Cloudinary', 'cities', 'adv', 'custom_fields', 'nameField','descField')); } public function destroy($id) diff --git a/addons/default/visiosoft/location-module/resources/config/settings.php b/addons/default/visiosoft/location-module/resources/config/settings.php index 2977763f5..4a153a68c 100644 --- a/addons/default/visiosoft/location-module/resources/config/settings.php +++ b/addons/default/visiosoft/location-module/resources/config/settings.php @@ -1,10 +1,5 @@ [ 'type' => 'anomaly.field_type.boolean', From 18117469ade88e477a80f4b8a9fc075417e59ebc Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 13 Sep 2019 11:36:19 +0300 Subject: [PATCH 2/5] repair template --- .../resources/views/advs/list-item.twig | 17 ++++++---- .../resources/views/advs/list.twig | 9 +++-- .../resources/views/indexes/index.twig | 34 ++++++++++++------- .../resources/views/partials/footer.twig | 3 +- 4 files changed, 42 insertions(+), 21 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig index 32abe6815..70d70d16f 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig @@ -3,7 +3,7 @@ {% block ogdata %} - + @@ -134,8 +134,11 @@
{{ adv.created_at|date('d/m/Y') }} - {{ adv.city_name }} + + {% if setting_value('visiosoft.module.location::detail_page_location') %} + {{ adv.city_name }} , {{ adv.country_name }} + {% endif %} {% if adv.isCorporate == 2 %} {{ adv.owner }} @@ -278,7 +281,7 @@ {% include "visiosoft.module.customfields::list-item" %} {% endif %} {% endif %} - {% if adv.map_Val != "" %} + {% if adv.map_Val != "" and setting_value('visiosoft.module.location::detail_page_location') %}
{% if entries('advs').isEnabled('streetview') %} @@ -334,9 +337,11 @@
- + {% if setting_value('visiosoft.module.location::detail_page_location') %} + + {% endif %}
diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig index f40427d14..df29c234d 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig @@ -60,6 +60,7 @@