diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index 772132b42..6ae63f07f 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -26,6 +26,7 @@ return [ 'estimated_pending_time', 'default_published_time', 'default_GET', + 'add_canvas', 'thumbnail_width', 'thumbnail_height', 'picture_width', diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index ad207aba2..e24c637d5 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -108,6 +108,13 @@ return [ 'default_value' => 270, ], ], + 'add_canvas' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => true, + 'mode' => 'checkbox', + ], + ], 'thumbnail_height' => [ 'type' => 'anomaly.field_type.integer', 'config' => [ diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 6291795a9..a254559ff 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -79,6 +79,9 @@ return [ 'default_GET' => [ 'name' => 'Default Ad GET', ], + 'add_canvas' => [ + 'name' => 'Add Canvas', + ], 'thumbnail_width' => [ 'name' => 'Thumbnail Width', ], diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 60ebe0230..f751c45ca 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -317,9 +317,18 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface // Create thumbnail image $image = Image::make(file_get_contents($adv->files[0]->url())); $image->resize( - setting_value('visiosoft.module.advs::thumbnail_width'), - setting_value('visiosoft.module.advs::thumbnail_height') - ); + null, + setting_value('visiosoft.module.advs::thumbnail_height'), + function ($constraint) { + $constraint->aspectRatio(); + }); + if (setting_value('visiosoft.module.advs::add_canvas')) { + $image->resizeCanvas( + setting_value('visiosoft.module.advs::thumbnail_width'), + setting_value('visiosoft.module.advs::thumbnail_height'), + 'center', false, 'fff' + ); + } $fileName = 'tn-' . $adv->files[0]->name; $image->save(app_storage_path() . '/files-module/local/images/' . $fileName); 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 65eca8331..d01054fbf 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -278,10 +278,6 @@ class AdvsController extends PublicController $radio = $returnvalues['radio']; } - if (!empty($param['user'])) { - $user = $this->userRepository->find($param['user']); - } - Cookie::queue(Cookie::make('last_search', $this->requestHttp->getRequestUri(), 84000)); $viewType = $this->requestHttp->cookie('viewType'); @@ -302,6 +298,12 @@ class AdvsController extends PublicController $this->template->set('meta_title', $catText); } + if (!empty($param['user'])) { + $user = $this->userRepository->find($param['user']); + $this->template->set('showTitle', false); + $this->template->set('meta_title', $user->name() . ' ' . trans('visiosoft.module.advs::field.ads')); + } + $compact = compact('advs', 'countries', 'mainCats', 'subCats', 'checkboxes', 'request', 'param', 'user', 'featured_advs', 'viewType', 'topfields', 'selectDropdown', 'selectRange', 'selectImage', 'ranges', 'seenList', 'searchedCountry', 'radio', 'categoryId', 'cityId', 'allCats', 'catText'); @@ -400,7 +402,11 @@ class AdvsController extends PublicController $this->template->set('meta_keywords', implode(',', explode(' ', $adv->name))); $this->template->set('meta_description', strip_tags($adv->advs_desc, '')); - $this->template->set('meta_title', $adv->name . "|" . end($categories)['name']); + $this->template->set('showTitle', false); + $this->template->set( + 'meta_title', + $adv->name . " " . end($categories)['name'] . ' ' . setting_value('streams::domain') + ); if (substr($adv->cover_photo, 0, 4) === "http") { $coverPhoto = $adv->cover_photo; } else { 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 daf89d630..76d07b450 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig @@ -1,15 +1,15 @@ + + + + - + {% include "visiosoft.theme.base::partials/metadata" %} diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig index 7ac84f568..e4cb45c72 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig @@ -1,15 +1,15 @@ + + + + - + {% include "visiosoft.theme.base::partials/metadata" %} diff --git a/addons/default/visiosoft/base-theme/resources/views/notifications/email.twig b/addons/default/visiosoft/base-theme/resources/views/notifications/email.twig index e296b1b31..e65663688 100644 --- a/addons/default/visiosoft/base-theme/resources/views/notifications/email.twig +++ b/addons/default/visiosoft/base-theme/resources/views/notifications/email.twig @@ -9,7 +9,7 @@ {{ title ?: setting_value('streams::name','Visiosoft LTD.') }} - {# Include Scripts Loaded From Outside #} - -