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) { diff --git a/addons/default/visiosoft/base-theme/resources/css/login.css b/addons/default/visiosoft/base-theme/resources/css/login.css index 46a28aa04..2bd81dcb4 100644 --- a/addons/default/visiosoft/base-theme/resources/css/login.css +++ b/addons/default/visiosoft/base-theme/resources/css/login.css @@ -7,4 +7,123 @@ .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; +} + +@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/lang/tr/field.php b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php index c33f904dd..9c7915568 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/field.php @@ -20,7 +20,7 @@ return [ 'not_a_member_yet' => 'Henüz Üye Değil Misiniz', 'not_a_member_yet_message' => 'Üyelerimize özel hizmetlerimizden faydalanabilmek için üye olun', 'forgot_password' => 'Şifremi Unuttum', - 'email_or_phone_number' => 'E-Posta Adresiniz veya Telefon Numaranız', + 'email_or_phone_number' => 'E-Posta veya Telefon Numarası', 'phone_number' => 'Telefon Numarası', // Registration instructions 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..98296ec66 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,8 +1,17 @@ {% 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 %} +
+ + +
-
+