From 7cd87e901fa59f1c5a34be250c78c014ed08245e Mon Sep 17 00:00:00 2001 From: Konstantin Date: Sat, 30 May 2026 15:08:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A2=D0=B5=D0=BA=D1=81=D1=82=D0=BE=D0=B2?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=BB=D0=BE=D0=B3=D0=BE=D1=82=D0=B8=D0=BF=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=B2=D0=B8=D1=82=D1=80=D0=B8=D0=BD=D1=8B?= =?UTF-8?q?=20=D1=81=D0=B0=D0=B9=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/admin/controller/setting/setting.php | 6 ++++++ public/admin/language/ru-ru/setting/setting.php | 3 ++- public/admin/view/template/setting/setting.twig | 8 +++++++- public/admin/view/template/setting/store_form.twig | 8 +++++++- public/store/controller/common/header.php | 3 ++- .../store/view/theme/dominik/template/common/header.twig | 3 +-- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/public/admin/controller/setting/setting.php b/public/admin/controller/setting/setting.php index 94a29ae..b33f272 100644 --- a/public/admin/controller/setting/setting.php +++ b/public/admin/controller/setting/setting.php @@ -750,6 +750,12 @@ class ControllerSettingSetting extends Controller { $data['config_logo'] = $this->config->get('config_logo'); } + if (isset($this->request->post['config_logo_text'])) { + $data['config_logo_text'] = $this->request->post['config_logo_text']; + } else { + $data['config_logo_text'] = $this->config->get('config_logo_text'); + } + if (isset($this->request->post['config_logo']) && is_file(DIR_IMAGE . $this->request->post['config_logo'])) { $data['logo'] = $this->model_tool_image->resize($this->request->post['config_logo'], 100, 100); } elseif ($this->config->get('config_logo') && is_file(DIR_IMAGE . $this->config->get('config_logo'))) { diff --git a/public/admin/language/ru-ru/setting/setting.php b/public/admin/language/ru-ru/setting/setting.php index c8979e6..0d9a1e8 100644 --- a/public/admin/language/ru-ru/setting/setting.php +++ b/public/admin/language/ru-ru/setting/setting.php @@ -116,6 +116,7 @@ $_['entry_return_status'] = 'Статус возврата'; $_['entry_captcha'] = 'Капча'; $_['entry_captcha_page'] = 'Страница капчи'; $_['entry_logo'] = 'Логотип'; +$_['entry_logo_text'] = 'Текстовый логотип'; $_['entry_icon'] = 'Иконка'; $_['entry_image_category'] = 'Размер изображений категории'; $_['entry_image_thumb'] = 'Размер большого изображения товара'; @@ -294,4 +295,4 @@ $_['error_ftp_username'] = 'Необходимо указать FT $_['error_ftp_password'] = 'Необходимо указать FTP пароль!'; $_['error_error_filename'] = 'Необходимо ввести имя файла журнала ошибок!'; $_['error_malformed_filename'] = 'Неверное имя файла!'; -$_['error_encryption'] = 'Ключ шифрования должен содержать от 32 до 1024 символов!'; \ No newline at end of file +$_['error_encryption'] = 'Ключ шифрования должен содержать от 32 до 1024 символов!'; diff --git a/public/admin/view/template/setting/setting.twig b/public/admin/view/template/setting/setting.twig index 73a21a1..0c5990c 100644 --- a/public/admin/view/template/setting/setting.twig +++ b/public/admin/view/template/setting/setting.twig @@ -1093,6 +1093,12 @@ +
+ +
+ +
+
@@ -1690,4 +1696,4 @@ $('select[name=\'config_country_id\']').on('change', function() { $('select[name=\'config_country_id\']').trigger('change'); //-->
-{{ footer }} \ No newline at end of file +{{ footer }} diff --git a/public/admin/view/template/setting/store_form.twig b/public/admin/view/template/setting/store_form.twig index 32bc8c9..a862769 100644 --- a/public/admin/view/template/setting/store_form.twig +++ b/public/admin/view/template/setting/store_form.twig @@ -528,6 +528,12 @@
+
+ +
+ +
+
@@ -624,4 +630,4 @@ $('select[name=\'config_country_id\']').on('change', function() { $('select[name=\'config_country_id\']').trigger('change'); //-->
-{{ footer }} \ No newline at end of file +{{ footer }} diff --git a/public/store/controller/common/header.php b/public/store/controller/common/header.php index e1f4eaa..701bbae 100644 --- a/public/store/controller/common/header.php +++ b/public/store/controller/common/header.php @@ -44,6 +44,7 @@ foreach(['name','email','telephone','address','open', 'comment'] as $item){ $data['direction'] = $this->language->get('direction'); $data['name'] = $this->config->get('config_name'); + $data['logo_text'] = $this->config->get('config_logo_text'); if (is_file(DIR_IMAGE . $this->config->get('config_logo'))) { $data['logo'] = $server . 'image/' . $this->config->get('config_logo'); @@ -117,7 +118,7 @@ foreach(['name','email','telephone','address','open', 'comment'] as $item){ } } - $data['city_list_url'] = 'index.php?route=common/city'; + $data['city_list_url'] = $this->url->link('common/city'); return $this->load->view('common/header', $data); } diff --git a/public/store/view/theme/dominik/template/common/header.twig b/public/store/view/theme/dominik/template/common/header.twig index f07f86a..6623bf6 100644 --- a/public/store/view/theme/dominik/template/common/header.twig +++ b/public/store/view/theme/dominik/template/common/header.twig @@ -78,7 +78,7 @@
-
+
-