From cfc1b89a03b02a5b61b75a927d7f97cf6ba7805a Mon Sep 17 00:00:00 2001 From: dozer111 Date: Mon, 14 May 2018 15:07:52 +0200 Subject: [PATCH] 123 --- common/messages/en/app.php | 36 ++++++++++++++++++++++++++++++++---- common/messages/ru/app.php | 33 ++++++++++++++++++++++++++++----- common/messages/ua/app.php | 12 +++++++++++- frontend/config/main.php | 1 - frontend/controllers/BlogController.php | 2 +- frontend/controllers/EventController.php | 3 ++- frontend/models/FeedBack.php | 17 +++++++++++++++++ frontend/views/blog/index.php | 6 +++--- frontend/views/blog/tag.php | 13 +++++++++---- frontend/views/event/_event.php | 4 +++- frontend/views/event/index.php | 18 ++++++++++++++++-- frontend/views/event/tag.php | 2 +- frontend/views/layouts/main.php | 7 ++++++- frontend/views/site/index.php | 2 +- frontend/widgets/views/_blog_search.php | 4 ++-- 15 files changed, 132 insertions(+), 28 deletions(-) create mode 100644 frontend/models/FeedBack.php diff --git a/common/messages/en/app.php b/common/messages/en/app.php index ee81f8b..5ca571d 100644 --- a/common/messages/en/app.php +++ b/common/messages/en/app.php @@ -1,10 +1,38 @@ 'Read more', + 'Address' => 'Address', + 'About' => 'About', 'blog-txt' => 'We collect useful materials on household appliances and electronics', - - - + 'Blog'=>'Blog', + 'Company Blog' => 'Company Blog', + 'Contacts' => 'Contacts', + 'Categories' => 'Categories', + 'Contact form' => "Contact form", + 'Continue reading' => 'Continue reading', + 'Contact us!' => 'Contact us!', + 'Email'=>'Email', + 'Gallery'=>'Gallery', + 'Go to contact page' => 'Go to contact page', + 'Our clients'=>'Our clients', + 'No results found'=>'No results found', + 'Home'=>'Home', + 'Search'=>'Search', + 'Search by tag' => 'Search by tag', + "Search by article"=>'Search by article', + 'Send' => 'Send', + 'Send message' => 'Send message', + 'Events' => 'Events', + 'You question' => 'You question', + 'News' => 'News', + 'Media' => 'Media', + 'More' => 'More', + 'Message' => 'Message', + 'Name' => 'Name', + 'Phone' => 'Phone', + 'phone' => 'phone', + 'Without category'=>'Without category', + 'Our advantages' => 'Our advantages', + 'Читать далее' => 'Read more', ]; \ No newline at end of file diff --git a/common/messages/ru/app.php b/common/messages/ru/app.php index 69dd7e8..9897f29 100644 --- a/common/messages/ru/app.php +++ b/common/messages/ru/app.php @@ -5,9 +5,6 @@ return [ 'About' => 'О нас', 'Blog' => 'Блог', 'Events' => 'Мероприятия', - 'Name' => 'Имя', - 'Phone' => 'Телефон', - 'Message' => 'Сообщения', 'You question' => 'Ваш вопрос', 'Send' => 'Отправить', 'Contact us!' => 'Свяжитесь с нами', @@ -18,11 +15,37 @@ return [ 'Media' => 'Медиа', 'More' => 'Подробнее', 'Company Blog' => 'Блог компании', - 'Categories' => 'Категории', + + + 'Email'=>'Email', + 'Message' => 'Сообщения', + + 'Name' => 'Имя', + 'Phone' => 'Телефон', + + + + + 'blog-txt' => ' Мы собираем полезные материалы по тематике бытовой техники и электроники', - 'Search by tag' => 'Поиск по тегам', 'Continue reading' => 'Продолжить чтение', 'Address' => 'Адрес', 'phone' => 'Телефон', + + 'Gallery'=>'Галерея', + 'Categories' => 'Категории', + 'Without category'=>'Без категории', + 'No results found'=>'Ничего не найдено', + + 'Our advantages' => 'Наши преимущества', + 'Our clients'=>'Наши клиенты', + + + "Search"=>'Поиск', + 'Search by tag' => 'Поиск по тегам', + "Search by article"=>'Поиск по статьям', + + + ]; \ No newline at end of file diff --git a/common/messages/ua/app.php b/common/messages/ua/app.php index f31ae8b..250545e 100644 --- a/common/messages/ua/app.php +++ b/common/messages/ua/app.php @@ -21,10 +21,20 @@ return [ 'Company Blog' => 'Блог компанії', 'Categories' => 'Категорії', 'blog-txt' => 'Ми збираємо корисні матеріали з тематики побутової техніки та електроніки', - 'Search by tag' => 'Пошук по тегам', 'Continue reading' => 'Продовжити читання', 'Address' => 'Адреса', 'phone' => 'телефон', + 'Gallery'=>'Галерея', + 'Without category'=>'Без категорії', + 'No results found'=>'Нічого не знайдено', + 'Our advantages' => 'Наші переваги', + 'Our clients'=>'Наші клієнти', + + 'Search'=>'Пошук', + 'Search by tag' => 'Пошук по тегам', + "Search by article"=>'Поиск по статтям', + + ]; \ No newline at end of file diff --git a/frontend/config/main.php b/frontend/config/main.php index 78f64b2..0bdc817 100755 --- a/frontend/config/main.php +++ b/frontend/config/main.php @@ -69,7 +69,6 @@ }', ], - 'contact' => [ 'class' => 'artbox\core\forms\Module', 'activeRecord' => "artbox\core\models\Feedback", diff --git a/frontend/controllers/BlogController.php b/frontend/controllers/BlogController.php index f182664..1a1f944 100755 --- a/frontend/controllers/BlogController.php +++ b/frontend/controllers/BlogController.php @@ -66,7 +66,7 @@ ], ] ); - + return $this->render( 'index', [ diff --git a/frontend/controllers/EventController.php b/frontend/controllers/EventController.php index eba46f4..453aa7d 100755 --- a/frontend/controllers/EventController.php +++ b/frontend/controllers/EventController.php @@ -7,6 +7,7 @@ use yii\data\ActiveDataProvider; use yii\web\Controller; use yii\web\NotFoundHttpException; + use yii\helpers\VarDumper as d; /** * Class BlogController @@ -50,7 +51,7 @@ ], ] ); - + return $this->render( 'index', [ diff --git a/frontend/models/FeedBack.php b/frontend/models/FeedBack.php new file mode 100644 index 0000000..38be8c2 --- /dev/null +++ b/frontend/models/FeedBack.php @@ -0,0 +1,17 @@ +get('seo'); - - $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Блог'); + $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Blog'); + ?>
@@ -35,7 +35,7 @@ _________________________________________________________ --> - + $dataProvider, diff --git a/frontend/views/blog/tag.php b/frontend/views/blog/tag.php index b96e8ca..f8560bc 100755 --- a/frontend/views/blog/tag.php +++ b/frontend/views/blog/tag.php @@ -42,8 +42,8 @@ _________________________________________________________ --> - - $dataProvider, 'itemView' => '_article', @@ -52,8 +52,13 @@ _________________________________________________________ --> 'id' => 'blog-listing-medium', ], 'layout' => '{items}{pager}', + 'emptyText'=>\Yii::t('app','No results found'), ] - ); ?> + ); + + + ?> + @@ -68,7 +73,7 @@ _________________________________________________________ -->
-

Блог компании

+

diff --git a/frontend/views/event/_event.php b/frontend/views/event/_event.php index 6d6fe3d..ca125a6 100755 --- a/frontend/views/event/_event.php +++ b/frontend/views/event/_event.php @@ -3,7 +3,8 @@ use artbox\core\helpers\ImageHelper; use yii\bootstrap\Html; use artbox\core\helpers\Url; - + use artbox\core\services\Languages; + use yii\helpers\VarDumper as d; /** * @var \common\models\blog\Article $model */ @@ -58,6 +59,7 @@ } } ?>

+ formatter->asDate($model->created_at); ?>

diff --git a/frontend/views/event/index.php b/frontend/views/event/index.php index f5e807d..898d31f 100755 --- a/frontend/views/event/index.php +++ b/frontend/views/event/index.php @@ -5,6 +5,7 @@ use artbox\core\helpers\Url; use yii\web\View; use yii\widgets\ListView; + use yii\helpers\VarDumper as d; /** * @var View $this @@ -23,8 +24,21 @@
- - + + $dataProvider, +// 'itemView' => '_event', +// 'options' => [ +// 'class' => 'col-md-9', +// 'id' => 'blog-listing-medium', +// ], +// 'layout' => '{items}{pager}', +// ] +// ),10,1); +// die; +// ?> $dataProvider, diff --git a/frontend/views/event/tag.php b/frontend/views/event/tag.php index deec7fd..4c78b1e 100755 --- a/frontend/views/event/tag.php +++ b/frontend/views/event/tag.php @@ -68,7 +68,7 @@ _________________________________________________________ -->
-

+

diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index e18a952..a077bd1 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -26,7 +26,7 @@ use artbox\core\helpers\Url; use yii\web\View; use yii\widgets\Breadcrumbs; - + AppAsset::register($this); $user = \Yii::$app->user->identity; $seo = Yii::$app->get('seo'); @@ -416,6 +416,11 @@ _________________________________________________________ --> isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], + 'homeLink'=> + [ + 'label'=>\Yii::t('app','Home'), + 'url'=>\Yii::$app->homeUrl + ] ] ) ?> diff --git a/frontend/views/site/index.php b/frontend/views/site/index.php index 7014d80..786c1d8 100755 --- a/frontend/views/site/index.php +++ b/frontend/views/site/index.php @@ -178,7 +178,7 @@ _________________________________________________________ -->
-

Our clients

+

    diff --git a/frontend/widgets/views/_blog_search.php b/frontend/widgets/views/_blog_search.php index 576a1eb..82d1489 100755 --- a/frontend/widgets/views/_blog_search.php +++ b/frontend/widgets/views/_blog_search.php @@ -12,13 +12,13 @@
    -

    Поиск

    +

    - -- libgit2 0.21.4