From 716f52bf4fa8a78f72af00318c4ca7921bb15d62 Mon Sep 17 00:00:00 2001 From: yarik Date: Fri, 15 Jul 2016 12:30:53 +0300 Subject: [PATCH] Commit --- frontend/views/layouts/main.php | 62 +++++++++++++++++++++++++++++++------------------------------- frontend/web/css/style.css | 2 +- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index ec73744..b8cb99d 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -1,14 +1,14 @@ @@ -19,12 +19,12 @@ - - + + - + - + <?= Html::encode($this->title) ?> head() ?> @@ -50,27 +50,27 @@
user->isGuest): ?> -
- -
+
- 'loginLinkModal' ]) ?> - + 'loginLinkModal header-cabinet-link' ]) ?> + 'header-cabinet-link']) ?>
- + -
- user->identity->userInfo->image )) { - echo Html::img(Yii::$app->user->identity->minImg(Yii::$app->user->identity->userInfo->image, 48, 48)); - } - ?> -
+ +
+ 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()); + } + ?> +
+
Профиль
- user->identity->email, [ '/accounts' ]) ?> + user->identity->email, [ '/accounts' ], ['class' => 'header-cabinet-link']) ?> - +
@@ -140,7 +140,7 @@ - +
@@ -169,15 +169,15 @@ 'items' => [ [ 'url' => [ '/projects' ], - 'template' => ''.((!empty(\Yii::$app->user->identity->commentProjectsActive))?('' . count(\Yii::$app->user->identity->commentProjectsActive) . ''):('')).'', + 'template' => '' . ( ( !empty( \Yii::$app->user->identity->commentProjectsActive ) ) ? ( '' . count(\Yii::$app->user->identity->commentProjectsActive) . '' ) : ( '' ) ) . '', ], [ 'url' => [ 'chat/list' ], - 'template' => ''.((!empty(\Yii::$app->user->identity->newMessagesCount))?('' . \Yii::$app->user->identity->newMessagesCount . ''):('')).'', + 'template' => '' . ( ( !empty( \Yii::$app->user->identity->newMessagesCount ) ) ? ( '' . \Yii::$app->user->identity->newMessagesCount . '' ) : ( '' ) ) . '', ], [ 'url' => [ '/bookmarks' ], - 'template' => ''.((!empty(\Yii::$app->user->identity->bookmarks))?('' . count(\Yii::$app->user->identity->bookmarks) . ''):('')).'', + 'template' => '' . ( ( !empty( \Yii::$app->user->identity->bookmarks ) ) ? ( '' . count(\Yii::$app->user->identity->bookmarks) . '' ) : ( '' ) ) . '', ], ], ]); @@ -229,7 +229,7 @@ unset( $items ); ?>
- +
новые проекты
- +
новости сервера
- +
- + - +
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 2efbd52..5ad7571 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -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; -- libgit2 0.21.4