Alexey Boroda / openeurope

Commit cfc1b89a03b02a5b61b75a927d7f97cf6ba7805a

Authored by alex
1 parent 7b846b99

123

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