Commit cefc2aa650d4c9f9d463e9c97a6a09c08e280f8b

Authored by Yarik
1 parent 713ccea4

test

common/behaviors/ShowImage.php
... ... @@ -84,4 +84,12 @@
84 84  
85 85 }
86 86  
  87 + public function ShowAvatar($dir, $width, $height = NULL) {
  88 + if(empty($dir)) {
  89 + return '/images/avatar-bg.png';
  90 + } else {
  91 + return $this->minImg($dir, $width, $height);
  92 + }
  93 + }
  94 +
87 95 }
88 96 \ No newline at end of file
... ...
common/models/User.php
... ... @@ -471,7 +471,7 @@
471 471 array_splice($result, 2);
472 472 }
473 473  
474   - return implode(',', $result);
  474 + return implode('', $result);
475 475 }
476 476  
477 477 /**
... ...
common/models/UserInfo.php
... ... @@ -82,6 +82,7 @@
82 82 [
83 83 [
84 84 'email',
  85 + 'city',
85 86 ],
86 87 'required',
87 88 ],
... ...
frontend/views/accounts/general.php
... ... @@ -256,6 +256,7 @@
256 256 ],
257 257  
258 258 ],
  259 + 'remover' => true,
259 260 'multi' => false,
260 261 'gallery' => $user_info->image,
261 262 'name' => 'Выбрать файл',
... ...
frontend/views/layouts/company.php
... ... @@ -20,7 +20,7 @@
20 20 <?php
21 21 if($this->params[ 'company' ]->id != \Yii::$app->user->getId()) {
22 22 // Форма "оставить заявку"
23   - echo $this->render('//company/_feedback_company', ['company' => $this->params['company']]);
  23 + echo $this->render('//company/_feedback_company', [ 'company' => $this->params[ 'company' ] ]);
24 24 // Конец формы "оставить заявку"
25 25 if(!empty( \Yii::$app->user->identity )) {
26 26 ?>
... ... @@ -50,79 +50,88 @@
50 50 <div class="box-wr">
51 51 <div class="box-all">
52 52 <?php
53   - echo Menu::widget([
54   - 'options' => [
55   - 'class' => 'menu-content',
56   - ],
57   - 'activeCssClass' => 'active-menu-content',
58   - 'items' => [
59   - [
60   - 'label' => 'Общее',
61   - 'url' => [
62   - 'company/common',
63   - 'company_id' => $this->params[ 'company' ]->id,
64   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
65   - ],
  53 + $items = [
  54 + [
  55 + 'label' => 'Общее',
  56 + 'url' => [
  57 + 'company/common',
  58 + 'company_id' => $this->params[ 'company' ]->id,
  59 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
66 60 ],
67   - [
68   - 'label' => 'Выполненные работы',
69   - 'url' => [
70   - 'company/portfolio',
71   - 'company_id' => $this->params[ 'company' ]->id,
72   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
73   - ],
74   - 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
  61 + ],
  62 + [
  63 + 'label' => 'Выполненные работы',
  64 + 'url' => [
  65 + 'company/portfolio',
  66 + 'company_id' => $this->params[ 'company' ]->id,
  67 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
75 68 ],
76   - [
77   - 'label' => 'Заказанные работы',
78   - 'url' => [
79   - 'company/projects',
80   - 'company_id' => $this->params[ 'company' ]->id,
81   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
82   - ],
83   - 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false,
  69 + 'active' => preg_match('/^portfolio.*$/', $this->context->action->id) ? true : false,
  70 + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
  71 + ],
  72 + [
  73 + 'label' => 'Заказанные работы',
  74 + 'url' => [
  75 + 'company/projects',
  76 + 'company_id' => $this->params[ 'company' ]->id,
  77 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
84 78 ],
85   - [
86   - 'label' => 'Команда',
87   - 'url' => [
88   - 'company/team',
89   - 'company_id' => $this->params[ 'company' ]->id,
90   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
91   - ],
  79 + 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false,
  80 + 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false,
  81 + ],
  82 + [
  83 + 'label' => 'Вакансии',
  84 + 'url' => [
  85 + 'company/vacancy-list',
  86 + 'company_id' => $this->params[ 'company' ]->id,
  87 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
92 88 ],
93   - [
94   - 'label' => 'Вакансии',
95   - 'url' => [
96   - 'company/vacancy-list',
97   - 'company_id' => $this->params[ 'company' ]->id,
98   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
99   - ],
  89 + 'active' => preg_match('/^vacancy.*$/', $this->context->action->id) ? true : false,
  90 + ],
  91 + [
  92 + 'label' => 'Мнения',
  93 + 'url' => [
  94 + 'company/review',
  95 + 'company_id' => $this->params[ 'company' ]->id,
  96 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
100 97 ],
101   - [
102   - 'label' => 'Блог',
103   - 'url' => [
104   - 'company/blog-list',
105   - 'company_id' => $this->params[ 'company' ]->id,
106   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
  98 + ],
  99 + ];
  100 + if(empty($this->params['type']) || $this->params[ 'type' ] == 'implementer') {
  101 + $items = array_merge($items, [
  102 + [
  103 + 'label' => 'Команда',
  104 + 'url' => [
  105 + 'company/team',
  106 + 'company_id' => $this->params[ 'company' ]->id,
  107 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
  108 + ],
107 109 ],
108   - ],
109   - [
110   - 'label' => 'Мнения',
111   - 'url' => [
112   - 'company/review',
113   - 'company_id' => $this->params[ 'company' ]->id,
114   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
  110 + [
  111 + 'label' => 'Блог',
  112 + 'url' => [
  113 + 'company/blog-list',
  114 + 'company_id' => $this->params[ 'company' ]->id,
  115 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
  116 + ],
  117 + 'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false,
115 118 ],
116   - ],
117   - [
118   - 'label' => 'Галерея',
119   - 'url' => [
120   - 'company/gallery',
121   - 'company_id' => $this->params[ 'company' ]->id,
122   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
  119 + [
  120 + 'label' => 'Галерея',
  121 + 'url' => [
  122 + 'company/gallery',
  123 + 'company_id' => $this->params[ 'company' ]->id,
  124 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
  125 + ],
123 126 ],
124   - ],
  127 + ]);
  128 + }
  129 + echo Menu::widget([
  130 + 'options' => [
  131 + 'class' => 'menu-content',
125 132 ],
  133 + 'activeCssClass' => 'active-menu-content',
  134 + 'items' => $items,
126 135 ]);
127 136 ?>
128 137 </div>
... ... @@ -140,7 +149,7 @@
140 149 <li class="activejob">
141 150 <?php
142 151 if($this->params[ 'company' ]->userInfo->is_freelancer xor $this->params[ 'company' ]->userInfo->is_customer) {
143   - if(!empty($this->params[ 'type' ]) && $this->params[ 'type' ] == 'customer') {
  152 + if(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer') {
144 153 echo Html::tag('span', 'Заказчик', [ 'class' => 'activejob_span' ]);
145 154 } else {
146 155 echo Html::tag('span', 'Исполнитель', [ 'class' => 'activejob_span' ]);
... ... @@ -211,7 +220,7 @@
211 220 }
212 221 ?>
213 222 </div>
214   - <div class="performer-vacancy-sidebar-img style"><?= Html::img($this->params[ 'company' ]->userInfo->image); ?></div>
  223 + <div class="performer-vacancy-sidebar-img style"><?= Html::img($this->params[ 'company' ]->userInfo->ShowAvatar($this->params[ 'company' ]->userInfo->image, 180)); ?></div>
215 224 <div class="performer-vacancy-sidebar-all style">
216 225 <?= $this->render('/patrial/social_list', [
217 226 'params' => $this->params,
... ...
frontend/views/layouts/gallery-company.php
... ... @@ -17,7 +17,7 @@
17 17 <?php
18 18 if($this->params[ 'company' ]->id != \Yii::$app->user->getId()) {
19 19 // Форма "оставить заявку"
20   - echo $this->render('//company/_feedback_company', ['company' => $this->params['company']]);
  20 + echo $this->render('//company/_feedback_company', [ 'company' => $this->params[ 'company' ] ]);
21 21 // Конец формы "оставить заявку"
22 22 if(!empty( \Yii::$app->user->identity )) {
23 23 ?>
... ... @@ -47,38 +47,55 @@
47 47 <div class="box-wr">
48 48 <div class="box-all">
49 49 <?php
50   - echo Menu::widget([
51   - 'options' => [
52   - 'class' => 'menu-content',
  50 + $items = [
  51 + [
  52 + 'label' => 'Общее',
  53 + 'url' => [
  54 + 'company/common',
  55 + 'company_id' => $this->params[ 'company' ]->id,
  56 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
  57 + ],
53 58 ],
54   - 'activeCssClass' => 'active-menu-content',
55   - 'items' => [
56   - [
57   - 'label' => 'Общее',
58   - 'url' => [
59   - 'company/common',
60   - 'company_id' => $this->params[ 'company' ]->id,
61   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
62   - ],
  59 + [
  60 + 'label' => 'Выполненные работы',
  61 + 'url' => [
  62 + 'company/portfolio',
  63 + 'company_id' => $this->params[ 'company' ]->id,
  64 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
63 65 ],
64   - [
65   - 'label' => 'Выполненные работы',
66   - 'url' => [
67   - 'company/portfolio',
68   - 'company_id' => $this->params[ 'company' ]->id,
69   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
70   - ],
71   - 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
  66 + 'active' => preg_match('/^portfolio.*$/', $this->context->action->id) ? true : false,
  67 + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
  68 + ],
  69 + [
  70 + 'label' => 'Заказанные работы',
  71 + 'url' => [
  72 + 'company/projects',
  73 + 'company_id' => $this->params[ 'company' ]->id,
  74 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
72 75 ],
73   - [
74   - 'label' => 'Заказанные работы',
75   - 'url' => [
76   - 'company/projects',
77   - 'company_id' => $this->params[ 'company' ]->id,
78   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
79   - ],
80   - 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false,
  76 + 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false,
  77 + 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false,
  78 + ],
  79 + [
  80 + 'label' => 'Вакансии',
  81 + 'url' => [
  82 + 'company/vacancy-list',
  83 + 'company_id' => $this->params[ 'company' ]->id,
  84 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
81 85 ],
  86 + 'active' => preg_match('/^vacancy.*$/', $this->context->action->id) ? true : false,
  87 + ],
  88 + [
  89 + 'label' => 'Мнения',
  90 + 'url' => [
  91 + 'company/review',
  92 + 'company_id' => $this->params[ 'company' ]->id,
  93 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
  94 + ],
  95 + ],
  96 + ];
  97 + if(empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer') {
  98 + $items = array_merge($items, [
82 99 [
83 100 'label' => 'Команда',
84 101 'url' => [
... ... @@ -88,28 +105,13 @@
88 105 ],
89 106 ],
90 107 [
91   - 'label' => 'Вакансии',
92   - 'url' => [
93   - 'company/vacancy-list',
94   - 'company_id' => $this->params[ 'company' ]->id,
95   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
96   - ],
97   - ],
98   - [
99 108 'label' => 'Блог',
100 109 'url' => [
101 110 'company/blog-list',
102 111 'company_id' => $this->params[ 'company' ]->id,
103 112 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
104 113 ],
105   - ],
106   - [
107   - 'label' => 'Мнения',
108   - 'url' => [
109   - 'company/review',
110   - 'company_id' => $this->params[ 'company' ]->id,
111   - 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
112   - ],
  114 + 'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false,
113 115 ],
114 116 [
115 117 'label' => 'Галерея',
... ... @@ -119,7 +121,14 @@
119 121 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
120 122 ],
121 123 ],
  124 + ]);
  125 + }
  126 + echo Menu::widget([
  127 + 'options' => [
  128 + 'class' => 'menu-content',
122 129 ],
  130 + 'activeCssClass' => 'active-menu-content',
  131 + 'items' => $items,
123 132 ]);
124 133 ?>
125 134 </div>
... ... @@ -137,7 +146,7 @@
137 146 <li class="activejob">
138 147 <?php
139 148 if($this->params[ 'company' ]->userInfo->is_freelancer xor $this->params[ 'company' ]->userInfo->is_customer) {
140   - if(!empty($this->params[ 'type' ]) && $this->params[ 'type' ] == 'customer') {
  149 + if(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer') {
141 150 echo Html::tag('span', 'Заказчик', [ 'class' => 'activejob_span' ]);
142 151 } else {
143 152 echo Html::tag('span', 'Исполнитель', [ 'class' => 'activejob_span' ]);
... ... @@ -209,7 +218,7 @@
209 218 ?>
210 219 </div>
211 220 <div class="performer-vacancy-sidebar-img style">
212   - <?= Html::img($this->params[ 'company' ]->userInfo->image); ?>
  221 + <?= Html::img($this->params[ 'company' ]->userInfo->ShowAvatar($this->params[ 'company' ]->userInfo->image, 180)); ?>
213 222 </div>
214 223 </div>
215 224 </div>
... ...
frontend/views/layouts/gallery.php
... ... @@ -75,6 +75,7 @@
75 75 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
76 76 ],
77 77 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
  78 + 'active' => preg_match('/^portfolio.*$/', $this->context->action->id) ? true : false,
78 79 ],
79 80 [
80 81 'label' => 'Заказанные работы',
... ... @@ -84,6 +85,7 @@
84 85 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
85 86 ],
86 87 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false,
  88 + 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false,
87 89 ],
88 90 [
89 91 'label' => 'Блог',
... ... @@ -92,6 +94,7 @@
92 94 'performer_id' => $this->params[ 'user' ]->id,
93 95 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
94 96 ],
  97 + 'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false,
95 98 ],
96 99 [
97 100 'label' => 'Мнения',
... ...
frontend/views/layouts/performer.php
... ... @@ -80,6 +80,7 @@
80 80 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
81 81 ],
82 82 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
  83 + 'active' => preg_match('/^portfolio.*$/', $this->context->action->id) ? true : false,
83 84 ],
84 85 [
85 86 'label' => 'Заказанные работы',
... ... @@ -89,6 +90,7 @@
89 90 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
90 91 ],
91 92 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false,
  93 + 'active' => preg_match('/^projects.*$/', $this->context->action->id) ? true : false,
92 94 ],
93 95 [
94 96 'label' => 'Блог',
... ... @@ -97,6 +99,7 @@
97 99 'performer_id' => $this->params[ 'user' ]->id,
98 100 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
99 101 ],
  102 + 'active' => preg_match('/^blog.*$/', $this->context->action->id) ? true : false,
100 103 ],
101 104 [
102 105 'label' => 'Мнения',
... ...
frontend/web/css/style.css
... ... @@ -2337,6 +2337,7 @@ input[type=file]::-webkit-file-upload-button {
2337 2337 float: left;
2338 2338 margin-top: 18px;
2339 2339 line-height: 16px;
  2340 + overflow: hidden;
2340 2341 }
2341 2342  
2342 2343 .performer-vacancy-sidebar-views ul li img {
... ... @@ -8841,6 +8842,10 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
8841 8842 text-align: center;
8842 8843 }
8843 8844  
  8845 +.admin-avatar-pattern .remover_image {
  8846 + left: 180px !important;
  8847 +}
  8848 +
8844 8849 .admin-pattern .file-help-1 {
8845 8850 display: none
8846 8851 }
... ...