Commit 8aa9ea6f084863d50197323e63356bc0309dc651
merge conflict
Showing
9 changed files
with
163 additions
and
64 deletions
Show diff stats
common/messages/en/app.php
| 1 | <?php | 1 | <?php |
| 2 | - return [ | ||
| 3 | - 'Address' => 'Address', | ||
| 4 | - 'About' => 'About', | ||
| 5 | - 'blog-txt' => 'We collect useful materials on household appliances and electronics', | ||
| 6 | - 'Blog'=>'Blog', | ||
| 7 | - 'Company Blog' => 'Company Blog', | ||
| 8 | - 'Contacts' => 'Contacts', | ||
| 9 | - 'Categories' => 'Categories', | ||
| 10 | - 'Contact form' => "Contact form", | ||
| 11 | - 'Continue reading' => 'Continue reading', | ||
| 12 | - 'Contact us!' => 'Contact us!', | ||
| 13 | - 'Email' =>'Email', | ||
| 14 | - 'Gallery' =>'Gallery', | ||
| 15 | - 'Go to contact page' => 'Go to contact page', | ||
| 16 | - 'Our clients' =>'Our clients', | ||
| 17 | - 'No results found' =>'No results found', | ||
| 18 | - 'Home' =>'Home', | ||
| 19 | - 'Search' =>'Search', | ||
| 20 | - 'Search by tag' => 'Search by tag', | ||
| 21 | - "Search by article" => 'Search by article', | ||
| 22 | - 'Send' => 'Send', | ||
| 23 | - 'Send message' => 'Send message', | ||
| 24 | - 'Events' => 'Events', | ||
| 25 | - 'You question' => 'You question', | ||
| 26 | - 'News' => 'News', | ||
| 27 | - 'Media' => 'Media', | ||
| 28 | - 'More' => 'More', | ||
| 29 | - 'Form sends success' => 'Form sends success', | ||
| 30 | - 'Message' => 'Message', | ||
| 31 | - 'Name' => 'Name', | ||
| 32 | - 'Phone' => 'Phone', | ||
| 33 | - 'Form sends success Header' => 'Success', | ||
| 34 | - 'Empty field' => 'This field is required.Please fill it', | ||
| 35 | - 'Wrong email' => 'Field Email is not valid', | ||
| 36 | - 'phone' => 'phone', | ||
| 37 | - 'Without category' =>'Without category', | ||
| 38 | - 'Our advantages' => 'Our advantages', | ||
| 39 | - 'Читать далее' => 'Read more', | 2 | +return [ |
| 3 | + 'Address' => 'Address', | ||
| 4 | + 'About' => 'About', | ||
| 5 | + 'blog-txt' => 'We collect useful materials on household appliances and electronics', | ||
| 6 | + 'Blog'=>'Blog', | ||
| 7 | + 'Company Blog' => 'Company Blog', | ||
| 8 | + 'Contacts' => 'Contacts', | ||
| 9 | + 'Categories' => 'Categories', | ||
| 10 | + 'Contact form' => "Contact form", | ||
| 11 | + 'Continue reading' => 'Continue reading', | ||
| 12 | + 'Contact us!' => 'Contact us!', | ||
| 13 | + 'Email' =>'Email', | ||
| 14 | + 'Gallery' =>'Gallery', | ||
| 15 | + 'Go to contact page' => 'Go to contact page', | ||
| 16 | + 'Our clients' =>'Our clients', | ||
| 17 | + 'No results found' =>'No results found', | ||
| 18 | + 'Home' =>'Home', | ||
| 19 | + 'Search' =>'Search', | ||
| 20 | + 'Search by tag' => 'Search by tag', | ||
| 21 | + "Search by article" => 'Search by article', | ||
| 22 | + 'Send' => 'Send', | ||
| 23 | + 'Send message' => 'Send message', | ||
| 24 | + 'Events' => 'Events', | ||
| 25 | + 'You question' => 'You question', | ||
| 26 | + 'News' => 'News', | ||
| 27 | + 'Media' => 'Media', | ||
| 28 | + 'More' => 'More', | ||
| 29 | + 'Form sends success' => 'Form sends success', | ||
| 30 | + #'Message' => 'Message', | ||
| 31 | + 'Message' => 'Messag as dflkasd;fk asp dok', | ||
| 32 | + 'Name' => 'Name', | ||
| 33 | + 'Phone' => 'Phone', | ||
| 34 | + 'Form sends success Header' => 'Success', | ||
| 35 | + 'Empty field' => 'This field is required.Please fill it', | ||
| 36 | + 'Wrong email' => 'Field Email is not valid', | ||
| 37 | + 'phone' => 'phone', | ||
| 38 | + 'Without category' =>'Without category', | ||
| 39 | + 'Our advantages' => 'Our advantages', | ||
| 40 | + 'Читать далее' => 'Read more', | ||
| 41 | + 'Send Message' => 'tes st s', | ||
| 40 | 42 | ||
| 41 | - | ||
| 42 | - ]; | ||
| 43 | \ No newline at end of file | 43 | \ No newline at end of file |
| 44 | + ]; |
common/messages/en/core.php
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | return [ | 3 | return [ |
| 4 | - 'name'=>'Name', | ||
| 5 | - 'email'=>'Email', | ||
| 6 | - 'phone'=>'Phone', | ||
| 7 | - 'message'=>'Message', | ||
| 8 | - | 4 | + 'name' =>'Name', |
| 5 | + 'email' =>'Email', | ||
| 6 | + 'phone' =>'Phone', | ||
| 7 | + 'message' =>'Message', | ||
| 8 | + 'Message' => 'forntrend message', | ||
| 9 | ]; | 9 | ]; |
| 10 | \ No newline at end of file | 10 | \ No newline at end of file |
common/messages/ru/app.php
| 1 | <?php | 1 | <?php |
| 2 | +<<<<<<< HEAD | ||
| 2 | return [ | 3 | return [ |
| 3 | 'Home' => 'Главная', | 4 | 'Home' => 'Главная', |
| 4 | 'Contacts' => 'Контакты', | 5 | 'Contacts' => 'Контакты', |
| @@ -37,4 +38,46 @@ | @@ -37,4 +38,46 @@ | ||
| 37 | 'Wrong email' => 'Поле Email не валидное', | 38 | 'Wrong email' => 'Поле Email не валидное', |
| 38 | 39 | ||
| 39 | 40 | ||
| 40 | - ]; | ||
| 41 | \ No newline at end of file | 41 | \ No newline at end of file |
| 42 | + ]; | ||
| 43 | +======= | ||
| 44 | +return [ | ||
| 45 | + 'Home' => 'Главная', | ||
| 46 | + 'Contacts' => 'Контакты', | ||
| 47 | + 'About' => 'О нас', | ||
| 48 | + 'Blog' => 'Блог', | ||
| 49 | + 'Events' => 'Мероприятия', | ||
| 50 | + 'You question' => 'Ваш вопрос', | ||
| 51 | + 'Contact us!' => 'Свяжитесь с нами', | ||
| 52 | + 'Go to contact page' => 'Перейти на страницу контактов', | ||
| 53 | + 'Send message' => 'Отправить сообщение', | ||
| 54 | + 'Contact form' => "Форма для связи", | ||
| 55 | + 'News' => 'Новости', | ||
| 56 | + 'Media' => 'Медиа', | ||
| 57 | + 'More' => 'Подробнее', | ||
| 58 | + 'Company Blog' => 'Блог компании', | ||
| 59 | + | ||
| 60 | + 'Name' => 'Имя', | ||
| 61 | + 'Phone' => 'Телефон', | ||
| 62 | + 'blog-txt' => ' Мы собираем полезные материалы по тематике бытовой техники и электроники', | ||
| 63 | + 'Continue reading' => 'Продолжить чтение', | ||
| 64 | + 'Address' => 'Адрес', | ||
| 65 | + 'phone' => 'Телефон', | ||
| 66 | + 'Form sends success' => 'Форма успешно отправлена', | ||
| 67 | + 'Gallery' =>'Галерея', | ||
| 68 | + 'Categories' => 'Категории', | ||
| 69 | + 'Without category' =>'Без категории', | ||
| 70 | + 'No results found' =>'Ничего не найдено', | ||
| 71 | + 'Form sends success Header' => 'Форма успешно отправлена ', | ||
| 72 | + 'Our advantages' => 'Наши преимущества', | ||
| 73 | + 'Our clients' =>'Наши клиенты', | ||
| 74 | + 'Send' => 'Отправить', | ||
| 75 | + 'Empty field' => 'Поле является обязательным для заполнения', | ||
| 76 | + "Search" => 'Поиск', | ||
| 77 | + 'Search by tag' => 'Поиск по тегам', | ||
| 78 | + "Search by article" => 'Поиск по статьям', | ||
| 79 | + 'Wrong email' => 'Поле Email не валидное', | ||
| 80 | + 'Message' => 'Сообщение', | ||
| 81 | + '<i class="fa fa-envelope-o"></i>Send Message' => 'Отправить сообщение', | ||
| 82 | + | ||
| 83 | +]; | ||
| 84 | +>>>>>>> a414fcdd8183183d71dc69d0e432c3418f8bc3a9 |
common/messages/ua/app.php
| 1 | <?php | 1 | <?php |
| 2 | +<<<<<<< HEAD | ||
| 2 | return [ | 3 | return [ |
| 3 | 'Home' => 'Головна', | 4 | 'Home' => 'Головна', |
| 4 | 'Contacts' => 'Контакти', | 5 | 'Contacts' => 'Контакти', |
| @@ -43,4 +44,51 @@ | @@ -43,4 +44,51 @@ | ||
| 43 | 'Form sends success' => 'Форма успішно відправлена ', | 44 | 'Form sends success' => 'Форма успішно відправлена ', |
| 44 | 'Wrong email' => 'Поле Email не валідне ', | 45 | 'Wrong email' => 'Поле Email не валідне ', |
| 45 | 46 | ||
| 46 | - ]; | ||
| 47 | \ No newline at end of file | 47 | \ No newline at end of file |
| 48 | + ]; | ||
| 49 | +======= | ||
| 50 | +return [ | ||
| 51 | + 'Home' => 'Головна', | ||
| 52 | + 'Contacts' => 'Контакти', | ||
| 53 | + 'About' => 'Про нас', | ||
| 54 | + 'Blog' => 'Блог', | ||
| 55 | + 'Events' => 'Заходи', | ||
| 56 | + 'Empty field' => 'Поле є обов\'язковим для заповнення', | ||
| 57 | + 'Name' => 'Ім\'я', | ||
| 58 | + 'Phone' => 'Телефон', | ||
| 59 | + 'Message' => 'Повідомленя', | ||
| 60 | + 'You question' => 'Ваше питання', | ||
| 61 | + 'Send' => 'Відправити', | ||
| 62 | + 'Contact us!' => 'Зв\'яжіться з нами', | ||
| 63 | + 'Go to contact page' => 'Перейти до сторінки контактів', | ||
| 64 | + 'Читать далее' => 'Читати далі', | ||
| 65 | + "Send message" => 'Надіслати повідомлення', | ||
| 66 | + "Contact form" => 'Форма для зв\'язку', | ||
| 67 | + 'News' => 'Новини', | ||
| 68 | + 'Media' => 'Медіа', | ||
| 69 | + 'More' => 'Докладніше', | ||
| 70 | + 'Company Blog' => 'Блог компанії', | ||
| 71 | + 'Categories' => 'Категорії', | ||
| 72 | + 'blog-txt' => 'Ми збираємо корисні матеріали з тематики побутової техніки та електроніки', | ||
| 73 | + 'Continue reading' => 'Продовжити читання', | ||
| 74 | + 'Address' => 'Адреса', | ||
| 75 | + 'phone' => 'телефон', | ||
| 76 | + 'Gallery' =>'Галерея', | ||
| 77 | + 'Without category' =>'Без категорії', | ||
| 78 | + 'No results found' =>'Нічого не знайдено', | ||
| 79 | + | ||
| 80 | + 'Our advantages' => 'Наші переваги', | ||
| 81 | + 'Our clients'=>'Наші клієнти', | ||
| 82 | + | ||
| 83 | + 'Search'=>'Пошук', | ||
| 84 | + 'Search by tag' => 'Пошук по тегам', | ||
| 85 | + "Search by article"=>'Поиск по статтям', | ||
| 86 | + | ||
| 87 | + 'Form sends success Header' => 'Форма успішно відправлена', | ||
| 88 | + 'name' => 'Ім\'я', | ||
| 89 | + 'email' => 'Email', | ||
| 90 | + 'message' => 'Повідомленя', | ||
| 91 | + 'Form sends success' => 'Форма успішно відправлена ', | ||
| 92 | + 'Wrong email' => 'Поле Email не валідне ', | ||
| 93 | + '<i class="fa fa-envelope-o"></i>Send Message' => 'Відправити повідомлення', | ||
| 94 | +]; | ||
| 95 | +>>>>>>> a414fcdd8183183d71dc69d0e432c3418f8bc3a9 |
frontend/assets/AppAsset.php
| @@ -32,7 +32,7 @@ | @@ -32,7 +32,7 @@ | ||
| 32 | 'js/owl.carousel.min.js', | 32 | 'js/owl.carousel.min.js', |
| 33 | 'js/script.js', | 33 | 'js/script.js', |
| 34 | 'js/modal.js', | 34 | 'js/modal.js', |
| 35 | - 'js/jquery.mask.min.js', | 35 | + 'js/jquery.mask.min.js', |
| 36 | ]; | 36 | ]; |
| 37 | public $depends = [ | 37 | public $depends = [ |
| 38 | 'yii\web\YiiAsset', | 38 | 'yii\web\YiiAsset', |
frontend/config/main.php
| @@ -2,6 +2,8 @@ | @@ -2,6 +2,8 @@ | ||
| 2 | use artbox\core\components\SeoComponent; | 2 | use artbox\core\components\SeoComponent; |
| 3 | use frontend\components\UrlManager; | 3 | use frontend\components\UrlManager; |
| 4 | 4 | ||
| 5 | + $a = \Yii::t('app', 'Message'); | ||
| 6 | + | ||
| 5 | $params = array_merge( | 7 | $params = array_merge( |
| 6 | require( __DIR__ . '/../../common/config/params.php' ), | 8 | require( __DIR__ . '/../../common/config/params.php' ), |
| 7 | require( __DIR__ . '/../../common/config/params-local.php' ), | 9 | require( __DIR__ . '/../../common/config/params-local.php' ), |
| @@ -12,14 +14,18 @@ | @@ -12,14 +14,18 @@ | ||
| 12 | 'id' => 'app-frontend', | 14 | 'id' => 'app-frontend', |
| 13 | 'homeUrl' => '/', | 15 | 'homeUrl' => '/', |
| 14 | 'basePath' => dirname(__DIR__), | 16 | 'basePath' => dirname(__DIR__), |
| 15 | - 'bootstrap' => [ 'log' ], | 17 | + 'bootstrap' => [ |
| 18 | + 'log', | ||
| 19 | + 'i18n', | ||
| 20 | + 'contact', | ||
| 21 | + ], | ||
| 16 | 'controllerNamespace' => 'frontend\controllers', | 22 | 'controllerNamespace' => 'frontend\controllers', |
| 17 | - 'container' => [ | 23 | + 'container' => [ |
| 18 | 'singletons' => [ | 24 | 'singletons' => [ |
| 19 | 'artbox\core\services\Languages' =>'artbox\core\services\Languages', | 25 | 'artbox\core\services\Languages' =>'artbox\core\services\Languages', |
| 20 | ] | 26 | ] |
| 21 | ], | 27 | ], |
| 22 | - | 28 | + |
| 23 | 'components' => [ | 29 | 'components' => [ |
| 24 | 'request' => [ | 30 | 'request' => [ |
| 25 | 'csrfParam' => '_csrf-frontend', | 31 | 'csrfParam' => '_csrf-frontend', |
| @@ -79,9 +85,9 @@ | @@ -79,9 +85,9 @@ | ||
| 79 | ], | 85 | ], |
| 80 | 'modules' => [ | 86 | 'modules' => [ |
| 81 | 'feedback' => [ | 87 | 'feedback' => [ |
| 82 | - 'class' => 'artbox\core\forms\Module', | ||
| 83 | - 'activeRecord' => "artbox\core\models\Feedback", | ||
| 84 | - 'attributes' => [ | 88 | + 'class' => 'artbox\core\forms\Module', |
| 89 | + 'activeRecord' => "frontend\models\Feedback", | ||
| 90 | + 'attributes' => [ | ||
| 85 | 'name', | 91 | 'name', |
| 86 | 'email', | 92 | 'email', |
| 87 | 'message', | 93 | 'message', |
| @@ -111,7 +117,7 @@ | @@ -111,7 +117,7 @@ | ||
| 111 | 'options' => [], | 117 | 'options' => [], |
| 112 | ], | 118 | ], |
| 113 | ], | 119 | ], |
| 114 | - 'buttonContent' => \Yii::t('app','Send'), | 120 | + 'buttonContent' => \Yii::t('app', 'Send'), |
| 115 | 'scenario' => 'feedback', | 121 | 'scenario' => 'feedback', |
| 116 | 'sendEmail' => false, | 122 | 'sendEmail' => false, |
| 117 | 'formId' => 'feedback-form', | 123 | 'formId' => 'feedback-form', |
| @@ -127,16 +133,16 @@ | @@ -127,16 +133,16 @@ | ||
| 127 | }', | 133 | }', |
| 128 | ], | 134 | ], |
| 129 | 'contact' => [ | 135 | 'contact' => [ |
| 130 | - 'class' => 'artbox\core\forms\Module', | ||
| 131 | - 'activeRecord' => "artbox\core\models\Feedback", | 136 | + 'class' => 'artbox\core\forms\Module', |
| 137 | + 'activeRecord' => "frontend\models\Feedback", | ||
| 132 | 'templateForm' => '<div class="row">{form}</div>', | 138 | 'templateForm' => '<div class="row">{form}</div>', |
| 133 | - 'attributes' => [ | 139 | + 'attributes' => [ |
| 134 | 'name', | 140 | 'name', |
| 135 | 'email', | 141 | 'email', |
| 136 | 'phone', | 142 | 'phone', |
| 137 | 'message', | 143 | 'message', |
| 138 | ], | 144 | ], |
| 139 | - 'rules' => [ | 145 | + 'rules' => [ |
| 140 | [ | 146 | [ |
| 141 | [ 'email' ], | 147 | [ 'email' ], |
| 142 | 'email', | 148 | 'email', |
| @@ -177,7 +183,7 @@ | @@ -177,7 +183,7 @@ | ||
| 177 | 'buttonOptions' => [ | 183 | 'buttonOptions' => [ |
| 178 | 'class' => 'btn btn-template-main', | 184 | 'class' => 'btn btn-template-main', |
| 179 | ], | 185 | ], |
| 180 | - 'buttonContent' => '<i class="fa fa-envelope-o"></i>' . \Yii::t('app', 'Message'), | 186 | + 'buttonContent' => '<i class="fa fa-envelope-o"></i>Send Message', |
| 181 | 'sendEmail' => false, | 187 | 'sendEmail' => false, |
| 182 | 'ajax' => true, | 188 | 'ajax' => true, |
| 183 | 'formId' => 'contact-form', | 189 | 'formId' => 'contact-form', |
frontend/controllers/SiteController.php
| 1 | <?php | 1 | <?php |
| 2 | namespace frontend\controllers; | 2 | namespace frontend\controllers; |
| 3 | 3 | ||
| 4 | - use frontend\models\FeedBack; | 4 | + use frontend\models\Feedback; |
| 5 | use common\models\blog\Article; | 5 | use common\models\blog\Article; |
| 6 | use common\models\Settings; | 6 | use common\models\Settings; |
| 7 | use common\models\slider\Slide; | 7 | use common\models\slider\Slide; |
frontend/models/FeedBack.php renamed to frontend/models/Feedback.php
| @@ -9,7 +9,7 @@ namespace frontend\models; | @@ -9,7 +9,7 @@ namespace frontend\models; | ||
| 9 | 9 | ||
| 10 | use artbox\core\models\Feedback as ArtboxCoreFeedback; | 10 | use artbox\core\models\Feedback as ArtboxCoreFeedback; |
| 11 | 11 | ||
| 12 | -class FeedBack extends ArtboxCoreFeedback | 12 | +class Feedback extends ArtboxCoreFeedback |
| 13 | { | 13 | { |
| 14 | public function rules() | 14 | public function rules() |
| 15 | { | 15 | { |
| @@ -40,11 +40,12 @@ class FeedBack extends ArtboxCoreFeedback | @@ -40,11 +40,12 @@ class FeedBack extends ArtboxCoreFeedback | ||
| 40 | ], | 40 | ], |
| 41 | 'required', | 41 | 'required', |
| 42 | 'on' => self::SCENARIO_CALLBACK, | 42 | 'on' => self::SCENARIO_CALLBACK, |
| 43 | + | ||
| 43 | ], | 44 | ], |
| 44 | [ | 45 | [ |
| 45 | [ 'email' ], | 46 | [ 'email' ], |
| 46 | 'email', | 47 | 'email', |
| 47 | - 'message' => 'Wrong email', | 48 | + 'message' => \Yii::t('app', 'Wrong email'), |
| 48 | ], | 49 | ], |
| 49 | 50 | ||
| 50 | [ | 51 | [ |
frontend/web/js/script.js
| @@ -6,7 +6,7 @@ $( | @@ -6,7 +6,7 @@ $( | ||
| 6 | // */ | 6 | // */ |
| 7 | // $(document) | 7 | // $(document) |
| 8 | // .on( | 8 | // .on( |
| 9 | - // 'beforeSubmit', '#feedback-form', function(e) { | 9 | + // 'beforeSubmit', '#feedback-form', function(e) { |
| 10 | // var f = this; | 10 | // var f = this; |
| 11 | // var form = $(this); | 11 | // var form = $(this); |
| 12 | // var formData = form.serialize(); | 12 | // var formData = form.serialize(); |