From ad81f2277d81bb02b1de75c2322a3aa2ca54874c Mon Sep 17 00:00:00 2001
From: Веталь <icemate.job@gmail.com>
Date: Thu, 29 Dec 2016 14:17:22 +0200
Subject: [PATCH] 29.12.2016

---
 frontend/views/chat/message.php   | 85 ++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------
 frontend/views/layouts/main.php   | 81 ++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
 frontend/web/images/soc-ico-6.png | Bin 0 -> 4039 bytes
 3 files changed, 92 insertions(+), 74 deletions(-)
 create mode 100644 frontend/web/images/soc-ico-6.png

diff --git a/frontend/views/chat/message.php b/frontend/views/chat/message.php
index f8dbfe0..f4476f6 100755
--- a/frontend/views/chat/message.php
+++ b/frontend/views/chat/message.php
@@ -114,50 +114,57 @@
                         </div>
                     </div>
                     <div class="cabinet-message-read-wr style">
-                        <div class="comments_block">
-                            <div class="content">
-                                <?php foreach($chat->messages as $message): ?>
-                                    <?php if($message->isMy()): ?>
-                                        <div class="comment right">
-                                            <div class="author_pic"><?= Html::a(Html::img($message->user->minImg($message->user->image, 48, 48)), User::findIdentity($message->user_id)->link, ['target' => '_blank']); ?></div>
-                                            <div class="comment_text">
-                                                <?= $message->text ?>
-                                                <div class="comment_time">
-                                                    <?= $message->date ?>
+                        <?php
+                        if(!empty($chat->messages)) {
+                            ?>
+                            <div class="comments_block">
+                                <div class="content">
+                                    <?php foreach($chat->messages as $message): ?>
+
+                                        <?php if($message->isMy()): ?>
+                                            <div class="comment right">
+                                                <div class="author_pic"><?= Html::a(Html::img($message->user->minImg($message->user->image, 48, 48)), User::findIdentity($message->user_id)->link, ['target' => '_blank']); ?></div>
+                                                <div class="comment_text">
+                                                    <?= $message->text ?>
+                                                    <div class="comment_time">
+                                                        <?= $message->date ?>
+                                                    </div>
                                                 </div>
+                                                <?php if($message->filesList): ?>
+                                                    <div class="offer_link">
+                                                        <?php foreach($message->filesList as $file): ?>
+                                                            <?= Html::a($file->name, $file->dir, [ 'target' => '_blank' ]); ?>
+                                                        <?php endforeach; ?>
+                                                    </div>
+                                                <?php endif; ?>
+                                                <div style="clear:both;"></div>
                                             </div>
-                                            <?php if($message->filesList): ?>
-                                                <div class="offer_link">
-                                                    <?php foreach($message->filesList as $file): ?>
-                                                        <?= Html::a($file->name, $file->dir, [ 'target' => '_blank' ]); ?>
-                                                    <?php endforeach; ?>
-                                                </div>
-                                            <?php endif; ?>
-                                            <div style="clear:both;"></div>
-                                        </div>
-                                    <?php else: $message->status = $message::READ_MESSAGE; $message->update();?>
-                                        <div class="comment left">
-                                            <div class="author_pic"><?= Html::a(Html::img($message->user->minImg($message->user->image, 48, 48)), User::findIdentity($message->user_id)->link, ['target' => '_blank']); ?></div>
-                                            <div class="comment_text">
-                                                <?= $message->text ?>
-                                                <div class="comment_time">
-                                                    <?= $message->date ?>
+                                        <?php else: $message->status = $message::READ_MESSAGE; $message->update();?>
+                                            <div class="comment left">
+                                                <div class="author_pic"><?= Html::a(Html::img($message->user->minImg($message->user->image, 48, 48)), User::findIdentity($message->user_id)->link, ['target' => '_blank']); ?></div>
+                                                <div class="comment_text">
+                                                    <?= $message->text ?>
+                                                    <div class="comment_time">
+                                                        <?= $message->date ?>
+                                                    </div>
                                                 </div>
+                                                <?php if($message->filesList): ?>
+                                                    <div class="offer_link">
+                                                        <?php foreach($message->filesList as $file): ?>
+                                                            <?= Html::a($file->name, $file->dir, [ 'target' => '_blank' ]); ?>
+                                                        <?php endforeach; ?>
+                                                    </div>
+                                                <?php endif; ?>
+                                                <div style="clear:both;"></div>
                                             </div>
-                                            <?php if($message->filesList): ?>
-                                                <div class="offer_link">
-                                                    <?php foreach($message->filesList as $file): ?>
-                                                        <?= Html::a($file->name, $file->dir, [ 'target' => '_blank' ]); ?>
-                                                    <?php endforeach; ?>
-                                                </div>
-                                            <?php endif; ?>
-                                            <div style="clear:both;"></div>
-                                        </div>
-                                    <?php endif; ?>
-                                <?php endforeach; ?>
-                                <div style="height:20px;"></div>
+                                        <?php endif; ?>
+                                    <?php endforeach; ?>
+                                    <div style="height:20px;"></div>
+                                </div>
                             </div>
-                        </div>
+                        <?php
+                        }
+                        ?>
                         <div class="comment_type">
                             <?php $form = ActiveForm::begin([
                                 'method'  => 'post',
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index 4124717..d0d855b 100755
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -260,7 +260,7 @@
                             ]);
                             unset( $items );
                         ?>
-                        <div class="footer-menu-project">
+                        <div class="footer-menu-project" style="height: 50px;width: 258px;">
                             <?php
                                 echo Menu::widget([
                                     'options'      => [
@@ -274,17 +274,28 @@
                                     'linkTemplate' => '<a target="_blank" href="{url}">{label}</a>',
                                     'items'        => [
                                         [
-                                            'label' => "<img src='/images/soc-ico-1.png' alt=''/>",
-                                            'url'   => 'http://rss.com',
+                                            'label' => "<img src='/images/soc-ico-6.png' alt=''/>",
+                                            'url'   => 'https://www.instagram.com/proektant_net/',
                                         ],
                                         [
                                             'label' => "<img src='/images/soc-ico-2.png' alt=''/>",
-                                            'url'   => 'http://twitter.com',
+                                            'url'   => 'https://twitter.com/PROektant_net',
+                                        ],
+                                        [
+                                            'label' => "<img src='/images/soc-ico-3.png' alt=''/>",
+                                            'url'   => 'https://www.facebook.com/proektant',
+                                        ],
+                                        [
+                                            'label' => "<img src='/images/soc-ico-4.png' alt=''/>",
+                                            'url'   => 'https://vk.com/proektant',
+                                        ],
+                                        [
+                                            'label' => "<img src='/images/soc-ico-5.png' alt=''/>",
+                                            'url'   => 'https://plus.google.com/u/0/115070539531803354950',
                                         ],
                                     ],
                                 ]);
                             ?>
-                            <div class="footer-menu-project-ico-txt">новые проекты</div>
                         </div>
                     </div>
                     
@@ -313,36 +324,36 @@
                             ]);
                             unset( $items );
                         ?>
-                        <div class="footer-menu-project-two">
-                            <?php
-                                echo Menu::widget([
-                                    'options'      => [
-                                        'tag'   => 'div',
-                                        'class' => 'footer-menu-project-ico',
-                                    ],
-                                    'encodeLabels' => false,
-                                    'itemOptions'  => [
-                                        'tag' => false,
-                                    ],
-                                    'linkTemplate' => '<a target="_blank" href="{url}">{label}</a>',
-                                    'items'        => [
-                                        [
-                                            'label' => "<img src='/images/soc-ico-3.png' alt=''/>",
-                                            'url'   => 'http://fb.com',
-                                        ],
-                                        [
-                                            'label' => "<img src='/images/soc-ico-4.png' alt=''/>",
-                                            'url'   => 'http://vk.com',
-                                        ],
-                                        [
-                                            'label' => "<img src='/images/soc-ico-5.png' alt=''/>",
-                                            'url'   => 'http://plus.google.com',
-                                        ],
-                                    ],
-                                ]);
-                            ?>
-                            <div class="footer-menu-project-ico-txt">новости сервера</div>
-                        </div>
+<!--                        <div class="footer-menu-project-two">-->
+<!--                            --><?php
+//                                echo Menu::widget([
+//                                    'options'      => [
+//                                        'tag'   => 'div',
+//                                        'class' => 'footer-menu-project-ico',
+//                                    ],
+//                                    'encodeLabels' => false,
+//                                    'itemOptions'  => [
+//                                        'tag' => false,
+//                                    ],
+//                                    'linkTemplate' => '<a target="_blank" href="{url}">{label}</a>',
+//                                    'items'        => [
+//                                        [
+//                                            'label' => "<img src='/images/soc-ico-3.png' alt=''/>",
+//                                            'url'   => 'https://www.facebook.com/proektant',
+//                                        ],
+//                                        [
+//                                            'label' => "<img src='/images/soc-ico-4.png' alt=''/>",
+//                                            'url'   => 'https://vk.com/proektant',
+//                                        ],
+//                                        [
+//                                            'label' => "<img src='/images/soc-ico-5.png' alt=''/>",
+//                                            'url'   => 'https://plus.google.com/u/0/115070539531803354950',
+//                                        ],
+//                                    ],
+//                                ]);
+//                            ?>
+<!---->
+<!--                        </div>-->
                     </div>
                     
                     <div class="footer-menu-wrapper last-footer-menu">
diff --git a/frontend/web/images/soc-ico-6.png b/frontend/web/images/soc-ico-6.png
new file mode 100644
index 0000000..a623ae7
Binary files /dev/null and b/frontend/web/images/soc-ico-6.png differ
--
libgit2 0.21.4