From 24af1c1a50d8d9f1abc25d014580106e036d8f82 Mon Sep 17 00:00:00 2001
From: dozer111 <alkhonko@gmail.com>
Date: Tue, 3 Jul 2018 13:54:40 +0300
Subject: [PATCH] Убрал с новостей правый блок, добавит h2 к описанию проекта

---
 common/messages/en/app.php       |  1 +
 common/messages/ru/app.php       |  4 ++--
 common/messages/ua/app.php       |  3 ++-
 frontend/views/blog/_article.php |  2 +-
 frontend/views/blog/index.php    | 64 +++++++++++++++++++++++++++++++++-------------------------------
 frontend/views/gallery/index.php |  3 +++
 frontend/views/site/about.php    |  2 +-
 frontend/web/css/site.css        |  5 +++++
 8 files changed, 48 insertions(+), 36 deletions(-)

diff --git a/common/messages/en/app.php b/common/messages/en/app.php
index 9858671..4908666 100644
--- a/common/messages/en/app.php
+++ b/common/messages/en/app.php
@@ -2,6 +2,7 @@
     return [
         'Address' => 'Address',
         'About' => 'About',
+	    'About project'                                => 'About project',
         'blog-txt' => 'We collect useful materials on household appliances and electronics',
         'Blog'=>'Blog',
         'Company Blog' => 'Company Blog',
diff --git a/common/messages/ru/app.php b/common/messages/ru/app.php
index 2767c0f..d0afdd0 100644
--- a/common/messages/ru/app.php
+++ b/common/messages/ru/app.php
@@ -6,7 +6,6 @@ return [
 
     'Home'                                         => 'Главная',
     'Contacts'                                     => 'Контакты',
-    'About'                                        => 'О нас',
 
     'Events'                                       => 'Мероприятия',
     'You question'                                 => 'Сообщение',
@@ -39,7 +38,8 @@ return [
 	'Empty dataProvider'                           => 'Ничего не найдено',
 
 
-
+	'About'                                        => 'О нас',
+	'About project'                                => 'О проекте',
     'Send'                                         => 'Отправить',
 	'<i class="fa fa-envelope-o"></i>Send Message' => 'Отправить сообщение',
     'Empty field'                                  => 'Поле является обязательным для заполнения',
diff --git a/common/messages/ua/app.php b/common/messages/ua/app.php
index 29909c5..b380499 100644
--- a/common/messages/ua/app.php
+++ b/common/messages/ua/app.php
@@ -9,7 +9,8 @@ return [
     'Name'               => 'Ім\'я',
     'Phone'              => 'Телефон',
     'Message'            => 'Повідомленя',
-    'You question'       => 'Повідомленя',
+    'You question'                                 => 'Повідомленя',
+	'About project'                                => 'Про проект',
     'Send'               => 'Відправити',
     'Contact us!'        => 'Зв\'яжіться з нами',
     'Go to contact page' => 'Перейти до сторінки контактів',
diff --git a/frontend/views/blog/_article.php b/frontend/views/blog/_article.php
index 235893f..17bcd82 100755
--- a/frontend/views/blog/_article.php
+++ b/frontend/views/blog/_article.php
@@ -38,7 +38,7 @@
           ) ?>"><?= $model->title; ?></a></h2>
       <div class="clearfix">
           <?php if (empty($model->categories)) { ?>
-            <p class="author-category">Без категории </p>
+<!--            <p class="author-category">Без категории </p>-->
           <?php } else {
               $i = 0;
               foreach ($model->categories as $category) {
diff --git a/frontend/views/blog/index.php b/frontend/views/blog/index.php
index 5cb9820..bb08791 100755
--- a/frontend/views/blog/index.php
+++ b/frontend/views/blog/index.php
@@ -60,25 +60,25 @@ _________________________________________________________ -->
         
         <!-- *** MENUS AND WIDGETS ***
 _________________________________________________________ -->
-        <div class="panel panel-default sidebar-menu">
-          
-          <div class="panel-heading">
-            <h3 class="panel-title"><?=\Yii::t('app', 'Company Blog')?></h3>
-          </div>
-          
-          <div class="panel-body text-widget">
-            <p>
-                <?=\Yii::t('app', 'blog-txt')?>
-            </p>
-          
-          </div>
-        </div>
+<!--        <div class="panel panel-default sidebar-menu">-->
+<!--          -->
+<!--          <div class="panel-heading">-->
+<!--            <h3 class="panel-title">--><?//=\Yii::t('app', 'Company Blog')?><!--</h3>-->
+<!--          </div>-->
+<!--          -->
+<!--          <div class="panel-body text-widget">-->
+<!--            <p>-->
+<!--                --><?//=\Yii::t('app', 'blog-txt')?>
+<!--            </p>-->
+<!--          -->
+<!--          </div>-->
+<!--        </div>-->           
     
 <!--          --><?//= BlogSearch::widget(); ?>
           <?php if (!empty($categories)) { ?>
               <div class="panel panel-default sidebar-menu">
 
-                  <div class="panel-heading">
+                  <div class="p                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             anel-heading">
                       <h3 class="panel-title"><?=\Yii::t('app', 'Categories')?></h3>
                   </div>
 
@@ -103,24 +103,26 @@ _________________________________________________________ -->
           }
             if(!empty($tags)){
                 ?>
-                <div class="panel sidebar-menu">
-                    <div class="panel-heading">
-                        <h3 class="panel-title"><?=\Yii::t('app', 'Search by tag')?></h3>
-                    </div>
+<!--                <div class="panel sidebar-menu">-->
+<!--                    <div class="panel-heading">-->
+<!--                        <h3 class="panel-title">--><?//=\Yii::t('app', 'Search by tag')?><!--</h3>-->
+<!--                    </div>-->
+<!---->
+<!--                    <div class="panel-body">-->
+<!--                        <ul class="tag-cloud">-->
+<!--                            --><?php //foreach ($tags as $tag) { ?>
+<!--                                <li><a href="--><?//= Url::to(
+//                                        [
+//                                            'alias' => $tag->alias
+//                                        ]
+//                                    ) ?><!--"><i class="fa fa-tag"></i>&#160-->
 
-                    <div class="panel-body">
-                        <ul class="tag-cloud">
-                            <?php foreach ($tags as $tag) { ?>
-                                <li><a href="<?= Url::to(
-                                        [
-                                            'alias' => $tag->alias
-                                        ]
-                                    ) ?>"><i class="fa fa-tag"></i>&#160<?= $tag->label; ?></a>
-                                </li>
-                            <?php } ?>
-                        </ul>
-                    </div>
-                </div>
+                <!--</a>-->
+<!--                                </li>-->
+<!--                            --><?php //} ?>
+<!--                        </ul>-->
+<!--                    </div>-->
+<!--                </div>-->
           <?php
             }
         ?>
diff --git a/frontend/views/gallery/index.php b/frontend/views/gallery/index.php
index 9ed0f40..ab55c0a 100644
--- a/frontend/views/gallery/index.php
+++ b/frontend/views/gallery/index.php
@@ -18,7 +18,10 @@
             <div class="col-md-12">
                 <div class="my-gallery" itemscope itemtype="http://schema.org/ImageGallery">
                     <?php foreach ($images as $gallery){?>
+
+
                     <figure class="reviews_gallery">
+                        <figcaption class="image_figcapture"> <?=$gallery->language->title;?></figcaption>
                         <a href="<?=$gallery->image->getUrl()?>" itemprop="contentUrl" data-size="<?= getimagesize(
                                                                                                           $gallery->image->getPath()
                                                                                                       )[ 0 ] ?>x<?= getimagesize($gallery->image->getPath()
diff --git a/frontend/views/site/about.php b/frontend/views/site/about.php
index 78919af..f57d48f 100755
--- a/frontend/views/site/about.php
+++ b/frontend/views/site/about.php
@@ -18,7 +18,7 @@
                 <div class="col-md-12">
 
                     <div class="heading">
-                        
+                        <h2><?=\Yii::t('app','About project');?></h2>
                     </div>
 
                     <p class="lead">
diff --git a/frontend/web/css/site.css b/frontend/web/css/site.css
index 5f1e6b9..4cd6281 100644
--- a/frontend/web/css/site.css
+++ b/frontend/web/css/site.css
@@ -118,3 +118,8 @@ a.desc:after {
 .nav > li > form > button.logout:focus {
     outline: none;
 }
+/** figcapture в gallery/index */
+.image_figcapture
+{
+    font-family: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+}
\ No newline at end of file
--
libgit2 0.21.4