Commit cfc1b89a03b02a5b61b75a927d7f97cf6ba7805a
1 parent
7b846b99
123
Showing
15 changed files
with
132 additions
and
28 deletions
Show diff stats
common/messages/en/app.php
| 1 | <?php | 1 | <?php |
| 2 | return [ | 2 | return [ |
| 3 | - 'Читать далее' => 'Read more', | 3 | + 'Address' => 'Address', |
| 4 | + 'About' => 'About', | ||
| 4 | 'blog-txt' => 'We collect useful materials on household appliances and electronics', | 5 | 'blog-txt' => 'We collect useful materials on household appliances and electronics', |
| 5 | - | ||
| 6 | - | ||
| 7 | - | 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 | + 'Message' => 'Message', | ||
| 30 | + 'Name' => 'Name', | ||
| 31 | + 'Phone' => 'Phone', | ||
| 32 | + 'phone' => 'phone', | ||
| 33 | + 'Without category'=>'Without category', | ||
| 34 | + 'Our advantages' => 'Our advantages', | ||
| 35 | + 'Читать далее' => 'Read more', | ||
| 8 | 36 | ||
| 9 | 37 | ||
| 10 | ]; | 38 | ]; |
| 11 | \ No newline at end of file | 39 | \ No newline at end of file |
common/messages/ru/app.php
| @@ -5,9 +5,6 @@ return [ | @@ -5,9 +5,6 @@ return [ | ||
| 5 | 'About' => 'О нас', | 5 | 'About' => 'О нас', |
| 6 | 'Blog' => 'Блог', | 6 | 'Blog' => 'Блог', |
| 7 | 'Events' => 'Мероприятия', | 7 | 'Events' => 'Мероприятия', |
| 8 | - 'Name' => 'Имя', | ||
| 9 | - 'Phone' => 'Телефон', | ||
| 10 | - 'Message' => 'Сообщения', | ||
| 11 | 'You question' => 'Ваш вопрос', | 8 | 'You question' => 'Ваш вопрос', |
| 12 | 'Send' => 'Отправить', | 9 | 'Send' => 'Отправить', |
| 13 | 'Contact us!' => 'Свяжитесь с нами', | 10 | 'Contact us!' => 'Свяжитесь с нами', |
| @@ -18,11 +15,37 @@ return [ | @@ -18,11 +15,37 @@ return [ | ||
| 18 | 'Media' => 'Медиа', | 15 | 'Media' => 'Медиа', |
| 19 | 'More' => 'Подробнее', | 16 | 'More' => 'Подробнее', |
| 20 | 'Company Blog' => 'Блог компании', | 17 | 'Company Blog' => 'Блог компании', |
| 21 | - 'Categories' => 'Категории', | 18 | + |
| 19 | + | ||
| 20 | + 'Email'=>'Email', | ||
| 21 | + 'Message' => 'Сообщения', | ||
| 22 | + | ||
| 23 | + 'Name' => 'Имя', | ||
| 24 | + 'Phone' => 'Телефон', | ||
| 25 | + | ||
| 26 | + | ||
| 27 | + | ||
| 28 | + | ||
| 29 | + | ||
| 22 | 'blog-txt' => ' Мы собираем полезные материалы по тематике бытовой техники и электроники', | 30 | 'blog-txt' => ' Мы собираем полезные материалы по тематике бытовой техники и электроники', |
| 23 | - 'Search by tag' => 'Поиск по тегам', | ||
| 24 | 'Continue reading' => 'Продолжить чтение', | 31 | 'Continue reading' => 'Продолжить чтение', |
| 25 | 'Address' => 'Адрес', | 32 | 'Address' => 'Адрес', |
| 26 | 'phone' => 'Телефон', | 33 | 'phone' => 'Телефон', |
| 34 | + | ||
| 35 | + 'Gallery'=>'Галерея', | ||
| 36 | + 'Categories' => 'Категории', | ||
| 37 | + 'Without category'=>'Без категории', | ||
| 38 | + 'No results found'=>'Ничего не найдено', | ||
| 39 | + | ||
| 40 | + | ||
| 27 | 'Our advantages' => 'Наши преимущества', | 41 | 'Our advantages' => 'Наши преимущества', |
| 42 | + 'Our clients'=>'Наши клиенты', | ||
| 43 | + | ||
| 44 | + | ||
| 45 | + "Search"=>'Поиск', | ||
| 46 | + 'Search by tag' => 'Поиск по тегам', | ||
| 47 | + "Search by article"=>'Поиск по статьям', | ||
| 48 | + | ||
| 49 | + | ||
| 50 | + | ||
| 28 | ]; | 51 | ]; |
| 29 | \ No newline at end of file | 52 | \ No newline at end of file |
common/messages/ua/app.php
| @@ -21,10 +21,20 @@ return [ | @@ -21,10 +21,20 @@ return [ | ||
| 21 | 'Company Blog' => 'Блог компанії', | 21 | 'Company Blog' => 'Блог компанії', |
| 22 | 'Categories' => 'Категорії', | 22 | 'Categories' => 'Категорії', |
| 23 | 'blog-txt' => 'Ми збираємо корисні матеріали з тематики побутової техніки та електроніки', | 23 | 'blog-txt' => 'Ми збираємо корисні матеріали з тематики побутової техніки та електроніки', |
| 24 | - 'Search by tag' => 'Пошук по тегам', | ||
| 25 | 'Continue reading' => 'Продовжити читання', | 24 | 'Continue reading' => 'Продовжити читання', |
| 26 | 'Address' => 'Адреса', | 25 | 'Address' => 'Адреса', |
| 27 | 'phone' => 'телефон', | 26 | 'phone' => 'телефон', |
| 27 | + 'Gallery'=>'Галерея', | ||
| 28 | + 'Without category'=>'Без категорії', | ||
| 29 | + 'No results found'=>'Нічого не знайдено', | ||
| 30 | + | ||
| 28 | 'Our advantages' => 'Наші переваги', | 31 | 'Our advantages' => 'Наші переваги', |
| 32 | + 'Our clients'=>'Наші клієнти', | ||
| 33 | + | ||
| 34 | + 'Search'=>'Пошук', | ||
| 35 | + 'Search by tag' => 'Пошук по тегам', | ||
| 36 | + "Search by article"=>'Поиск по статтям', | ||
| 37 | + | ||
| 38 | + | ||
| 29 | 39 | ||
| 30 | ]; | 40 | ]; |
| 31 | \ No newline at end of file | 41 | \ No newline at end of file |
frontend/config/main.php
frontend/controllers/BlogController.php
frontend/controllers/EventController.php
| @@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
| 7 | use yii\data\ActiveDataProvider; | 7 | use yii\data\ActiveDataProvider; |
| 8 | use yii\web\Controller; | 8 | use yii\web\Controller; |
| 9 | use yii\web\NotFoundHttpException; | 9 | use yii\web\NotFoundHttpException; |
| 10 | + use yii\helpers\VarDumper as d; | ||
| 10 | 11 | ||
| 11 | /** | 12 | /** |
| 12 | * Class BlogController | 13 | * Class BlogController |
| @@ -50,7 +51,7 @@ | @@ -50,7 +51,7 @@ | ||
| 50 | ], | 51 | ], |
| 51 | ] | 52 | ] |
| 52 | ); | 53 | ); |
| 53 | - | 54 | + |
| 54 | return $this->render( | 55 | return $this->render( |
| 55 | 'index', | 56 | 'index', |
| 56 | [ | 57 | [ |
frontend/views/blog/index.php
| @@ -14,9 +14,9 @@ | @@ -14,9 +14,9 @@ | ||
| 14 | * @var common\models\blog\Category[] $categories | 14 | * @var common\models\blog\Category[] $categories |
| 15 | */ | 15 | */ |
| 16 | $seo = \Yii::$app->get('seo'); | 16 | $seo = \Yii::$app->get('seo'); |
| 17 | - | ||
| 18 | - $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Блог'); | ||
| 19 | 17 | ||
| 18 | + $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Blog'); | ||
| 19 | + | ||
| 20 | ?> | 20 | ?> |
| 21 | 21 | ||
| 22 | <div id="content"> | 22 | <div id="content"> |
| @@ -35,7 +35,7 @@ _________________________________________________________ --> | @@ -35,7 +35,7 @@ _________________________________________________________ --> | ||
| 35 | 35 | ||
| 36 | <!-- /.col-md-9 --> | 36 | <!-- /.col-md-9 --> |
| 37 | 37 | ||
| 38 | - | 38 | + |
| 39 | <?= ListView::widget( | 39 | <?= ListView::widget( |
| 40 | [ | 40 | [ |
| 41 | 'dataProvider' => $dataProvider, | 41 | 'dataProvider' => $dataProvider, |
frontend/views/blog/tag.php
| @@ -42,8 +42,8 @@ _________________________________________________________ --> | @@ -42,8 +42,8 @@ _________________________________________________________ --> | ||
| 42 | 42 | ||
| 43 | <!-- /.col-md-9 --> | 43 | <!-- /.col-md-9 --> |
| 44 | 44 | ||
| 45 | - | ||
| 46 | - <?= ListView::widget( | 45 | + <?php |
| 46 | + $listView=ListView::widget( | ||
| 47 | [ | 47 | [ |
| 48 | 'dataProvider' => $dataProvider, | 48 | 'dataProvider' => $dataProvider, |
| 49 | 'itemView' => '_article', | 49 | 'itemView' => '_article', |
| @@ -52,8 +52,13 @@ _________________________________________________________ --> | @@ -52,8 +52,13 @@ _________________________________________________________ --> | ||
| 52 | 'id' => 'blog-listing-medium', | 52 | 'id' => 'blog-listing-medium', |
| 53 | ], | 53 | ], |
| 54 | 'layout' => '{items}{pager}', | 54 | 'layout' => '{items}{pager}', |
| 55 | + 'emptyText'=>\Yii::t('app','No results found'), | ||
| 55 | ] | 56 | ] |
| 56 | - ); ?> | 57 | + ); |
| 58 | + | ||
| 59 | + | ||
| 60 | + ?> | ||
| 61 | + <?=$listView ?> | ||
| 57 | 62 | ||
| 58 | 63 | ||
| 59 | <!-- *** LEFT COLUMN END *** --> | 64 | <!-- *** LEFT COLUMN END *** --> |
| @@ -68,7 +73,7 @@ _________________________________________________________ --> | @@ -68,7 +73,7 @@ _________________________________________________________ --> | ||
| 68 | <div class="panel panel-default sidebar-menu"> | 73 | <div class="panel panel-default sidebar-menu"> |
| 69 | 74 | ||
| 70 | <div class="panel-heading"> | 75 | <div class="panel-heading"> |
| 71 | - <h3 class="panel-title">Блог компании</h3> | 76 | + <h3 class="panel-title"><?=\Yii::t('app','Company Blog');?></h3> |
| 72 | </div> | 77 | </div> |
| 73 | 78 | ||
| 74 | <div class="panel-body text-widget"> | 79 | <div class="panel-body text-widget"> |
frontend/views/event/_event.php
| @@ -3,7 +3,8 @@ | @@ -3,7 +3,8 @@ | ||
| 3 | use artbox\core\helpers\ImageHelper; | 3 | use artbox\core\helpers\ImageHelper; |
| 4 | use yii\bootstrap\Html; | 4 | use yii\bootstrap\Html; |
| 5 | use artbox\core\helpers\Url; | 5 | use artbox\core\helpers\Url; |
| 6 | - | 6 | + use artbox\core\services\Languages; |
| 7 | + use yii\helpers\VarDumper as d; | ||
| 7 | /** | 8 | /** |
| 8 | * @var \common\models\blog\Article $model | 9 | * @var \common\models\blog\Article $model |
| 9 | */ | 10 | */ |
| @@ -58,6 +59,7 @@ | @@ -58,6 +59,7 @@ | ||
| 58 | } | 59 | } |
| 59 | } ?> | 60 | } ?> |
| 60 | <p class="date-comments"> | 61 | <p class="date-comments"> |
| 62 | + | ||
| 61 | <i class="fa fa-calendar-o"></i> <?= \Yii::$app->formatter->asDate($model->created_at); ?> | 63 | <i class="fa fa-calendar-o"></i> <?= \Yii::$app->formatter->asDate($model->created_at); ?> |
| 62 | <!-- <a href="blog-post.html"><i class="fa fa-comment-o"></i> 8 комментариев</a>--> | 64 | <!-- <a href="blog-post.html"><i class="fa fa-comment-o"></i> 8 комментариев</a>--> |
| 63 | </p> | 65 | </p> |
frontend/views/event/index.php
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | use artbox\core\helpers\Url; | 5 | use artbox\core\helpers\Url; |
| 6 | use yii\web\View; | 6 | use yii\web\View; |
| 7 | use yii\widgets\ListView; | 7 | use yii\widgets\ListView; |
| 8 | + use yii\helpers\VarDumper as d; | ||
| 8 | 9 | ||
| 9 | /** | 10 | /** |
| 10 | * @var View $this | 11 | * @var View $this |
| @@ -23,8 +24,21 @@ | @@ -23,8 +24,21 @@ | ||
| 23 | <div class="row"> | 24 | <div class="row"> |
| 24 | <!-- *** LEFT COLUMN *** | 25 | <!-- *** LEFT COLUMN *** |
| 25 | _________________________________________________________ --> | 26 | _________________________________________________________ --> |
| 26 | - | ||
| 27 | - | 27 | + |
| 28 | +<!-- --><?php | ||
| 29 | +// d::dump( ListView::widget( | ||
| 30 | +// [ | ||
| 31 | +// 'dataProvider' => $dataProvider, | ||
| 32 | +// 'itemView' => '_event', | ||
| 33 | +// 'options' => [ | ||
| 34 | +// 'class' => 'col-md-9', | ||
| 35 | +// 'id' => 'blog-listing-medium', | ||
| 36 | +// ], | ||
| 37 | +// 'layout' => '{items}{pager}', | ||
| 38 | +// ] | ||
| 39 | +// ),10,1); | ||
| 40 | +// die; | ||
| 41 | +// ?> | ||
| 28 | <?= ListView::widget( | 42 | <?= ListView::widget( |
| 29 | [ | 43 | [ |
| 30 | 'dataProvider' => $dataProvider, | 44 | 'dataProvider' => $dataProvider, |
frontend/views/event/tag.php
| @@ -68,7 +68,7 @@ _________________________________________________________ --> | @@ -68,7 +68,7 @@ _________________________________________________________ --> | ||
| 68 | 68 | ||
| 69 | <div class="panel sidebar-menu"> | 69 | <div class="panel sidebar-menu"> |
| 70 | <div class="panel-heading"> | 70 | <div class="panel-heading"> |
| 71 | - <h3 class="panel-title"><?=\Yii::t('app', 'Поиск по тегам')?></h3> | 71 | + <h3 class="panel-title"><?=\Yii::t('app', 'Search by tag')?></h3> |
| 72 | </div> | 72 | </div> |
| 73 | 73 | ||
| 74 | <div class="panel-body"> | 74 | <div class="panel-body"> |
frontend/views/layouts/main.php
| @@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
| 26 | use artbox\core\helpers\Url; | 26 | use artbox\core\helpers\Url; |
| 27 | use yii\web\View; | 27 | use yii\web\View; |
| 28 | use yii\widgets\Breadcrumbs; | 28 | use yii\widgets\Breadcrumbs; |
| 29 | - | 29 | + |
| 30 | AppAsset::register($this); | 30 | AppAsset::register($this); |
| 31 | $user = \Yii::$app->user->identity; | 31 | $user = \Yii::$app->user->identity; |
| 32 | $seo = Yii::$app->get('seo'); | 32 | $seo = Yii::$app->get('seo'); |
| @@ -416,6 +416,11 @@ _________________________________________________________ --> | @@ -416,6 +416,11 @@ _________________________________________________________ --> | ||
| 416 | <?= Breadcrumbs::widget( | 416 | <?= Breadcrumbs::widget( |
| 417 | [ | 417 | [ |
| 418 | 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], | 418 | 'links' => isset($this->params[ 'breadcrumbs' ]) ? $this->params[ 'breadcrumbs' ] : [], |
| 419 | + 'homeLink'=> | ||
| 420 | + [ | ||
| 421 | + 'label'=>\Yii::t('app','Home'), | ||
| 422 | + 'url'=>\Yii::$app->homeUrl | ||
| 423 | + ] | ||
| 419 | ] | 424 | ] |
| 420 | ) ?> | 425 | ) ?> |
| 421 | 426 |
frontend/views/site/index.php
| @@ -178,7 +178,7 @@ _________________________________________________________ --> | @@ -178,7 +178,7 @@ _________________________________________________________ --> | ||
| 178 | <div class="row"> | 178 | <div class="row"> |
| 179 | <div class="col-md-12"> | 179 | <div class="col-md-12"> |
| 180 | <div class="heading text-center"> | 180 | <div class="heading text-center"> |
| 181 | - <h2>Our clients</h2> | 181 | + <h2><?=\Yii::t('app','Our clients');?></h2> |
| 182 | </div> | 182 | </div> |
| 183 | 183 | ||
| 184 | <ul class="owl-carousel customers"> | 184 | <ul class="owl-carousel customers"> |
frontend/widgets/views/_blog_search.php
| @@ -12,13 +12,13 @@ | @@ -12,13 +12,13 @@ | ||
| 12 | <div class="panel panel-default sidebar-menu"> | 12 | <div class="panel panel-default sidebar-menu"> |
| 13 | 13 | ||
| 14 | <div class="panel-heading"> | 14 | <div class="panel-heading"> |
| 15 | - <h3 class="panel-title">Поиск</h3> | 15 | + <h3 class="panel-title"><?=\Yii::t('app','Search');?></h3> |
| 16 | </div> | 16 | </div> |
| 17 | 17 | ||
| 18 | <div class="panel-body"> | 18 | <div class="panel-body"> |
| 19 | <form role="search" action="<?= Url::to([ 'blog/index' ]) ?>" method="GET"> | 19 | <form role="search" action="<?= Url::to([ 'blog/index' ]) ?>" method="GET"> |
| 20 | <div class="input-group"> | 20 | <div class="input-group"> |
| 21 | - <input type="text" class="form-control" name="q" placeholder="Поиск по статьям" value="<?= \Yii::$app->request->get( | 21 | + <input type="text" class="form-control" name="q" placeholder="<?=\Yii::t('app','Search by article');?>" value="<?= \Yii::$app->request->get( |
| 22 | 'q', | 22 | 'q', |
| 23 | '' | 23 | '' |
| 24 | ) ?>"> | 24 | ) ?>"> |