Commit 68d14cf67aa177122050c03663892ea2b0f65938

Authored by Administrator
2 parents 32fd32d6 2a817ac8

Merge remote-tracking branch 'origin/master'

frontend/views/bookmarks/bookmarks-project.php
@@ -17,14 +17,14 @@ @@ -17,14 +17,14 @@
17 <div class="box-wr"> 17 <div class="box-wr">
18 <div class="box-all"> 18 <div class="box-all">
19 <div class="left-search-work"> 19 <div class="left-search-work">
20 - <div class="search-performer-button-bookmark"><a>Проекты</a></div> 20 + <div class="search-performer-button-bookmark"><a>Закладки</a></div>
21 <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?> 21 <?= Html::a('Исполнители', [ 'bookmarks/performer' ], [ 'class' => 'search-performer-button-performers' ]) ?>
22 <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?> 22 <?= Html::a('Заказчики', [ 'bookmarks/customer' ], [ 'class' => 'search-performer-button-customers' ]) ?>
23 <?= Html::a('Проекты', [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?> 23 <?= Html::a('Проекты', [ 'bookmarks/project' ], [ 'class' => 'search-performer-button-project' ]) ?>
24 <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?> 24 <?= Html::a('Вакансии', [ 'bookmarks/vacancy' ], [ 'class' => 'search-performer-button-project' ]) ?>
25 </div> 25 </div>
26 <div class="right-search-work"> 26 <div class="right-search-work">
27 - <div class="search-worker-title style"><span>Заказчики</span></div> 27 + <div class="search-worker-title style"><span>Проекты</span></div>
28 <?= ListView::widget([ 28 <?= ListView::widget([
29 'dataProvider' => $dataProvider, 29 'dataProvider' => $dataProvider,
30 'itemView' => '@frontend/views/search/_projects_list_view', 30 'itemView' => '@frontend/views/search/_projects_list_view',
frontend/views/layouts/main.php
@@ -161,7 +161,7 @@ AppAsset::register($this); @@ -161,7 +161,7 @@ AppAsset::register($this);
161 'template' => '<a href="{url}" class="main-menu-icons-edit"><span>28</span></a>', 161 'template' => '<a href="{url}" class="main-menu-icons-edit"><span>28</span></a>',
162 ], 162 ],
163 [ 163 [
164 - 'url' => ['bookmarks/index'], 164 + 'url' => ['/bookmarks'],
165 'template' => "<a href='{url}' class='main-menu-icons-copy'><span>".count(\Yii::$app->user->identity->bookmarks)."</span></a>", 165 'template' => "<a href='{url}' class='main-menu-icons-copy'><span>".count(\Yii::$app->user->identity->bookmarks)."</span></a>",
166 ], 166 ],
167 ], 167 ],