From d0469cea06a4efa43dff724f272d997cebf78577 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 14 Feb 2020 13:03:18 +0300 Subject: [PATCH 01/22] fixed image rotate --- .../src/Http/Controller/UploadController.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index e43933d25..59c0dd8a5 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -61,8 +61,8 @@ class UploadController extends AdminController $position = $settings->value('visiosoft.module.advs::watermark_position'); $img = WaterMark::make($this->request->file('upload')->getRealPath()) - ->resize( null,600) - ->resizeCanvas(800, 600, 'center', false, 'fff'); + ->resize(null, 600) + ->resizeCanvas(800, 600, 'center', false, 'fff'); if ($watermarktype == 'image') { $watermarkimage_id = $settings->value('visiosoft.module.advs::watermark_image'); @@ -123,9 +123,8 @@ class UploadController extends AdminController $isImageUser = FilesFilesEntryModel::query()->where('created_by_id', Auth::id()) ->where('name', $filename)->first(); if ($isImageUser != null) { - $image->make(Storage::path('images/' . $filename)) - ->rotate(90) - ->publish('app/default/files-module/local/images/' . $filename); + WaterMark::make(Storage::path('images/' . $filename))->rotate(90) + ->save(app_storage_path() . '/files-module/local/images/' . $filename); return response()->json(['status' => 'success']); } return response()->json(['status' => 'error']); From 701a884c358884391d274aac19aaf42c5090e53b Mon Sep 17 00:00:00 2001 From: alp Date: Fri, 14 Feb 2020 14:28:44 +0300 Subject: [PATCH 02/22] photo upload optimizations --- .../advs-module/resources/config/settings/sections.php | 1 - .../advs-module/resources/config/settings/settings.php | 8 -------- .../visiosoft/advs-module/resources/lang/ar/setting.php | 3 --- .../visiosoft/advs-module/resources/lang/de/setting.php | 4 ---- .../visiosoft/advs-module/resources/lang/el/setting.php | 4 ---- .../visiosoft/advs-module/resources/lang/en/setting.php | 3 --- .../visiosoft/advs-module/resources/lang/tr/setting.php | 3 --- .../src/Http/Controller/UploadController.php | 3 +-- 8 files changed, 1 insertion(+), 28 deletions(-) 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 c17e61fe5..fe5ceee54 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -26,7 +26,6 @@ return [ 'watermark_text', 'watermark_image', 'watermark_position', - 'watermark_opacity', 'listing_page_image', ], ], 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 1f8d6f748..06ea54889 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -126,14 +126,6 @@ return [ 'default_value' => 'top-right', ] ], - 'watermark_opacity' => [ - 'type' => 'anomaly.field_type.text', - 'bind' => 'adv.watermark_opacity', - 'env' => 'ADV_WATERMARK_OPACITY', - 'config' => [ - 'default_value' => '80', - ], - ], 'listing_page_image' => [ 'type' => 'anomaly.field_type.file', diff --git a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php index d5389800a..2251ad9e1 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/ar/setting.php @@ -98,9 +98,6 @@ return [ 'watermark_position' => [ 'name' => 'موقف العلامة المائية', ], - 'watermark_opacity' => [ - 'name' => 'عتامة العلامة المائية', - ], 'listing_page_image' => [ 'name' => 'سرد صورة الصفحة', ], diff --git a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php index b35c974e2..c00c03205 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/de/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/de/setting.php @@ -115,10 +115,6 @@ "watermark_position" => [ "name" =>"Wasserzeichen Position", - ], - "watermark_opacity" => [ - "name" =>"Wasserzeichen Deckkraft", - ], "listing_page_image" => [ "name" =>"Listing Page Image", diff --git a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php index 35ea00eb8..e3fa5d466 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/el/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/el/setting.php @@ -115,10 +115,6 @@ "watermark_position" => [ "name" =>"Θέση υδατοσήματος", - ], - "watermark_opacity" => [ - "name" =>"Αδιαφάνεια του υδατογραφήματος", - ], "listing_page_image" => [ "name" =>"Λίστα εικόνων σελίδας", 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 18a089366..2fff9dccd 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Watermark Position', ], - 'watermark_opacity' => [ - 'name' => 'Watermark Opacity', - ], 'listing_page_image' => [ 'name' => 'Listing Page Image', ], diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index 2dec0752a..5450ac6ce 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Filigran Konumu', ], - 'watermark_opacity' => [ - 'name' => 'Filigran Opaklığı', - ], 'listing_page_image' => [ 'name' => 'Sayfa Resmi Listeleme', ], diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index e43933d25..267859677 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -69,8 +69,7 @@ class UploadController extends AdminController $watermarkimage = $files->find($watermarkimage_id); $w = $img->width(); if ($watermarkimage != null) { - $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()) - ->opacity($settings->value('visiosoft.module.advs::watermark_opacity')); + $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); $img->insert($watermark, $position); } From 44d61fc2ac2e03a7a831ee8eb7672dde4a89e617 Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Fri, 14 Feb 2020 14:52:13 +0300 Subject: [PATCH 03/22] New translations setting.php (Turkish) --- .../visiosoft/advs-module/resources/lang/tr/setting.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index 2dec0752a..5450ac6ce 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Filigran Konumu', ], - 'watermark_opacity' => [ - 'name' => 'Filigran Opaklığı', - ], 'listing_page_image' => [ 'name' => 'Sayfa Resmi Listeleme', ], From 0d651ea8280bf27d7ef165c8e280b0a385e96ea9 Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Fri, 14 Feb 2020 14:52:14 +0300 Subject: [PATCH 04/22] New translations setting.php (Albanian) --- .../visiosoft/advs-module/resources/lang/sq/setting.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php index 3ecdbbd73..1024c72d8 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/sq/setting.php @@ -95,9 +95,6 @@ return [ 'watermark_position' => [ 'name' => 'Pozicioni i Filigranit', ], - 'watermark_opacity' => [ - 'name' => 'Hapësira e Filigranit', - ], 'listing_page_image' => [ 'name' => 'Lista e figurës së faqes', ], From f97a2f48373235d70cc7a9db2c0a2209c67a1d45 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 14 Feb 2020 16:40:20 +0300 Subject: [PATCH 05/22] remove old function --- .../advs-module/src/Adv/AdvRepository.php | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 72a29e2a8..324072197 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -142,7 +142,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface } if ($this->model->is_enabled('customfields')) { - $query = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->filterSearch($customParameters, $query); + $query = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->filterSearch($customParameters, $param, $query); } @@ -160,29 +160,6 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $query = $query->whereRaw($column); } - foreach ($param as $para => $value) { - if (substr($para, 4, 3) === "cf_") { - $id = substr($para, 7); - $minmax = substr($para, 0, 3); - if ($minmax == 'min') { - - $num = $param[$minmax . '_cf_' . $id]; - $int = (int)$num; - $column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') >= '" . $int . "'"; - $query = $query->whereRaw($column); - - } - if ($minmax == 'max') { - - $num = $param[$minmax . '_cf_' . $id]; - $int = (int)$num; - $column = "JSON_EXTRACT(cf_json, '$.cf" . $id . "') <= '" . $int . "'"; - $query = $query->whereRaw($column); - - } - } - } - // //UPDATE `default_advs_advs` SET `coor` = (PointFromText('POINT(41.085022 28.804754)')) WHERE `default_advs_advs`.`id` = 8 // //SELECT * FROM `default_advs_advs` WHERE ST_DISTANCE(ST_GeomFromText('POINT(41.0709052 28.829627)'), coor) < 20 From 25e1630b3079ca156498a7ab83f5ed68f52827fd Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 14 Feb 2020 17:13:15 +0300 Subject: [PATCH 06/22] fixed sort by --- .../advs-module/src/Adv/AdvRepository.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 324072197..7e5532cc1 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -176,10 +176,10 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface if (!empty($param['sort_by'])) { switch ($param['sort_by']) { case "sort_price_up": - $query = $query->orderBy('price', 'desc'); + $query = $query->orderBy('advs_advs.price', 'desc'); break; case "sort_price_down": - $query = $query->orderBy('price', 'asc'); + $query = $query->orderBy('advs_advs.price', 'asc'); break; case "sort_time": $query = $query->orderBy('advs_advs.created_at', 'desc'); @@ -187,12 +187,12 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface } } else { $query = $query->orderBy('advs_advs.created_at', 'desc'); - if ($isActiveDopings) { - $query = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->querySelect($query, $param); - } else { - $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name', - 'advs_advs_translations.advs_desc as advs_desc'); - } + } + if ($isActiveDopings) { + $query = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->querySelect($query, $param); + } else { + $query = $query->select('advs_advs.*', 'advs_advs_translations.name as name', + 'advs_advs_translations.advs_desc as advs_desc'); } if ($type == "list") { From 10be99e09b070cc1f190eed6733761771fe551a9 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 14 Feb 2020 17:37:02 +0300 Subject: [PATCH 07/22] sort by not working if there is no parameters --- addons/default/visiosoft/advs-module/resources/js/list.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js index 5874b8f47..c0d926667 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list.js +++ b/addons/default/visiosoft/advs-module/resources/js/list.js @@ -31,20 +31,20 @@ $('.sort-by-item').on('click', function () { } else if (searchParams.has('sort_by')) { var parameters = ""; if (value != 'all') { - parameters = "&sort_by=" + value; + parameters = "sort_by=" + value; } - goURL = location.href.replace("&sort_by=" + sort_by, parameters); + goURL = location.href.replace("sort_by=" + sort_by, parameters); } else { goURL = url + "&sort_by=" + value; } window.location.replace(goURL); -}) +}); $('.ad-info-right-bar-video').on('click', function () { $(".video-ad-tooltip-" + $(this).attr('data-id'))[0].play(); $(".video-ad-tooltip-" + $(this).attr('data-id'))[0].controls = false; -}) +}); $(document).ready(function () { From 2ea07e95a39c2bd6918f0a3e42a21ad571b13d53 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 14 Feb 2020 19:01:29 +0300 Subject: [PATCH 08/22] profile address edit fixed --- .../src/Http/Controller/MyProfileController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php index bdb1f577e..38c734670 100644 --- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php +++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php @@ -188,7 +188,7 @@ class MyProfileController extends PublicController $message = []; $message[] = trans('visiosoft.module.profile::message.adress_success_update'); - return redirect('/profile')->with('success', $message); + return redirect(route('profile::address'))->with('success', $message); } } @@ -208,7 +208,7 @@ class MyProfileController extends PublicController $message = []; $message[] = trans('visiosoft.module.profile::message.adress_success_create'); - return redirect('/profile/adress')->with('success', $message); + return redirect(route('profile::address'))->with('success', $message); } $country = CountryModel::all(); return $this->view->make('visiosoft.module.profile::address/create', compact('country')); From fd9bbe20adaecf314f79404942bfc33e6dd51911 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 17 Feb 2020 09:38:38 +0300 Subject: [PATCH 09/22] fixed password update --- .../src/Profile/Password/PasswordFormHandler.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php index 61d0c7161..0f9bdba2c 100644 --- a/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php +++ b/addons/default/visiosoft/profile-module/src/Profile/Password/PasswordFormHandler.php @@ -1,6 +1,7 @@ back(); } - $userModel->find(Auth::id()) - ->update([ - 'password' => Hash::make($builder->getPostValue('new_password')) - ]); + $user = User::query()->find(Auth::id()); + $user->setAttribute('password', $builder->getPostValue('new_password')); + $user->save($user->toArray()); $messages->success(trans('visiosoft.module.profile::message.your_password_changed')); } } From 0621b4c03bd5b63bd4e1190931bf2bd90298a124 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 17 Feb 2020 10:40:58 +0300 Subject: [PATCH 10/22] main photo show icon && remove list-style for new ad location --- .../visiosoft/location-module/resources/views/new-ad/map.twig | 2 +- .../media-field_type/resources/views/table/partials/body.twig | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig index d7df722f9..d0a74f565 100644 --- a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig +++ b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig @@ -1,7 +1,7 @@ {% if setting_value('visiosoft.module.location::create_ad_page_location') %}
-
    +
    • {{ form.fields.country|raw }}
      • diff --git a/addons/default/visiosoft/media-field_type/resources/views/table/partials/body.twig b/addons/default/visiosoft/media-field_type/resources/views/table/partials/body.twig index 28e133dee..6a6e645a1 100644 --- a/addons/default/visiosoft/media-field_type/resources/views/table/partials/body.twig +++ b/addons/default/visiosoft/media-field_type/resources/views/table/partials/body.twig @@ -11,6 +11,9 @@
      {{ buttons(row.buttons)|raw }}
      + {% if loop.index == 1 %} +
      + {% endif %}
{% endfor %} From fa60a436722b1c716c433e1e9cfd4b37941cd0fd Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 17 Feb 2020 12:18:53 +0300 Subject: [PATCH 11/22] #873 add addBlock params && move old function --- .../advs-module/resources/views/list/list.twig | 2 +- .../advs-module/src/Http/Controller/advsController.php | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig index 4bf5abd23..4b3b36139 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -27,7 +27,7 @@ {% include "visiosoft.module.advs::list/partials/display-mode" %} - {{ addBlock('ads-list/row',{'topfields':topfields})|raw }} + {{ addBlock('ads-list/row',{'topfields':topfields,'advs':advs})|raw }}
{% block listContent %} {% include "visiosoft.module.advs::list/partials/ads" %} 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 cf6c6e023..05213b1b3 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -214,14 +214,8 @@ class AdvsController extends PublicController $advs = $this->adv_repository->addAttributes($advs); - if ($isActiveDopings) { - $dopingModel = new DopingModel(); - $featured_advs = $dopingModel->filterAdvs(2, $advs); - - foreach ($featured_advs as $index => $ad) { - $featured_advs[$index]->detail_url = $this->adv_model->getAdvDetailLinkByModel($ad, 'list'); - $featured_advs[$index] = $this->adv_model->AddAdsDefaultCoverImage($ad); - } + if ($isActiveDopings and $param != null) { + $featured_advs = app('Visiosoft\DopingsModule\Http\Controller\DopingsController')->listFeatures($advs); } foreach ($advs as $index => $ad) { From f3ffde23ec37ffb0512026978fe71692d74cc27c Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 17 Feb 2020 14:04:46 +0300 Subject: [PATCH 12/22] remove static version for file-field_type --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0b6f07234..e1a21b042 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "anomaly/tags-field_type": "~2.4.0", "anomaly/slug-field_type": "~2.1.0", "anomaly/text-field_type": "~2.2.0", - "anomaly/file-field_type": "2.2.32", + "anomaly/file-field_type": "~2.2.0", "anomaly/url-field_type": "~2.2.0", "anomaly/configuration-module": "~2.1.0", "anomaly/preferences-module": "~2.2.0", From d10ae5b6e60ea3e0f6032d7b69b33f5b18bd4a04 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 17 Feb 2020 17:34:54 +0300 Subject: [PATCH 13/22] #895 Login page --- .../base-theme/resources/css/login.css | 133 ++++++++++++++++++ .../resources/images/qr_logo_for_login.png | Bin 0 -> 1721 bytes .../addons/anomaly/users-module/login.twig | 30 ++-- 3 files changed, 153 insertions(+), 10 deletions(-) create mode 100644 addons/default/visiosoft/base-theme/resources/images/qr_logo_for_login.png diff --git a/addons/default/visiosoft/base-theme/resources/css/login.css b/addons/default/visiosoft/base-theme/resources/css/login.css index 46a28aa04..8cb27ea0d 100644 --- a/addons/default/visiosoft/base-theme/resources/css/login.css +++ b/addons/default/visiosoft/base-theme/resources/css/login.css @@ -7,4 +7,137 @@ .register-section button, .register-section a { font-size: 16px; +} + + +.login_subject { + color: #333; + font-weight: bold; + font-size: 18px; +} + +.login-section label { + font-size: 13px; +} + +.forgot_password { + display: inline-block; + float: right; + color: #868f94; +} +.forgot_password:hover { + text-decoration: underline; +} + +.login-section button { + padding: 9px 22px; + margin-bottom: 0; + font-family: 'Lucida Grande','LucidaGrande',Arial,sans-serif; + font-weight: bold; + text-align: center; + vertical-align: middle; + cursor: pointer; + border-radius: 2px; + color: #fff; + background-repeat: repeat-x; + background-image: -moz-linear-gradient(top,#6198d3,#437db9); + background-image: -ms-linear-gradient(top,#6198d3,#437db9); + background-image: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#6198d3),color-stop(100%,#437db9)); + background-image: -webkit-linear-gradient(top,#6198d3,#437db9); + background-image: -o-linear-gradient(top,#6198d3,#437db9); + background-image: linear-gradient(top,#6198d3,#437db9); + line-height: 1.3em; + outline: 0; + background: #489ae9; + box-shadow: 1px 0 2px 0 rgba(0,0,0,0.13), 0 0 4px 0 rgba(0,0,0,0.11), 0 2px 3px 0 rgba(0,0,0,0.16); + border: 0; + text-shadow: none; + height: 50px; + font-size: 16px; + width: 100%; + display: block; +} +.login-section button:hover { + color: #fff; + background: #4594de; + text-decoration: none; +} + +.remember_me { + padding: 12px 0 0 5px; + display: inline-block; + color: #36454d; + font-size: 13px; +} + +.remember_me input { + margin: 0; + vertical-align: 1px; + font: 12px "Lucida Grande","LucidaGrande",Arial,sans-serif; +} + +.register-section h3 { + font-size: 18px; + margin: 0 0 43px 0; + padding-left: 0; + padding-right: 0; + width: 100%; + color: #333; + font-weight: bold; +} + +.register-section p { + color: #36454d; + margin-bottom: 20px; + font-size: 13px; +} + +.register-section a { + background: #fafafa; + box-shadow: 1px 0 2px 0 rgba(0,0,0,0.13), 0 0 4px 0 rgba(0,0,0,0.11), 0 2px 3px 0 rgba(0,0,0,0.16); + border-radius: 2px; + border: 0; + font-weight: bold; + height: 50px; + font-size: 16px; + text-shadow: 0 2px 11px #fff; + display: block; + width: 100%; + padding: 15px 22px; + color: #489ae8; +} + +.register-section a:hover { + background: #fafafa; + color: #489ae8; +} + +.qr-login-trigger { + display: block; + background: #fff url("{{ img('visiosoft.theme.base::images/qr_logo_for_login.png').url }}") center no-repeat; + background-size: 60px 60px; + width: 60px; + height: 60px; + padding: 10px; + right: 5px; + top: 5px; + position: absolute; + z-index: 10; +} + +@media only screen and (min-width: 470px) { + .login-section { + padding: 70px 78px 148px 77px; + } + + .register-section { + padding-top: 143px; + padding-left: 80px; + padding-right: 85px; + background-color: #fff; + } +} + +#header { + display: none; } \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/images/qr_logo_for_login.png b/addons/default/visiosoft/base-theme/resources/images/qr_logo_for_login.png new file mode 100644 index 0000000000000000000000000000000000000000..6045bb327eb2da1470030b2094cdc09f55082a84 GIT binary patch literal 1721 zcmX9;4LFnQ8-LLU)=160?u_G4GtjtfX|tknYOkzkX0&`SS$v`!oq?~CbP7({I?5g z5FQ>LUS3`S0Rf<%o105dPX`&qg$ozv=jW@cs+3BlL?Y?#?tb;^Rb5@(%a<>)SgfO? zBbWhOKo>+(QqmW!e*zFiM@NIKr>7SmAD@?(H~UY3`K6^LfN5uE2b2^S7fYp5fj|%( z9E?Vz?d|Qs?#9MO9*>uuosGlcfXJMjoQjGH0)YTpMMXt1F)>6U@y?w)1qB6{E?sJ9 zXaFn#8&J?_w63l$P?(yUf)&6rGBN^i!otD;7f=q+6bc2H2l^Km7v*v}&;!Om*TlpG z*mQDos;;hfc6QFn$^v=-6oAQ0Bp*3;9|!0+VbBmf7bB_$7@4@V>sjty{MWg+kzH$BrEg27^Q*`T6+`3=AYEC)?WE=H})G z1_n+{OmuW~08>}4TuDq!6p2K9KEJlMwx*_rLZSHh_~7yQN8Nij0Rxd~#A77rqxKqn z%L>{`v#MU0nv!(iCi?pwad9xw|NLq7t$IoIYW(r&V8`{U(n~BBBZ(dx5%et@wRz zp&GILZ@3WnrUzhA`VXRPmkl=TGaQUl9@~XhzAzI8;Wcg7N&^>9FV@<5DF-f>-YP`6 z^M(?%$B!4m5$@DbZQMpQ^tq;x1^7be&YJ9P)Jjz&P<8uV`p+-pJ`_w6y_g z-x&-3WAWz;^X7n?JVx5 zEA}A!%d;APN{vjpX}EUdNk}=S>0%kFN0~wCSd#aaLCrL?QT<*Ntba0hxWV6@^)B%j zjUDddz3dMgx}q)bPMaZd)LDPo?5TB<+vZr;$e#9#Td47F4j@KLz!EJ^-M z$@LZlQrgFcxP*h}YZBn@=e>XXXi!m$&swpC%WxHcrsrVyMuqnnBvp=MAHHFf{~3J) z+hBrRMGXnCovM&|PB*j*Fip|UzTX|;IEdTFOfpF~g z&UAEL%KoS(ck}Eo2nal7dU8W?`XN)?L zmO2P(1oQ{e61FckYcs{lYQ-gy;(KyczLs$4vmTcnQ?`7Dsal@h;E(^W#pt|)J*>A< z7Scc3)rS_pr6%q|L-TJ+#>V^}#H-o7R$-=ku9JscmFKO?H}tr9NZEd6r*Kh08|&>+ zzK%6?mt8Yx5()|oK>4Skk?es4(O zJ$2RXZ)+yv>#hi|&n?qu|LTc6Hu;?S{Z|k*1`jTU&wo2hY%JisBR9pG|JHsoi+U|N zy9-tucUoUHq>Wwg7GoDy3~wV@$MNzb ztK$41(Fyb}9F?YJt|>GA!iaCyiCxicpWF{`#~8k=^R_-mV|Mnq*8kdnzChH6^405A z)YD)Hs`P;P79ArNK-|r{sn4Y0j2{@msS~{us(aC+<+Hc){C|EQpx0~utC($9gdM)| zSS3Y4RJ8&n796USm)kUE4n>Teh;#Ef+x?lz8FTsT_qO(0d>o+tH@7R11ot9$+^ z>)6(Pu0BE6*?x_-eQ@E?_T+uT#mS)<|9;Hjd(u!&=Go`o4hyO#T2f_@#KYOmC#NB; q4&E;qIhDWHNq0jd+xYyHE`uoR+V7R>+7IB51rdCXdAE2`e)t>jqi0$G literal 0 HcmV?d00001 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 index 75183bcb9..ea984f7eb 100644 --- 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 @@ -1,10 +1,20 @@ {% extends "theme::layouts/default" %} {% block content %} + {% set logo_web = file(setting_value('visiosoft.theme.sahibinden::logo_web')).url %} + {% if logo_web is null %} + {% set logo_web = img('visiosoft.theme.sahibinden::images/logo_web.png').url %} + {% endif %} +
+ + +
-
+