Commit

Yarik
1 parent 7ae1fe78
Showing 2 changed files with 32 additions and 32 deletions Show diff stats
frontend/views/layouts/main.php
frontend/web/css/style.css
 <?php
-
+    
     /* @var $this \yii\web\View */
     /* @var $content string */
-
+    
     use common\modules\comment\models\CommentProject;
     use yii\helpers\Html;
     use yii\helpers\Url;
     use yii\widgets\Menu;
     use frontend\assets\AppAsset;
-
+    
     AppAsset::register($this);
 ?>
@@ -19,12 +19,12 @@
 <html lang="<?= Yii::$app->language ?>">
 <head>
-
-
+    
+    
     <meta charset="<?= Yii::$app->charset ?>">
-
+    
     <?= Html::csrfMetaTags() ?>
-
+    
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
@@ -50,27 +50,27 @@
                 <div class="header-cabinet-wr">
                     <?php
                         if(Yii::$app->user->isGuest): ?>
-                            <div class="header-cabinet-foto">
-
-                            </div>
+                            <div class="header-cabinet-foto"></div>
                             <div class="header-cabinet-profile not-login">Профиль</div>
                             <div>
-                                <?= Html::a('Вход', [ '/site/login' ], [ 'class' => 'loginLinkModal' ]) ?>
-                                <?= Html::a('Регистрация', [ '/site/registration' ]) ?>
+                                <?= Html::a('Вход', [ '/site/login' ], [ 'class' => 'loginLinkModal header-cabinet-link' ]) ?>
+                                <?= Html::a('Регистрация', [ '/site/registration' ], ['class' => 'header-cabinet-link']) ?>
                             </div>
-
+                        
                         <?php else : ?>
-                            <div class="header-cabinet-foto">
-                                <?php
-                                    if(!empty( \Yii::$app->user->identity->userInfo->image )) {
-                                        echo Html::img(Yii::$app->user->identity->minImg(Yii::$app->user->identity->userInfo->image, 48, 48));
-                                    }
-                                ?>
-                            </div>
+                            <a href="<?php echo \Yii::$app->user->identity->getLink(); ?>">
+                                <div class="header-cabinet-foto">
+                                    <?php
+                                        if(!empty( \Yii::$app->user->identity->userInfo->image )) {
+                                            echo Html::a(Html::img(Yii::$app->user->identity->minImg(Yii::$app->user->identity->userInfo->image, 48, 48)), \Yii::$app->user->identity->getLink());
+                                        }
+                                    ?>
+                                </div>
+                            </a>
                             <div class="header-cabinet-profile">Профиль</div>
-                            <?= Html::a(Yii::$app->user->identity->email, [ '/accounts' ]) ?>
+                            <?= Html::a(Yii::$app->user->identity->email, [ '/accounts' ], ['class' => 'header-cabinet-link']) ?>
                         <?php endif; ?>
-
+                
                 </div>
             </div>
         </div>
@@ -140,7 +140,7 @@
                     </div>
                 </li>
             </ul>
-
+            
             <div class="search-main-menu">
                 <form action="<?= Url::to([ 'search/common' ]) ?>" method="get">
                     <input value="" name="query" type="text"/>
@@ -169,15 +169,15 @@
                         'items'       => [
                             [
                                 'url'      => [ '/projects' ],
-                                'template' => '<a href="{url}" class="main-menu-icons-home">'.((!empty(\Yii::$app->user->identity->commentProjectsActive))?('<span>' . count(\Yii::$app->user->identity->commentProjectsActive) . '</span>'):('')).'</a>',
+                                'template' => '<a href="{url}" class="main-menu-icons-home">' . ( ( !empty( \Yii::$app->user->identity->commentProjectsActive ) ) ? ( '<span>' . count(\Yii::$app->user->identity->commentProjectsActive) . '</span>' ) : ( '' ) ) . '</a>',
                             ],
                             [
                                 'url'      => [ 'chat/list' ],
-                                'template' => '<a href="{url}" class="main-menu-icons-edit">'.((!empty(\Yii::$app->user->identity->newMessagesCount))?('<span>' . \Yii::$app->user->identity->newMessagesCount . '</span>'):('')).'</a>',
+                                'template' => '<a href="{url}" class="main-menu-icons-edit">' . ( ( !empty( \Yii::$app->user->identity->newMessagesCount ) ) ? ( '<span>' . \Yii::$app->user->identity->newMessagesCount . '</span>' ) : ( '' ) ) . '</a>',
                             ],
                             [
                                 'url'      => [ '/bookmarks' ],
-                                'template' => '<a href="{url}" class="main-menu-icons-copy">'.((!empty(\Yii::$app->user->identity->bookmarks))?('<span>' . count(\Yii::$app->user->identity->bookmarks) . '</span>'):('')).'</a>',
+                                'template' => '<a href="{url}" class="main-menu-icons-copy">' . ( ( !empty( \Yii::$app->user->identity->bookmarks ) ) ? ( '<span>' . count(\Yii::$app->user->identity->bookmarks) . '</span>' ) : ( '' ) ) . '</a>',
                             ],
                         ],
                     ]);
@@ -229,7 +229,7 @@
                             unset( $items );
                         ?>
                     </div>
-
+                    
                     <div class="footer-menu-wrapper second-footer-menu">
                         <?php
                             $items = [
@@ -282,7 +282,7 @@
                             <div class="footer-menu-project-ico-txt">новые проекты</div>
                         </div>
                     </div>
-
+                    
                     <div class="footer-menu-wrapper third-footer-menu">
                         <?php
                             $items = [
@@ -339,7 +339,7 @@
                             <div class="footer-menu-project-ico-txt">новости сервера</div>
                         </div>
                     </div>
-
+                    
                     <div class="footer-menu-wrapper last-footer-menu">
                         <?php
                             /* No content
@@ -381,12 +381,12 @@
                             */
                         ?>
                     </div>
-
+                
                 </div>
             </div>
         </div>
     </div>
-
+    
     <div class="section-box artweb-footer-all">
         <div class="box-wr">
             <div class="box-all">
@@ -287,7 +287,7 @@ ul.header-contacts-menu li:last-child a {
     margin-left: 13px;
 }
-.header-cabinet-wr a {
+.header-cabinet-wr a.header-cabinet-link {
     float: left;
     text-decoration: none;
     color: #0072bc;