From f77f853985bcf5d23d746e0c5bdd79a4afb7ab43 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 6 Oct 2020 17:36:01 +0300 Subject: [PATCH 1/3] =?UTF-8?q?#2231=20Panel=20Logo=20De=C4=9Fi=C5=9Fecek?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/css/theme.css | 4 ++++ .../resources/img/login-icon.svg | 19 +++++++++++++++++ .../resources/img/panel-icon.svg | 21 +++++++++++++++++++ .../resources/views/layouts/installer.twig | 2 +- .../resources/views/login.twig | 4 ++-- .../resources/views/partials/topbar.twig | 2 +- 6 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/img/login-icon.svg create mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/img/panel-icon.svg diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css index e3f81eb98..d4f55f0c1 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css +++ b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css @@ -223,6 +223,8 @@ height: 40px; margin-top: -9px; vertical-align: middle; + object-fit: contain; + object-position: center; } #topbar .logo svg .st0 { transition: fill 300ms 500ms; @@ -2670,6 +2672,8 @@ body { max-height: 82px; margin-top: -30px; vertical-align: middle; + object-fit: contain; + object-position: center; } #login .logo svg .st0 { fill: #ffffff; diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/img/login-icon.svg b/addons/default/visiosoft/defaultadmin-theme/resources/img/login-icon.svg new file mode 100644 index 000000000..3a42e2edb --- /dev/null +++ b/addons/default/visiosoft/defaultadmin-theme/resources/img/login-icon.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/img/panel-icon.svg b/addons/default/visiosoft/defaultadmin-theme/resources/img/panel-icon.svg new file mode 100644 index 000000000..3cf852ea4 --- /dev/null +++ b/addons/default/visiosoft/defaultadmin-theme/resources/img/panel-icon.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/installer.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/installer.twig index 7377acf23..b2950dd81 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/installer.twig +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/installer.twig @@ -19,7 +19,7 @@ diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig index 174877348..9ce4b4ab7 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/login.twig @@ -7,7 +7,7 @@ {% if setting_value('visiosoft.theme.defaultadmin::login_icon') %} site icon {% else %} - {{ img('theme::img/icon.svg').data|raw }} + {{ img('theme::img/login-icon.svg').data|raw }} {% endif %} {{ setting_value('visiosoft.theme.defaultadmin::title') }} @@ -21,7 +21,7 @@ {% if setting_value('visiosoft.theme.defaultadmin::login_icon') %} site icon {% else %} - {{ img('theme::img/icon.svg').data|raw }} + {{ img('theme::img/login-icon.svg').data|raw }} {% endif %} diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig index 9e2075eff..9ff1f559b 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/topbar.twig @@ -5,7 +5,7 @@ {% if setting_value('visiosoft.theme.defaultadmin::panel_icon') %} site icon {% else %} - {{ img('theme::img/icon.svg').data|raw }} + {{ img('theme::img/panel-icon.svg').data|raw }} {% endif %} {{ setting_value('visiosoft.theme.defaultadmin::title') }} From 592be415fe82362076700bc8913aecb6791b346f Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 6 Oct 2020 18:12:05 +0300 Subject: [PATCH 2/3] #2278 Emlak24 Bugs 10.5.20 --- .../profile-module/resources/views/profile/detail.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig index 52368270e..7d53dee4d 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig @@ -50,7 +50,7 @@
{% set userForm = form('userProfile').entry(user.id).get() %} {{ userForm.open()|raw }} -
+
From 4e5bc7cd4aefc34bb4c5170c78327aae47217090 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 7 Oct 2020 11:02:19 +0300 Subject: [PATCH 3/3] #2278 Emlak24 Bugs 10.5.20 --- addons/default/visiosoft/advs-module/src/Adv/AdvModel.php | 6 ++++++ .../visiosoft/advs-module/src/Adv/Contract/AdvInterface.php | 1 + .../advs-module/src/Http/Controller/advsController.php | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index 3e0b283ac..bf879d2ad 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -2,6 +2,7 @@ use Anomaly\Streams\Platform\Image\Command\MakeImageInstance; use Anomaly\Streams\Platform\Model\Advs\AdvsCustomFieldsEntryModel; +use Carbon\Carbon; use GuzzleHttp\Client; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; @@ -371,4 +372,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface $neighborhood = $neighborhoodModel->newQuery()->find($this->neighborhood); return $neighborhood ? $neighborhood->name : false; } + + public function expired() + { + return $this->finish_at ? $this->finish_at < Carbon::now() : true; + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php index 6f022c006..a9cb314fd 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php @@ -4,4 +4,5 @@ use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; interface AdvInterface extends EntryInterface { + public function expired(); } 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 15adeb88b..bea56a763 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -433,7 +433,7 @@ class AdvsController extends PublicController $adv = $this->adv_repository->getListItemAdv($id); - if ($adv) { + if ($adv && !$adv->expired()) { if ($this->adv_model->is_enabled('complaints')) { $complaints = ComplaintsComplainTypesEntryModel::all();