Alexey Boroda / new-acdc

Compare View

switch
from
...
to
 
Commits (2)
Showing 12 changed files   Show diff stats
Inline Side-by-side
common/messages/ru/app.php
  Show/Hide comments   View file @f41b224
@@ -133,4 +133,6 @@ return [ @@ -133,4 +133,6 @@ return [
133 'and now is' => 'и в данный момент', 133 'and now is' => 'и в данный момент',
134 'order_text' => 'Если у вас есть вопросы, пожалуйста,', 134 'order_text' => 'Если у вас есть вопросы, пожалуйста,',
135 'Information' => 'Информация', 135 'Information' => 'Информация',
  136 + 'Find' => 'Поиск',
  137 + 'Find articles' => 'Поиск по статьям',
136 ]; 138 ];
137 \ No newline at end of file 139 \ No newline at end of file
common/messages/uk/app.php
  Show/Hide comments   View file @f41b224
@@ -166,5 +166,6 @@ return [ @@ -166,5 +166,6 @@ return [
166 'Send message' => 'Відправити повідомлення', 166 'Send message' => 'Відправити повідомлення',
167 'Contact form' => 'Форма контактов', 167 'Contact form' => 'Форма контактов',
168 'search in category' => 'Пошук по категорії {category_name}', 168 'search in category' => 'Пошук по категорії {category_name}',
169 - 169 + 'Find' => 'Пошук',
  170 + 'Find articles' => 'Пошук по статтям',
170 ]; 171 ];
171 \ No newline at end of file 172 \ No newline at end of file
frontend/views/blog/_article.php
  Show/Hide comments   View file @f41b224
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <p class="intro"><?= $model->lang->body_preview; ?></p> 72 <p class="intro"><?= $model->lang->body_preview; ?></p>
73 <p class="read-more"> 73 <p class="read-more">
74 <?= Html::a( 74 <?= Html::a(
75 - 'Продолжить чтение', 75 + Yii::t('app', 'Continue reading'),
76 [ 76 [
77 'blog/article', 77 'blog/article',
78 'id' => $model->id, 78 'id' => $model->id,
frontend/views/blog/index.php
  Show/Hide comments   View file @f41b224
@@ -62,7 +62,7 @@ _________________________________________________________ --&gt; @@ -62,7 +62,7 @@ _________________________________________________________ --&gt;
62 <div class="panel panel-default sidebar-menu"> 62 <div class="panel panel-default sidebar-menu">
63 63
64 <div class="panel-heading"> 64 <div class="panel-heading">
65 - <h3 class="panel-title">Блог компанії</h3> 65 + <h1 class="panel-title">Блог компанії</h1>
66 </div> 66 </div>
67 67
68 <div class="panel-body text-widget"> 68 <div class="panel-body text-widget">
frontend/views/blog/view.php
  Show/Hide comments   View file @f41b224
@@ -31,7 +31,7 @@ _________________________________________________________ --&gt; @@ -31,7 +31,7 @@ _________________________________________________________ --&gt;
31 31
32 <div class="col-md-9" id="blog-post"> 32 <div class="col-md-9" id="blog-post">
33 33
34 - <h2><?= $model->lang->title; ?></h2> 34 + <h1><?= $model->lang->title; ?></h1>
35 35
36 <?php if (!empty($model->tags)) { ?> 36 <?php if (!empty($model->tags)) { ?>
37 <div class="panel sidebar-menu"> 37 <div class="panel sidebar-menu">
frontend/views/category/view.php
  Show/Hide comments   View file @f41b224
@@ -46,14 +46,14 @@ _________________________________________________________ --&gt; @@ -46,14 +46,14 @@ _________________________________________________________ --&gt;
46 ?> 46 ?>
47 <div class="panel panel-default sidebar-menu"> 47 <div class="panel panel-default sidebar-menu">
48 <div class="panel-heading"> 48 <div class="panel-heading">
49 - <h3 class="panel-title"><?php 49 + <h1 class="panel-title"><?php
50 if (!empty($model->parent)) { 50 if (!empty($model->parent)) {
51 - echo $model->parent->lang->title; 51 + echo $model->parent->lang->title . ': '. $model->lang->title;
52 } else { 52 } else {
53 echo $model->lang->title; 53 echo $model->lang->title;
54 } 54 }
55 ?> 55 ?>
56 - </h3> 56 + </h1>
57 </div> 57 </div>
58 <div class="panel-body"> 58 <div class="panel-body">
59 <ul class="filters_menu"> 59 <ul class="filters_menu">
frontend/views/layouts/main.php
  Show/Hide comments   View file @f41b224
@@ -101,6 +101,17 @@ @@ -101,6 +101,17 @@
101 JS; 101 JS;
102 $this->registerJs($preloader, View::POS_READY); 102 $this->registerJs($preloader, View::POS_READY);
103 103
  104 +if((Yii::$app->controller->id ==='category'||'blog')) {
  105 + $canonicalUrl = Yii::$app->request->getHostInfo(). '/' . Yii::$app->request->getPathInfo();
  106 + $canonicalUrl = rtrim($canonicalUrl, '/index');
  107 + $this->registerLinkTag(
  108 + [
  109 + 'href' => $canonicalUrl,
  110 + 'rel' => 'canonical'
  111 + ]
  112 + );
  113 +}
  114 +
104 ?> 115 ?>
105 116
106 <?php $this->beginPage() ?> 117 <?php $this->beginPage() ?>
frontend/views/page/view.php
  Show/Hide comments   View file @f41b224
@@ -18,11 +18,23 @@ @@ -18,11 +18,23 @@
18 <div class="container"> 18 <div class="container">
19 19
20 <div class="row"> 20 <div class="row">
21 - 21 + <div class=" col-sm-3">
  22 + <div class="panel panel-default sidebar-menu">
  23 + <div class="panel-heading">
  24 + <h1 class="panel-title">
  25 + <?= $model->lang->title ?>
  26 + </h1>
  27 + </div>
  28 + </div>
  29 + </div>
  30 + </div>
  31 + <div class="row">
22 <!-- *** LEFT COLUMN *** 32 <!-- *** LEFT COLUMN ***
23 _________________________________________________________ --> 33 _________________________________________________________ -->
24 - 34 +
  35 +
25 <div class="col-md-9 clearfix"> 36 <div class="col-md-9 clearfix">
  37 +
26 <section> 38 <section>
27 <div id="text-page"> 39 <div id="text-page">
28 40
frontend/views/site/contact.php
  Show/Hide comments   View file @f41b224
@@ -36,7 +36,7 @@ JS; @@ -36,7 +36,7 @@ JS;
36 <div class="col-md-12"> 36 <div class="col-md-12">
37 <section> 37 <section>
38 <div class="heading"> 38 <div class="heading">
39 - <h2><?=Yii::t('app','contact_page_text')?></h2> 39 + <h1><?=Yii::t('app','contact_page_text')?></h1>
40 </div> 40 </div>
41 </section> 41 </section>
42 </div> 42 </div>
frontend/views/special/category.php
  Show/Hide comments   View file @f41b224
@@ -15,11 +15,11 @@ @@ -15,11 +15,11 @@
15 $this->params[ 'breadcrumbs' ][] = [ 15 $this->params[ 'breadcrumbs' ][] = [
16 'label' => \Yii::t( 16 'label' => \Yii::t(
17 'app', 17 'app',
18 - 'Все {type}', 18 + 'Всі {type}',
19 [ 19 [
20 'type' => ( $type === 'new' ) ? \Yii::t('app', 'новинки') : \Yii::t( 20 'type' => ( $type === 'new' ) ? \Yii::t('app', 'новинки') : \Yii::t(
21 'app', 21 'app',
22 - 'акционные' 22 + 'акції'
23 ), 23 ),
24 ] 24 ]
25 ), 25 ),
@@ -30,14 +30,25 @@ @@ -30,14 +30,25 @@
30 ]; 30 ];
31 $this->params[ 'breadcrumbs' ][] = $seo->title ? : ( ( $type === 'new' ) ? \Yii::t('app', 'Новинки') : \Yii::t( 31 $this->params[ 'breadcrumbs' ][] = $seo->title ? : ( ( $type === 'new' ) ? \Yii::t('app', 'Новинки') : \Yii::t(
32 'app', 32 'app',
33 - 'Акционные' 33 + 'Акції'
34 ) ) . ' ' . $model->lang->title; 34 ) ) . ' ' . $model->lang->title;
35 ?> 35 ?>
36 <div id="content"> 36 <div id="content">
37 <div class="container"> 37 <div class="container">
38 38
39 <div class="row"> 39 <div class="row">
40 - 40 + <div class="col-sm-3">
  41 + <div class="panel panel-default sidebar-menu">
  42 + <div class="panel-heading">
  43 + <h1 class="panel-title">
  44 + <?= $type === 'new'
  45 + ? \Yii::t('app', 'новинки') . ' ' . $model->lang->title
  46 + : \Yii::t('app', 'акції') . ' ' . $model->lang->title;
  47 + ?>
  48 + </h1>
  49 + </div>
  50 + </div>
  51 + </div>
41 <div class="col-sm-12"> 52 <div class="col-sm-12">
42 53
43 <?php 54 <?php
frontend/views/special/index.php
  Show/Hide comments   View file @f41b224
@@ -14,11 +14,11 @@ @@ -14,11 +14,11 @@
14 $view = $this; 14 $view = $this;
15 $this->params[ 'breadcrumbs' ][] = $seo->title ? : \Yii::t( 15 $this->params[ 'breadcrumbs' ][] = $seo->title ? : \Yii::t(
16 'app', 16 'app',
17 - 'Все {type}', 17 + 'Всі {type}',
18 [ 18 [
19 'type' => ( $type === 'new' ) ? \Yii::t('app', 'новинки') : \Yii::t( 19 'type' => ( $type === 'new' ) ? \Yii::t('app', 'новинки') : \Yii::t(
20 'app', 20 'app',
21 - 'акционные' 21 + 'акції'
22 ), 22 ),
23 ] 23 ]
24 ); 24 );
@@ -34,6 +34,14 @@ _________________________________________________________ --&gt; @@ -34,6 +34,14 @@ _________________________________________________________ --&gt;
34 34
35 <div class="col-sm-3"> 35 <div class="col-sm-3">
36 <div class="panel panel-default sidebar-menu"> 36 <div class="panel panel-default sidebar-menu">
  37 + <div class="panel-heading">
  38 + <h1 class="panel-title">
  39 + <?= $type === 'new'
  40 + ? \Yii::t('app', 'новинки')
  41 + : \Yii::t('app', 'акції');
  42 + ?>
  43 + </h1>
  44 + </div>
37 <div class="panel-body"> 45 <div class="panel-body">
38 <ul class="nav nav-pills nav-stacked category-menu"> 46 <ul class="nav nav-pills nav-stacked category-menu">
39 <li> 47 <li>
frontend/widgets/views/_blog_search.php
  Show/Hide comments   View file @f41b224
@@ -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','Find')?></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','Find articles')?>" value="<?= \Yii::$app->request->get(
22 'q', 22 'q',
23 '' 23 ''
24 ) ?>"> 24 ) ?>">