Commit 24af1c1a50d8d9f1abc25d014580106e036d8f82
1 parent
5086370d
Убрал с новостей правый блок, добавит h2 к описанию проекта
Showing
8 changed files
with
48 additions
and
36 deletions
 
Show diff stats
common/messages/en/app.php
| @@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
| 2 | return [ | 2 | return [ | 
| 3 | 'Address' => 'Address', | 3 | 'Address' => 'Address', | 
| 4 | 'About' => 'About', | 4 | 'About' => 'About', | 
| 5 | + 'About project' => 'About project', | ||
| 5 | 'blog-txt' => 'We collect useful materials on household appliances and electronics', | 6 | 'blog-txt' => 'We collect useful materials on household appliances and electronics', | 
| 6 | 'Blog'=>'Blog', | 7 | 'Blog'=>'Blog', | 
| 7 | 'Company Blog' => 'Company Blog', | 8 | 'Company Blog' => 'Company Blog', | 
common/messages/ru/app.php
| @@ -6,7 +6,6 @@ return [ | @@ -6,7 +6,6 @@ return [ | ||
| 6 | 6 | ||
| 7 | 'Home' => 'Главная', | 7 | 'Home' => 'Главная', | 
| 8 | 'Contacts' => 'Контакты', | 8 | 'Contacts' => 'Контакты', | 
| 9 | - 'About' => 'О нас', | ||
| 10 | 9 | ||
| 11 | 'Events' => 'Мероприятия', | 10 | 'Events' => 'Мероприятия', | 
| 12 | 'You question' => 'Сообщение', | 11 | 'You question' => 'Сообщение', | 
| @@ -39,7 +38,8 @@ return [ | @@ -39,7 +38,8 @@ return [ | ||
| 39 | 'Empty dataProvider' => 'Ничего не найдено', | 38 | 'Empty dataProvider' => 'Ничего не найдено', | 
| 40 | 39 | ||
| 41 | 40 | ||
| 42 | - | 41 | + 'About' => 'О нас', | 
| 42 | + 'About project' => 'О проекте', | ||
| 43 | 'Send' => 'Отправить', | 43 | 'Send' => 'Отправить', | 
| 44 | '<i class="fa fa-envelope-o"></i>Send Message' => 'Отправить сообщение', | 44 | '<i class="fa fa-envelope-o"></i>Send Message' => 'Отправить сообщение', | 
| 45 | 'Empty field' => 'Поле является обязательным для заполнения', | 45 | 'Empty field' => 'Поле является обязательным для заполнения', | 
common/messages/ua/app.php
| @@ -9,7 +9,8 @@ return [ | @@ -9,7 +9,8 @@ return [ | ||
| 9 | 'Name' => 'Ім\'я', | 9 | 'Name' => 'Ім\'я', | 
| 10 | 'Phone' => 'Телефон', | 10 | 'Phone' => 'Телефон', | 
| 11 | 'Message' => 'Повідомленя', | 11 | 'Message' => 'Повідомленя', | 
| 12 | - 'You question' => 'Повідомленя', | 12 | + 'You question' => 'Повідомленя', | 
| 13 | + 'About project' => 'Про проект', | ||
| 13 | 'Send' => 'Відправити', | 14 | 'Send' => 'Відправити', | 
| 14 | 'Contact us!' => 'Зв\'яжіться з нами', | 15 | 'Contact us!' => 'Зв\'яжіться з нами', | 
| 15 | 'Go to contact page' => 'Перейти до сторінки контактів', | 16 | 'Go to contact page' => 'Перейти до сторінки контактів', | 
frontend/views/blog/_article.php
| @@ -38,7 +38,7 @@ | @@ -38,7 +38,7 @@ | ||
| 38 | ) ?>"><?= $model->title; ?></a></h2> | 38 | ) ?>"><?= $model->title; ?></a></h2> | 
| 39 | <div class="clearfix"> | 39 | <div class="clearfix"> | 
| 40 | <?php if (empty($model->categories)) { ?> | 40 | <?php if (empty($model->categories)) { ?> | 
| 41 | - <p class="author-category">Без категории </p> | 41 | +<!-- <p class="author-category">Без категории </p>--> | 
| 42 | <?php } else { | 42 | <?php } else { | 
| 43 | $i = 0; | 43 | $i = 0; | 
| 44 | foreach ($model->categories as $category) { | 44 | foreach ($model->categories as $category) { | 
frontend/views/blog/index.php
| @@ -60,25 +60,25 @@ _________________________________________________________ --> | @@ -60,25 +60,25 @@ _________________________________________________________ --> | ||
| 60 | 60 | ||
| 61 | <!-- *** MENUS AND WIDGETS *** | 61 | <!-- *** MENUS AND WIDGETS *** | 
| 62 | _________________________________________________________ --> | 62 | _________________________________________________________ --> | 
| 63 | - <div class="panel panel-default sidebar-menu"> | ||
| 64 | - | ||
| 65 | - <div class="panel-heading"> | ||
| 66 | - <h3 class="panel-title"><?=\Yii::t('app', 'Company Blog')?></h3> | ||
| 67 | - </div> | ||
| 68 | - | ||
| 69 | - <div class="panel-body text-widget"> | ||
| 70 | - <p> | ||
| 71 | - <?=\Yii::t('app', 'blog-txt')?> | ||
| 72 | - </p> | ||
| 73 | - | ||
| 74 | - </div> | ||
| 75 | - </div> | 63 | +<!-- <div class="panel panel-default sidebar-menu">--> | 
| 64 | +<!-- --> | ||
| 65 | +<!-- <div class="panel-heading">--> | ||
| 66 | +<!-- <h3 class="panel-title">--><?//=\Yii::t('app', 'Company Blog')?><!--</h3>--> | ||
| 67 | +<!-- </div>--> | ||
| 68 | +<!-- --> | ||
| 69 | +<!-- <div class="panel-body text-widget">--> | ||
| 70 | +<!-- <p>--> | ||
| 71 | +<!-- --><?//=\Yii::t('app', 'blog-txt')?> | ||
| 72 | +<!-- </p>--> | ||
| 73 | +<!-- --> | ||
| 74 | +<!-- </div>--> | ||
| 75 | +<!-- </div>--> | ||
| 76 | 76 | ||
| 77 | <!-- --><?//= BlogSearch::widget(); ?> | 77 | <!-- --><?//= BlogSearch::widget(); ?> | 
| 78 | <?php if (!empty($categories)) { ?> | 78 | <?php if (!empty($categories)) { ?> | 
| 79 | <div class="panel panel-default sidebar-menu"> | 79 | <div class="panel panel-default sidebar-menu"> | 
| 80 | 80 | ||
| 81 | - <div class="panel-heading"> | 81 | + <div class="p anel-heading"> | 
| 82 | <h3 class="panel-title"><?=\Yii::t('app', 'Categories')?></h3> | 82 | <h3 class="panel-title"><?=\Yii::t('app', 'Categories')?></h3> | 
| 83 | </div> | 83 | </div> | 
| 84 | 84 | ||
| @@ -103,24 +103,26 @@ _________________________________________________________ --> | @@ -103,24 +103,26 @@ _________________________________________________________ --> | ||
| 103 | } | 103 | } | 
| 104 | if(!empty($tags)){ | 104 | if(!empty($tags)){ | 
| 105 | ?> | 105 | ?> | 
| 106 | - <div class="panel sidebar-menu"> | ||
| 107 | - <div class="panel-heading"> | ||
| 108 | - <h3 class="panel-title"><?=\Yii::t('app', 'Search by tag')?></h3> | ||
| 109 | - </div> | 106 | +<!-- <div class="panel sidebar-menu">--> | 
| 107 | +<!-- <div class="panel-heading">--> | ||
| 108 | +<!-- <h3 class="panel-title">--><?//=\Yii::t('app', 'Search by tag')?><!--</h3>--> | ||
| 109 | +<!-- </div>--> | ||
| 110 | +<!----> | ||
| 111 | +<!-- <div class="panel-body">--> | ||
| 112 | +<!-- <ul class="tag-cloud">--> | ||
| 113 | +<!-- --><?php //foreach ($tags as $tag) { ?> | ||
| 114 | +<!-- <li><a href="--><?//= Url::to( | ||
| 115 | +// [ | ||
| 116 | +// 'alias' => $tag->alias | ||
| 117 | +// ] | ||
| 118 | +// ) ?><!--"><i class="fa fa-tag"></i> --> | ||
| 110 | 119 | ||
| 111 | - <div class="panel-body"> | ||
| 112 | - <ul class="tag-cloud"> | ||
| 113 | - <?php foreach ($tags as $tag) { ?> | ||
| 114 | - <li><a href="<?= Url::to( | ||
| 115 | - [ | ||
| 116 | - 'alias' => $tag->alias | ||
| 117 | - ] | ||
| 118 | - ) ?>"><i class="fa fa-tag"></i> <?= $tag->label; ?></a> | ||
| 119 | - </li> | ||
| 120 | - <?php } ?> | ||
| 121 | - </ul> | ||
| 122 | - </div> | ||
| 123 | - </div> | 120 | + <!--</a>--> | 
| 121 | +<!-- </li>--> | ||
| 122 | +<!-- --><?php //} ?> | ||
| 123 | +<!-- </ul>--> | ||
| 124 | +<!-- </div>--> | ||
| 125 | +<!-- </div>--> | ||
| 124 | <?php | 126 | <?php | 
| 125 | } | 127 | } | 
| 126 | ?> | 128 | ?> | 
frontend/views/gallery/index.php
| @@ -18,7 +18,10 @@ | @@ -18,7 +18,10 @@ | ||
| 18 | <div class="col-md-12"> | 18 | <div class="col-md-12"> | 
| 19 | <div class="my-gallery" itemscope itemtype="http://schema.org/ImageGallery"> | 19 | <div class="my-gallery" itemscope itemtype="http://schema.org/ImageGallery"> | 
| 20 | <?php foreach ($images as $gallery){?> | 20 | <?php foreach ($images as $gallery){?> | 
| 21 | + | ||
| 22 | + | ||
| 21 | <figure class="reviews_gallery"> | 23 | <figure class="reviews_gallery"> | 
| 24 | + <figcaption class="image_figcapture"> <?=$gallery->language->title;?></figcaption> | ||
| 22 | <a href="<?=$gallery->image->getUrl()?>" itemprop="contentUrl" data-size="<?= getimagesize( | 25 | <a href="<?=$gallery->image->getUrl()?>" itemprop="contentUrl" data-size="<?= getimagesize( | 
| 23 | $gallery->image->getPath() | 26 | $gallery->image->getPath() | 
| 24 | )[ 0 ] ?>x<?= getimagesize($gallery->image->getPath() | 27 | )[ 0 ] ?>x<?= getimagesize($gallery->image->getPath() | 
frontend/views/site/about.php
frontend/web/css/site.css
| @@ -118,3 +118,8 @@ a.desc:after { | @@ -118,3 +118,8 @@ a.desc:after { | ||
| 118 | .nav > li > form > button.logout:focus { | 118 | .nav > li > form > button.logout:focus { | 
| 119 | outline: none; | 119 | outline: none; | 
| 120 | } | 120 | } | 
| 121 | +/** figcapture в gallery/index */ | ||
| 122 | +.image_figcapture | ||
| 123 | +{ | ||
| 124 | + font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif; | ||
| 125 | +} | ||
| 121 | \ No newline at end of file | 126 | \ No newline at end of file | 
