Administrator / test_3

Commit 93a7a3c100973b96e33d83cc91bb37432b5b1054

Authored by Yarik
1 parent ad9c004b

test

Showing 24 changed files with 589 additions and 389 deletions   Show diff stats
Inline Side-by-side
common/models/TenderSearch.php
  Show/Hide comments   View file @93a7a3c
@@ -26,6 +26,8 @@ @@ -26,6 +26,8 @@
26 26
27 public $payment; 27 public $payment;
28 28
  29 + public $info;
  30 +
29 /** 31 /**
30 * @inheritdoc 32 * @inheritdoc
31 */ 33 */
@@ -44,6 +46,7 @@ @@ -44,6 +46,7 @@
44 [ 46 [
45 'city', 47 'city',
46 'payment', 48 'payment',
  49 + 'info',
47 ], 50 ],
48 'safe', 51 'safe',
49 ], 52 ],
@@ -87,13 +90,13 @@ @@ -87,13 +90,13 @@
87 public function attributeLabels() 90 public function attributeLabels()
88 { 91 {
89 return [ 92 return [
90 - 'specialization' => Yii::t('app', 'specialization'), 93 + 'specialization' => Yii::t('app', 'specialization'),
91 'budget_currency' => Yii::t('app', 'budget_currency'), 94 'budget_currency' => Yii::t('app', 'budget_currency'),
92 - 'contractual' => Yii::t('app', 'contractual'),  
93 - 'city' => Yii::t('app', 'city'),  
94 - 'payment' => Yii::t('app', 'payment'),  
95 - 'budget_from' => Yii::t('app', 'budget_from'),  
96 - 'budget_to' => Yii::t('app', 'budget_to'), 95 + 'contractual' => Yii::t('app', 'contractual'),
  96 + 'city' => Yii::t('app', 'city'),
  97 + 'payment' => Yii::t('app', 'payment'),
  98 + 'budget_from' => Yii::t('app', 'budget_from'),
  99 + 'budget_to' => Yii::t('app', 'budget_to'),
97 ]; 100 ];
98 } 101 }
99 102
@@ -196,6 +199,11 @@ @@ -196,6 +199,11 @@
196 'project_payment.payment_id' => $this->payment, 199 'project_payment.payment_id' => $this->payment,
197 'city' => $this->city, 200 'city' => $this->city,
198 ]) 201 ])
  202 + ->andFilterWhere([
  203 + 'like',
  204 + 'LOWER(project.name)',
  205 + mb_strtolower($this->info),
  206 + ])
199 ->andWhere([ 207 ->andWhere([
200 'project_payment.payment_id' => $this->payment, 208 'project_payment.payment_id' => $this->payment,
201 ]); 209 ]);
common/modules/comment/widgets/views/_project_comment_view.php
  Show/Hide comments   View file @93a7a3c
@@ -17,11 +17,11 @@ @@ -17,11 +17,11 @@
17 <div class="performer-vacancy-sidebar-left"> 17 <div class="performer-vacancy-sidebar-left">
18 <div class="performer-vacancy-sidebar-img style"> 18 <div class="performer-vacancy-sidebar-img style">
19 <?php 19 <?php
20 - if(!empty($user->userInfo->image)) {  
21 - echo Html::img($user->userInfo->image);  
22 - } else {  
23 - echo Html::img('/images/avatar-bg.png');  
24 - } 20 + if(!empty( $user->userInfo->image )) {
  21 + echo Html::img($user->userInfo->image);
  22 + } else {
  23 + echo Html::img('/images/avatar-bg.png');
  24 + }
25 ?> 25 ?>
26 </div> 26 </div>
27 <div class="performer-vacancy-sidebar-all style"> 27 <div class="performer-vacancy-sidebar-all style">
@@ -69,7 +69,9 @@ @@ -69,7 +69,9 @@
69 </div> 69 </div>
70 </li> 70 </li>
71 </ul> 71 </ul>
72 - <?= Html::a('ะŸะพัะผะพั‚ั€ะตั‚ัŒ ะฟั€ะพั„ะธะปัŒ', $user->link, [ 'class' => 'tender-see-profile style', 'target' => '_blank' ]) ?> 72 + <?= Html::a('ะŸะพัะผะพั‚ั€ะตั‚ัŒ ะฟั€ะพั„ะธะปัŒ', $user->link, [ 'class' => 'tender-see-profile style',
  73 + 'target' => '_blank',
  74 + ]) ?>
73 </div> 75 </div>
74 </div> 76 </div>
75 </div> 77 </div>
@@ -87,9 +89,15 @@ @@ -87,9 +89,15 @@
87 <div class="search-worker-blocks-title-title"><?= $user->name ?></div> 89 <div class="search-worker-blocks-title-title"><?= $user->name ?></div>
88 <?php 90 <?php
89 echo StarRating::widget([ 91 echo StarRating::widget([
90 - 'name' => 'rating_review_comment',  
91 - 'value' => $user->userInfo->rating,  
92 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 92 + 'name' => 'rating_review_comment',
  93 + 'value' => $user->userInfo->rating,
  94 + 'pluginOptions' => [
  95 + 'displayOnly' => true,
  96 + 'size' => 'xxs',
  97 + 'min' => 0,
  98 + 'max' => 10,
  99 + 'stars' => 10,
  100 + ],
93 ]); 101 ]);
94 ?> 102 ?>
95 <?= Html::a(count($user->comments) . ' ะพั‚ะทั‹ะฒะพะฒ', $user->getLink('review'), [ 'class' => 'link-to-comm' ]) ?> 103 <?= Html::a(count($user->comments) . ' ะพั‚ะทั‹ะฒะพะฒ', $user->getLink('review'), [ 'class' => 'link-to-comm' ]) ?>
@@ -104,8 +112,8 @@ @@ -104,8 +112,8 @@
104 <li> 112 <li>
105 <span></span> 113 <span></span>
106 <?= Html::a($file->name, $file->dir, [ 114 <?= Html::a($file->name, $file->dir, [
107 - 'class' => 'download-link-file',  
108 - 'download' => 'download' 115 + 'class' => 'download-link-file',
  116 + 'download' => 'download',
109 ]) ?> 117 ]) ?>
110 <?= Html::a('ะกะบะฐั‡ะฐั‚ัŒ', $file->dir, [ 118 <?= Html::a('ะกะบะฐั‡ะฐั‚ัŒ', $file->dir, [
111 'class' => 'download-link', 119 'class' => 'download-link',
@@ -122,68 +130,68 @@ @@ -122,68 +130,68 @@
122 <?= Html::a('ะšะพะฝั‚ะฐะบั‚ั‹', $user->link, [ 'class' => 'get-list-new' ]) ?> 130 <?= Html::a('ะšะพะฝั‚ะฐะบั‚ั‹', $user->link, [ 'class' => 'get-list-new' ]) ?>
123 131
124 <?php 132 <?php
125 - if($model->status == $model::STATUS_ANONYMOUS) {  
126 - echo Html::tag('div', 'ะะฝะพะฝะธะผะฝะพะต ะฟั€ะตะดะปะพะถะตะฝะธะต', [ 'class' => 'project_status' ]);  
127 - }  
128 - if(\Yii::$app->user->getId() == $model->owner->user_id) {  
129 - ?>  
130 - <div class="project_owner_state">  
131 - <p>  
132 - <?php  
133 - switch($model->state) {  
134 - case 1:  
135 - echo 'ะŸั€ะตะดะปะพะถะตะฝะธะต ะฝะต ั€ะฐััะผะพั‚ั€ะตะฝะพ';  
136 - break;  
137 - case 2:  
138 - echo 'ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ ะฟะพัั‚ะฐะฒะปะตะฝ ะฝะฐ ั€ะฐััะผะพั‚ั€ะตะฝะธะต';  
139 - break;  
140 - case 3:  
141 - echo 'ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ ะฝะฐะทะฝะฐั‡ะตะฝ ะธัะฟะพะปะฝะธั‚ะตะปะตะผ';  
142 - break;  
143 - case 4:  
144 - echo 'ะ’ั‹ ะพั‚ะบะฐะทะฐะปะธ ะดะฐะฝะฝะพะผัƒ ะธัะฟะพะปะฝะธั‚ะตะปัŽ';  
145 - break;  
146 - case 5:  
147 - echo 'ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ ะพั‚ะบะฐะทะฐะปัั ะพั‚ ะดะฐะฝะฝะพะณะพ ะฟั€ะตะดะปะพะถะตะฝะธั';  
148 - break;  
149 - }  
150 - ?>  
151 - </p>  
152 - </div>  
153 - <?php  
154 - if($model->state != $model::STATE_TRASH) { 133 + if($model->status == $model::STATUS_ANONYMOUS) {
  134 + echo Html::tag('div', 'ะะฝะพะฝะธะผะฝะพะต ะฟั€ะตะดะปะพะถะตะฝะธะต', [ 'class' => 'project_status' ]);
  135 + }
  136 + if(\Yii::$app->user->getId() == $model->owner->user_id) {
155 ?> 137 ?>
156 - <div class="project_owner_control">  
157 - <span>ะžั‚ะผะตั‚ะธั‚ัŒ ะบะฐะบ: </span>  
158 - <p class="new_mark_"></p>  
159 - <div> 138 + <div class="project_owner_state">
  139 + <p>
160 <?php 140 <?php
161 - echo Html::a('ะฝะพะฒั‹ะน', [ '#' ], [  
162 - 'data-project-id' => $model->owner->project_id,  
163 - 'data-comment-id' => $model->comment_id,  
164 - 'class' => 'artbox_project_make_new'.(($model->state == $model::STATE_NEW)?' active':''),  
165 - ]);  
166 - echo Html::a('ะบะฐะฝะดะธะดะฐั‚', [ '#' ], [  
167 - 'data-project-id' => $model->owner->project_id,  
168 - 'data-comment-id' => $model->comment_id,  
169 - 'class' => 'artbox_project_make_candidate'.(($model->state == $model::STATE_CANDIDATE)?' active':''),  
170 - ]);  
171 - echo Html::a('ะธัะฟะพะปะฝะธั‚ะตะปัŒ', [ '#' ], [  
172 - 'data-project-id' => $model->owner->project_id,  
173 - 'data-comment-id' => $model->comment_id,  
174 - 'class' => 'artbox_project_make_performer'.(($model->state == $model::STATE_PERFORMER)?' active':''),  
175 - ]);  
176 - echo Html::a('ะพั‚ะบะฐะทะฐั‚ัŒ', [ '#' ], [  
177 - 'data-project-id' => $model->owner->project_id,  
178 - 'data-comment-id' => $model->comment_id,  
179 - 'class' => 'artbox_project_make_deny'.(($model->state == $model::STATE_DENY)?' active':''),  
180 - ]); 141 + switch($model->state) {
  142 + case 1:
  143 + echo 'ะŸั€ะตะดะปะพะถะตะฝะธะต ะฝะต ั€ะฐััะผะพั‚ั€ะตะฝะพ';
  144 + break;
  145 + case 2:
  146 + echo 'ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ ะฟะพัั‚ะฐะฒะปะตะฝ ะฝะฐ ั€ะฐััะผะพั‚ั€ะตะฝะธะต';
  147 + break;
  148 + case 3:
  149 + echo 'ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ ะฝะฐะทะฝะฐั‡ะตะฝ ะธัะฟะพะปะฝะธั‚ะตะปะตะผ';
  150 + break;
  151 + case 4:
  152 + echo 'ะ’ั‹ ะพั‚ะบะฐะทะฐะปะธ ะดะฐะฝะฝะพะผัƒ ะธัะฟะพะปะฝะธั‚ะตะปัŽ';
  153 + break;
  154 + case 5:
  155 + echo 'ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ ะพั‚ะบะฐะทะฐะปัั ะพั‚ ะดะฐะฝะฝะพะณะพ ะฟั€ะตะดะปะพะถะตะฝะธั';
  156 + break;
  157 + }
181 ?> 158 ?>
182 - </div> 159 + </p>
183 </div> 160 </div>
184 <?php 161 <?php
  162 + if($model->state != $model::STATE_TRASH) {
  163 + ?>
  164 + <div class="project_owner_control">
  165 + <span>ะžั‚ะผะตั‚ะธั‚ัŒ ะบะฐะบ: </span>
  166 + <p class="new_mark_"></p>
  167 + <div>
  168 + <?php
  169 + echo Html::a('ะฝะพะฒั‹ะน', [ '#' ], [
  170 + 'data-project-id' => $model->owner->project_id,
  171 + 'data-comment-id' => $model->comment_id,
  172 + 'class' => 'artbox_project_make_new' . ( ( $model->state == $model::STATE_NEW ) ? ' active' : '' ),
  173 + ]);
  174 + echo Html::a('ะบะฐะฝะดะธะดะฐั‚', [ '#' ], [
  175 + 'data-project-id' => $model->owner->project_id,
  176 + 'data-comment-id' => $model->comment_id,
  177 + 'class' => 'artbox_project_make_candidate' . ( ( $model->state == $model::STATE_CANDIDATE ) ? ' active' : '' ),
  178 + ]);
  179 + echo Html::a('ะธัะฟะพะปะฝะธั‚ะตะปัŒ', [ '#' ], [
  180 + 'data-project-id' => $model->owner->project_id,
  181 + 'data-comment-id' => $model->comment_id,
  182 + 'class' => 'artbox_project_make_performer' . ( ( $model->state == $model::STATE_PERFORMER ) ? ' active' : '' ),
  183 + ]);
  184 + echo Html::a('ะพั‚ะบะฐะทะฐั‚ัŒ', [ '#' ], [
  185 + 'data-project-id' => $model->owner->project_id,
  186 + 'data-comment-id' => $model->comment_id,
  187 + 'class' => 'artbox_project_make_deny' . ( ( $model->state == $model::STATE_DENY ) ? ' active' : '' ),
  188 + ]);
  189 + ?>
  190 + </div>
  191 + </div>
  192 + <?php
  193 + }
185 } 194 }
186 - }  
187 ?> 195 ?>
188 </div> 196 </div>
189 197
common/modules/comment/widgets/views/_review_comment_view.php
  Show/Hide comments   View file @93a7a3c
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 * @var User $user 15 * @var User $user
16 */ 16 */
17 $user = $model->user; 17 $user = $model->user;
18 - $model->buildButtons(['delete']); 18 + $model->buildButtons([ 'delete' ]);
19 ?> 19 ?>
20 <div class="comments-name <?= CommentWidget::$baseClass[ 'comment_author' ] ?>"> 20 <div class="comments-name <?= CommentWidget::$baseClass[ 'comment_author' ] ?>">
21 <?= $model->getAuthor(' (ะ“ะพัั‚ัŒ)') ?> 21 <?= $model->getAuthor(' (ะ“ะพัั‚ัŒ)') ?>
@@ -31,9 +31,14 @@ @@ -31,9 +31,14 @@
31 <?php 31 <?php
32 if(!empty( $model->rating )) { 32 if(!empty( $model->rating )) {
33 echo StarRating::widget([ 33 echo StarRating::widget([
34 - 'name' => 'rating_review_comment',  
35 - 'value' => $model->rating->value,  
36 - 'pluginOptions' => ['displayOnly' => true] 34 + 'name' => 'rating_review_comment',
  35 + 'value' => $model->rating->value,
  36 + 'pluginOptions' => [
  37 + 'displayOnly' => true,
  38 + 'min' => 0,
  39 + 'max' => 10,
  40 + 'stars' => 10,
  41 + ],
37 ]); 42 ]);
38 } 43 }
39 ?> 44 ?>
@@ -43,7 +48,7 @@ @@ -43,7 +48,7 @@
43 <div> 48 <div>
44 <?php 49 <?php
45 if(!empty( $model->buttons[ 'delete' ] )) { 50 if(!empty( $model->buttons[ 'delete' ] )) {
46 - echo Html::a(($model->user_id != NULL && $model->user_id == \Yii::$app->user->id)?'ะฃะดะฐะปะธั‚ัŒ':'ะŸะพะถะฐะปะพะฒะฐั‚ัŒัั ', $model->buttons[ 'delete' ], [ 'class' => CommentWidget::$baseClass[ 'comment_delete' ] ]); 51 + echo Html::a(( $model->user_id != NULL && $model->user_id == \Yii::$app->user->id ) ? 'ะฃะดะฐะปะธั‚ัŒ' : 'ะŸะพะถะฐะปะพะฒะฐั‚ัŒัั ', $model->buttons[ 'delete' ], [ 'class' => CommentWidget::$baseClass[ 'comment_delete' ] ]);
47 } 52 }
48 if(!empty( $model->buttons[ 'update' ] )) { 53 if(!empty( $model->buttons[ 'update' ] )) {
49 echo Html::a('ะ ะตะดะฐะบั‚ะธั€ะพะฒะฐั‚ัŒ', $model->buttons[ 'update' ], [ 'class' => CommentWidget::$baseClass[ 'comment_update' ] ]); 54 echo Html::a('ะ ะตะดะฐะบั‚ะธั€ะพะฒะฐั‚ัŒ', $model->buttons[ 'update' ], [ 'class' => CommentWidget::$baseClass[ 'comment_update' ] ]);
common/modules/comment/widgets/views/form-comment-review.php
  Show/Hide comments   View file @93a7a3c
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 use yii\web\View; 11 use yii\web\View;
12 use yii\widgets\ActiveForm; 12 use yii\widgets\ActiveForm;
13 use yii\helpers\Html; 13 use yii\helpers\Html;
  14 +
14 ?> 15 ?>
15 <?php 16 <?php
16 if(!empty( $dataProvider )) { 17 if(!empty( $dataProvider )) {
@@ -32,7 +33,17 @@ @@ -32,7 +33,17 @@
32 } 33 }
33 echo $form->field(( !empty( $model->rating ) ? $model->rating : $rating ), 'value') 34 echo $form->field(( !empty( $model->rating ) ? $model->rating : $rating ), 'value')
34 ->label(false) 35 ->label(false)
35 - ->widget(StarRating::className(), ['pluginOptions' => ['size'=>'xxs', 'step' => 1, 'value' => 2, 'showCaption' => false]]); 36 + ->widget(StarRating::className(), [
  37 + 'pluginOptions' => [
  38 + 'size' => 'xxs',
  39 + 'step' => 1,
  40 + 'value' => 2,
  41 + 'showCaption' => false,
  42 + 'stars' => 10,
  43 + 'min' => 0,
  44 + 'max' => 10,
  45 + ],
  46 + ]);
36 if($model->scenario == $model::SCENARIO_GUEST) { 47 if($model->scenario == $model::SCENARIO_GUEST) {
37 echo $form->field($model, 'user_name', [ 48 echo $form->field($model, 'user_name', [
38 'options' => [ 49 'options' => [
@@ -56,7 +67,7 @@ @@ -56,7 +67,7 @@
56 if(!empty( $model->comment_pid )) { 67 if(!empty( $model->comment_pid )) {
57 echo Html::tag('div', Html::activeHiddenInput($model, 'comment_pid') . Html::tag('p', $model->parent->author, [ 'class' => 'artbox_comment_reply_author' ]), [ 'class' => CommentWidget::$baseClass[ 'reply_block' ] ]); 68 echo Html::tag('div', Html::activeHiddenInput($model, 'comment_pid') . Html::tag('p', $model->parent->author, [ 'class' => 'artbox_comment_reply_author' ]), [ 'class' => CommentWidget::$baseClass[ 'reply_block' ] ]);
58 } else { 69 } else {
59 - echo Html::tag('div', '', [ 'class' => CommentWidget::$baseClass[ 'reply_block' ].' test_class' ]); 70 + echo Html::tag('div', '', [ 'class' => CommentWidget::$baseClass[ 'reply_block' ] . ' test_class' ]);
60 } 71 }
61 echo $form->field($model, 'text', [ 72 echo $form->field($model, 'text', [
62 'options' => [ 73 'options' => [
common/modules/comment/widgets/views/form-comment.php
  Show/Hide comments   View file @93a7a3c
@@ -19,11 +19,16 @@ @@ -19,11 +19,16 @@
19 if($rating) { 19 if($rating) {
20 echo $form->field(( !empty( $model->rating ) ? $model->rating : $rating ), 'value') 20 echo $form->field(( !empty( $model->rating ) ? $model->rating : $rating ), 'value')
21 ->label(false) 21 ->label(false)
22 - ->widget(StarRating::className(), [ 'pluginOptions' => [ 'size' => 'xxs',  
23 - 'step' => 1,  
24 - 'value' => 2,  
25 - 'showCaption' => false,  
26 - ], 22 + ->widget(StarRating::className(), [
  23 + 'pluginOptions' => [
  24 + 'size' => 'xxs',
  25 + 'step' => 1,
  26 + 'value' => 2,
  27 + 'showCaption' => false,
  28 + 'min' => 0,
  29 + 'max' => 10,
  30 + 'stars' => 10,
  31 + ],
27 ]); 32 ]);
28 } 33 }
29 34
common/modules/comment/widgets/views/project_comment_view.php
  Show/Hide comments   View file @93a7a3c
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 ->with('userInfo') 19 ->with('userInfo')
20 ->one(); 20 ->one();
21 } 21 }
22 - $model->buildButtons(['delete']); 22 + $model->buildButtons([ 'delete' ]);
23 ?> 23 ?>
24 <div class="new-portf-comm-read artbox_comment_container" data-key="<?= $model->comment_id ?>" data-form="<?= $model->formName() ?>"> 24 <div class="new-portf-comm-read artbox_comment_container" data-key="<?= $model->comment_id ?>" data-form="<?= $model->formName() ?>">
25 <div class="style"> 25 <div class="style">
@@ -49,9 +49,15 @@ @@ -49,9 +49,15 @@
49 <?php 49 <?php
50 if($rating = $model->hasRating()) { 50 if($rating = $model->hasRating()) {
51 echo StarRating::widget([ 51 echo StarRating::widget([
52 - 'name' => 'rating_project_comment',  
53 - 'value' => $rating->value,  
54 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 52 + 'name' => 'rating_project_comment',
  53 + 'value' => $rating->value,
  54 + 'pluginOptions' => [
  55 + 'displayOnly' => true,
  56 + 'size' => 'xxs',
  57 + 'min' => 0,
  58 + 'max' => 10,
  59 + 'stars' => 10,
  60 + ],
55 ]); 61 ]);
56 } 62 }
57 ?> 63 ?>
@@ -69,7 +75,7 @@ @@ -69,7 +75,7 @@
69 <div> 75 <div>
70 <?php 76 <?php
71 if(!empty( $model->buttons[ 'delete' ] )) { 77 if(!empty( $model->buttons[ 'delete' ] )) {
72 - echo Html::a(($model->user_id != NULL && $model->user_id == \Yii::$app->user->id)?'ะฃะดะฐะปะธั‚ัŒ':'ะŸะพะถะฐะปะพะฒะฐั‚ัŒัั ', $model->buttons[ 'delete' ], [ 'class' => CommentWidget::$baseClass[ 'comment_delete' ] ]); 78 + echo Html::a(( $model->user_id != NULL && $model->user_id == \Yii::$app->user->id ) ? 'ะฃะดะฐะปะธั‚ัŒ' : 'ะŸะพะถะฐะปะพะฒะฐั‚ัŒัั ', $model->buttons[ 'delete' ], [ 'class' => CommentWidget::$baseClass[ 'comment_delete' ] ]);
73 } 79 }
74 if(!empty( $model->buttons[ 'update' ] )) { 80 if(!empty( $model->buttons[ 'update' ] )) {
75 echo Html::a('ะ ะตะดะฐะบั‚ะธั€ะพะฒะฐั‚ัŒ', $model->buttons[ 'update' ], [ 'class' => CommentWidget::$baseClass[ 'comment_update' ] ]); 81 echo Html::a('ะ ะตะดะฐะบั‚ะธั€ะพะฒะฐั‚ัŒ', $model->buttons[ 'update' ], [ 'class' => CommentWidget::$baseClass[ 'comment_update' ] ]);
frontend/controllers/SearchController.php
  Show/Hide comments   View file @93a7a3c
@@ -11,6 +11,7 @@ use frontend\models\SearchVacancyForm; @@ -11,6 +11,7 @@ use frontend\models\SearchVacancyForm;
11 use Yii; 11 use Yii;
12 use frontend\models\Options; 12 use frontend\models\Options;
13 use frontend\models\OptionValues; 13 use frontend\models\OptionValues;
  14 +use yii\base\InvalidParamException;
14 use yii\data\ActiveDataProvider; 15 use yii\data\ActiveDataProvider;
15 use yii\data\Pagination; 16 use yii\data\Pagination;
16 use yii\web\Controller; 17 use yii\web\Controller;
@@ -42,6 +43,32 @@ use frontend\models\Option; @@ -42,6 +43,32 @@ use frontend\models\Option;
42 ]; 43 ];
43 } 44 }
44 45
  46 + public function actionCommon($action)
  47 + {
  48 + $query = \Yii::$app->request->get('query');
  49 + $actions = [
  50 + 1 => 'project',
  51 + 2 => 'performer',
  52 + 3 => 'customer'
  53 + ];
  54 + if(!array_key_exists($action, $actions)) {
  55 + return $this->redirect(['/', 'query' => $query]);
  56 + } else {
  57 + switch($action) {
  58 + case 1:
  59 + return $this->redirect(['search/'.$actions[$action], 'TenderSearch[info]' => $query]);
  60 + break;
  61 + case 2:
  62 + return $this->redirect(['search/'.$actions[$action], 'SearchPerformerForm[search]' => $query]);
  63 + break;
  64 + case 3:
  65 + return $this->redirect(['search/'.$actions[$action], 'CustomerSearch[info]' => $query]);
  66 + break;
  67 + }
  68 + }
  69 + return false;
  70 + }
  71 +
45 public function actionProject() 72 public function actionProject()
46 { 73 {
47 $model = new TenderSearch(); 74 $model = new TenderSearch();
frontend/views/chat/message.php
  Show/Hide comments   View file @93a7a3c
@@ -26,9 +26,15 @@ @@ -26,9 +26,15 @@
26 <div class="cab-mes-read-cont-stars"> 26 <div class="cab-mes-read-cont-stars">
27 <?php 27 <?php
28 echo StarRating::widget([ 28 echo StarRating::widget([
29 - 'name' => 'rating_messange',  
30 - 'value' => $chat->interlocutor->userInfo->rating,  
31 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 29 + 'name' => 'rating_messange',
  30 + 'value' => $chat->interlocutor->userInfo->rating,
  31 + 'pluginOptions' => [
  32 + 'displayOnly' => true,
  33 + 'size' => 'xxs',
  34 + 'min' => 0,
  35 + 'max' => 10,
  36 + 'stars' => 10,
  37 + ],
32 ]); 38 ]);
33 ?> 39 ?>
34 </div> 40 </div>
@@ -47,7 +53,7 @@ @@ -47,7 +53,7 @@
47 <div class="performance-vacancy-add-favorite"> 53 <div class="performance-vacancy-add-favorite">
48 <?php 54 <?php
49 echo Html::a('', [ '#' ], [ 55 echo Html::a('', [ '#' ], [
50 - 'class' => $chat->interlocutor->isBookmarked?'artbox_bookmark_remove_performer':'artbox_bookmark_add_performer', 56 + 'class' => $chat->interlocutor->isBookmarked ? 'artbox_bookmark_remove_performer' : 'artbox_bookmark_add_performer',
51 'data' => [ 'id' => $chat->interlocutor->id ], 57 'data' => [ 'id' => $chat->interlocutor->id ],
52 ]); 58 ]);
53 ?> 59 ?>
@@ -147,7 +153,7 @@ @@ -147,7 +153,7 @@
147 </div> 153 </div>
148 <div class="comment_type"> 154 <div class="comment_type">
149 <?php $form = ActiveForm::begin([ 155 <?php $form = ActiveForm::begin([
150 - 'method' => 'post', 156 + 'method' => 'post',
151 'options' => [ 'enctype' => 'multipart/form-data' ], 157 'options' => [ 'enctype' => 'multipart/form-data' ],
152 ]); ?> 158 ]); ?>
153 159
frontend/views/company/_company_common_review.php
  Show/Hide comments   View file @93a7a3c
@@ -9,9 +9,15 @@ @@ -9,9 +9,15 @@
9 <?php 9 <?php
10 if(!empty( $model->rating )) { 10 if(!empty( $model->rating )) {
11 echo StarRating::widget([ 11 echo StarRating::widget([
12 - 'name' => 'rating_company_review',  
13 - 'value' => $model->rating->value,  
14 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 12 + 'name' => 'rating_company_review',
  13 + 'value' => $model->rating->value,
  14 + 'pluginOptions' => [
  15 + 'displayOnly' => true,
  16 + 'size' => 'xxs',
  17 + 'min' => 0,
  18 + 'max' => 10,
  19 + 'stars' => 10,
  20 + ],
15 ]); 21 ]);
16 } 22 }
17 ?> 23 ?>
frontend/views/company/_company_team_review.php
  Show/Hide comments   View file @93a7a3c
@@ -14,9 +14,15 @@ @@ -14,9 +14,15 @@
14 <?php 14 <?php
15 if(!empty( $model->rating )) { 15 if(!empty( $model->rating )) {
16 echo StarRating::widget([ 16 echo StarRating::widget([
17 - 'name' => 'rating_company_team',  
18 - 'value' => $model->rating->value,  
19 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 17 + 'name' => 'rating_company_team',
  18 + 'value' => $model->rating->value,
  19 + 'pluginOptions' => [
  20 + 'displayOnly' => true,
  21 + 'size' => 'xxs',
  22 + 'min' => 0,
  23 + 'max' => 10,
  24 + 'stars' => 10,
  25 + ],
20 ]); 26 ]);
21 } 27 }
22 ?> 28 ?>
frontend/views/company/portfolio-view.php
  Show/Hide comments   View file @93a7a3c
@@ -78,6 +78,9 @@ @@ -78,6 +78,9 @@
78 'pluginOptions' => [ 78 'pluginOptions' => [
79 'displayOnly' => true, 79 'displayOnly' => true,
80 'size' => 'xxs', 80 'size' => 'xxs',
  81 + 'min' => 0,
  82 + 'max' => 10,
  83 + 'stars' => 10,
81 ], 84 ],
82 ]); 85 ]);
83 ?> 86 ?>
@@ -248,7 +251,10 @@ @@ -248,7 +251,10 @@
248 { 251 {
249 $('.new-portf-slider #demo5').scrollbox( 252 $('.new-portf-slider #demo5').scrollbox(
250 { 253 {
251 - direction : 'h', distance : 210, autoPlay : false, onMouseOverPause : false 254 + direction : 'h',
  255 + distance : 210,
  256 + autoPlay : false,
  257 + onMouseOverPause : false
252 } 258 }
253 ); 259 );
254 $('#demo5-backward').click( 260 $('#demo5-backward').click(
frontend/views/layouts/company.php
  Show/Hide comments   View file @93a7a3c
@@ -196,9 +196,15 @@ @@ -196,9 +196,15 @@
196 <div class="performance-vacancy-sidebar-stars style"> 196 <div class="performance-vacancy-sidebar-stars style">
197 <?php 197 <?php
198 echo StarRating::widget([ 198 echo StarRating::widget([
199 - 'name' => 'rating_company',  
200 - 'value' => $this->params[ 'company' ]->userInfo->rating,  
201 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 199 + 'name' => 'rating_company',
  200 + 'value' => $this->params[ 'company' ]->userInfo->rating,
  201 + 'pluginOptions' => [
  202 + 'displayOnly' => true,
  203 + 'size' => 'xxs',
  204 + 'min' => 0,
  205 + 'max' => 10,
  206 + 'stars' => 10,
  207 + ],
202 ]); 208 ]);
203 ?> 209 ?>
204 </div> 210 </div>
@@ -244,11 +250,11 @@ @@ -244,11 +250,11 @@
244 <div class="sidebarvievstxt"> 250 <div class="sidebarvievstxt">
245 <span class="sidebar-views-txt">ะกะพั‚ั€ัƒะดะฝะธะบะธ:<br/></span> 251 <span class="sidebar-views-txt">ะกะพั‚ั€ัƒะดะฝะธะบะธ:<br/></span>
246 <?php 252 <?php
247 - if(!empty($this->params[ 'company' ]->companyInfo->staff)) {  
248 - echo $this->params[ 'company' ]->companyInfo->staff;  
249 - } else {  
250 - echo 0;  
251 - } 253 + if(!empty( $this->params[ 'company' ]->companyInfo->staff )) {
  254 + echo $this->params[ 'company' ]->companyInfo->staff;
  255 + } else {
  256 + echo 0;
  257 + }
252 ?> 258 ?>
253 </div> 259 </div>
254 </li> 260 </li>
@@ -294,7 +300,9 @@ @@ -294,7 +300,9 @@
294 <script> 300 <script>
295 $('div.rating').rating( 301 $('div.rating').rating(
296 { 302 {
297 - fx : 'full', readOnly : 'true', url : 'rating.php' 303 + fx : 'full',
  304 + readOnly : 'true',
  305 + url : 'rating.php'
298 } 306 }
299 ); 307 );
300 </script> 308 </script>
frontend/views/layouts/gallery-company.php
  Show/Hide comments   View file @93a7a3c
@@ -80,22 +80,22 @@ @@ -80,22 +80,22 @@
80 ], 80 ],
81 ], 81 ],
82 [ 82 [
83 - 'label' => 'ะ’ั‹ะฟะพะปะฝะตะฝะฝั‹ะต ั€ะฐะฑะพั‚ั‹',  
84 - 'url' => [ 83 + 'label' => 'ะ’ั‹ะฟะพะปะฝะตะฝะฝั‹ะต ั€ะฐะฑะพั‚ั‹',
  84 + 'url' => [
85 'company/portfolio', 85 'company/portfolio',
86 'company_id' => $this->params[ 'company' ]->id, 86 'company_id' => $this->params[ 'company' ]->id,
87 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, 87 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
88 ], 88 ],
89 - 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params['type'] == 'implementer' ) ? true : false, 89 + 'visible' => ( empty( $this->params[ 'type' ] ) || $this->params[ 'type' ] == 'implementer' ) ? true : false,
90 ], 90 ],
91 [ 91 [
92 - 'label' => 'ะ—ะฐะบะฐะทะฐะฝะฝั‹ะต ั€ะฐะฑะพั‚ั‹',  
93 - 'url' => [ 92 + 'label' => 'ะ—ะฐะบะฐะทะฐะฝะฝั‹ะต ั€ะฐะฑะพั‚ั‹',
  93 + 'url' => [
94 'company/projects', 94 'company/projects',
95 'company_id' => $this->params[ 'company' ]->id, 95 'company_id' => $this->params[ 'company' ]->id,
96 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL, 96 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
97 ], 97 ],
98 - 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params['type'] == 'customer' ) ? true : false, 98 + 'visible' => ( !empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer' ) ? true : false,
99 ], 99 ],
100 [ 100 [
101 'label' => 'ะšะพะผะฐะฝะดะฐ', 101 'label' => 'ะšะพะผะฐะฝะดะฐ',
@@ -193,9 +193,15 @@ @@ -193,9 +193,15 @@
193 <div class="performance-vacancy-sidebar-stars style"> 193 <div class="performance-vacancy-sidebar-stars style">
194 <?php 194 <?php
195 echo StarRating::widget([ 195 echo StarRating::widget([
196 - 'name' => 'rating_company',  
197 - 'value' => $this->params[ 'company' ]->userInfo->rating,  
198 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 196 + 'name' => 'rating_company',
  197 + 'value' => $this->params[ 'company' ]->userInfo->rating,
  198 + 'pluginOptions' => [
  199 + 'displayOnly' => true,
  200 + 'size' => 'xxs',
  201 + 'min' => 0,
  202 + 'max' => 10,
  203 + 'stars' => 10,
  204 + ],
199 ]); 205 ]);
200 ?> 206 ?>
201 </div> 207 </div>
@@ -229,7 +235,9 @@ @@ -229,7 +235,9 @@
229 <script> 235 <script>
230 $('div.rating').rating( 236 $('div.rating').rating(
231 { 237 {
232 - fx : 'full', readOnly : 'true', url : 'rating.php' 238 + fx : 'full',
  239 + readOnly : 'true',
  240 + url : 'rating.php'
233 } 241 }
234 ); 242 );
235 </script> 243 </script>
frontend/views/layouts/gallery.php
  Show/Hide comments   View file @93a7a3c
@@ -2,16 +2,16 @@ @@ -2,16 +2,16 @@
2 2
3 use kartik\rating\StarRating; 3 use kartik\rating\StarRating;
4 use yii\helpers\Html; 4 use yii\helpers\Html;
5 -use yii\helpers\Url;  
6 -use yii\widgets\Breadcrumbs;  
7 -use yii\widgets\Menu; 5 + use yii\helpers\Url;
  6 + use yii\widgets\Breadcrumbs;
  7 + use yii\widgets\Menu;
8 8
9 -\frontend\assets\AppAsset::register($this);  
10 -/* @var $content string */  
11 -$this->beginContent('@app/views/layouts/main.php'); 9 + \frontend\assets\AppAsset::register($this);
  10 + /* @var $content string */
  11 + $this->beginContent('@app/views/layouts/main.php');
12 ?> 12 ?>
13 <div class="section-box content"> 13 <div class="section-box content">
14 - <div class="section-box-16" style="background: url('<?= $this->params['user']->userInfo->poster;?>') 50% no-repeat"> 14 + <div class="section-box-16" style="background: url('<?= $this->params[ 'user' ]->userInfo->poster; ?>') 50% no-repeat">
15 <div class="box-wr"> 15 <div class="box-wr">
16 <div class="box-all"> 16 <div class="box-all">
17 <div class="blog-buttons-wr style"> 17 <div class="blog-buttons-wr style">
@@ -64,7 +64,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -64,7 +64,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
64 'url' => [ 64 'url' => [
65 'performer/common', 65 'performer/common',
66 'performer_id' => $this->params[ 'user' ]->id, 66 'performer_id' => $this->params[ 'user' ]->id,
67 - 'type' => (!empty($this->params['type']))?$this->params['type']:null, 67 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
68 ], 68 ],
69 ], 69 ],
70 [ 70 [
@@ -72,7 +72,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -72,7 +72,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
72 'url' => [ 72 'url' => [
73 'performer/portfolio', 73 'performer/portfolio',
74 'performer_id' => $this->params[ 'user' ]->id, 74 'performer_id' => $this->params[ 'user' ]->id,
75 - 'type' => (!empty($this->params['type']))?$this->params['type']:null, 75 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
76 ], 76 ],
77 ], 77 ],
78 [ 78 [
@@ -80,7 +80,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -80,7 +80,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
80 'url' => [ 80 'url' => [
81 'performer/projects', 81 'performer/projects',
82 'performer_id' => $this->params[ 'user' ]->id, 82 'performer_id' => $this->params[ 'user' ]->id,
83 - 'type' => (!empty($this->params['type']))?$this->params['type']:null, 83 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
84 ], 84 ],
85 ], 85 ],
86 [ 86 [
@@ -88,7 +88,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -88,7 +88,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
88 'url' => [ 88 'url' => [
89 'performer/blog-list', 89 'performer/blog-list',
90 'performer_id' => $this->params[ 'user' ]->id, 90 'performer_id' => $this->params[ 'user' ]->id,
91 - 'type' => (!empty($this->params['type']))?$this->params['type']:null, 91 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
92 ], 92 ],
93 ], 93 ],
94 [ 94 [
@@ -96,7 +96,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -96,7 +96,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
96 'url' => [ 96 'url' => [
97 'performer/review', 97 'performer/review',
98 'performer_id' => $this->params[ 'user' ]->id, 98 'performer_id' => $this->params[ 'user' ]->id,
99 - 'type' => (!empty($this->params['type']))?$this->params['type']:null, 99 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
100 ], 100 ],
101 ], 101 ],
102 [ 102 [
@@ -104,7 +104,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -104,7 +104,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
104 'url' => [ 104 'url' => [
105 'performer/workplace', 105 'performer/workplace',
106 'performer_id' => $this->params[ 'user' ]->id, 106 'performer_id' => $this->params[ 'user' ]->id,
107 - 'type' => (!empty($this->params['type']))?$this->params['type']:null, 107 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
108 ], 108 ],
109 ], 109 ],
110 [ 110 [
@@ -112,7 +112,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -112,7 +112,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
112 'url' => [ 112 'url' => [
113 'performer/gallery', 113 'performer/gallery',
114 'performer_id' => $this->params[ 'user' ]->id, 114 'performer_id' => $this->params[ 'user' ]->id,
115 - 'type' => (!empty($this->params['type']))?$this->params['type']:null, 115 + 'type' => ( !empty( $this->params[ 'type' ] ) ) ? $this->params[ 'type' ] : NULL,
116 ], 116 ],
117 ], 117 ],
118 ], 118 ],
@@ -127,40 +127,40 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -127,40 +127,40 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
127 <div class="performer-vacancy-sidebar-left-wr gallery-page-sidebar"> 127 <div class="performer-vacancy-sidebar-left-wr gallery-page-sidebar">
128 <div class="performer-vacancy-sidebar-left"> 128 <div class="performer-vacancy-sidebar-left">
129 <div class="performance-vacancy-sidebar-company-wr"> 129 <div class="performance-vacancy-sidebar-company-wr">
130 - <div class="performance-vacancy-sidebar-company-title style"><?=$this->params['user']->name?></div> 130 + <div class="performance-vacancy-sidebar-company-title style"><?= $this->params[ 'user' ]->name ?></div>
131 <div class="performance-vacancy-sidebar-company-job style"> 131 <div class="performance-vacancy-sidebar-company-job style">
132 <ul> 132 <ul>
133 <li class="activejob"> 133 <li class="activejob">
134 <?php 134 <?php
135 - if(!empty($this->params['type']) && $this->params['type'] == 'implementer') {  
136 - echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current(['type' => 'implementer']));  
137 - } elseif(!empty($this->params['type']) && $this->params['type'] == 'customer') {  
138 - echo Html::a('ะ—ะฐะบะฐะทั‡ะธะบ', Url::current(['type' => null])); 135 + if(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'implementer') {
  136 + echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current([ 'type' => 'implementer' ]));
  137 + } elseif(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer') {
  138 + echo Html::a('ะ—ะฐะบะฐะทั‡ะธะบ', Url::current([ 'type' => NULL ]));
139 } else { 139 } else {
140 - echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current(['type' => null])); 140 + echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current([ 'type' => NULL ]));
141 } 141 }
142 ?> 142 ?>
143 <div class="sidebar-droped-wr style"> 143 <div class="sidebar-droped-wr style">
144 <ul> 144 <ul>
145 <li> 145 <li>
146 <?php 146 <?php
147 - if(!empty($this->params['type']) && $this->params['type'] == 'implementer') {  
148 - echo Html::a('ะ—ะฐะบะฐะทั‡ะธะบ', Url::current(['type' => 'customer']));  
149 - } elseif(!empty($this->params['type']) && $this->params['type'] == 'customer') {  
150 - echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current(['type' => null])); 147 + if(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'implementer') {
  148 + echo Html::a('ะ—ะฐะบะฐะทั‡ะธะบ', Url::current([ 'type' => 'customer' ]));
  149 + } elseif(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer') {
  150 + echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current([ 'type' => NULL ]));
151 } else { 151 } else {
152 - echo Html::a('ะ—ะฐะบะฐะทั‡ะธะบ', Url::current(['type' => 'customer'])); 152 + echo Html::a('ะ—ะฐะบะฐะทั‡ะธะบ', Url::current([ 'type' => 'customer' ]));
153 } 153 }
154 ?> 154 ?>
155 </li> 155 </li>
156 <li style="display: none"> 156 <li style="display: none">
157 <?php 157 <?php
158 - if(!empty($this->params['type']) && $this->params['type'] == 'implementer') {  
159 - echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current(['type' => 'implementer']));  
160 - } elseif(!empty($this->params['type']) && $this->params['type'] == 'customer') {  
161 - echo Html::a('ะ—ะฐะบะฐะทั‡ะธะบ', Url::current(['type' => null])); 158 + if(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'implementer') {
  159 + echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current([ 'type' => 'implementer' ]));
  160 + } elseif(!empty( $this->params[ 'type' ] ) && $this->params[ 'type' ] == 'customer') {
  161 + echo Html::a('ะ—ะฐะบะฐะทั‡ะธะบ', Url::current([ 'type' => NULL ]));
162 } else { 162 } else {
163 - echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current(['type' => null])); 163 + echo Html::a('ะ˜ัะฟะพะปะฝะธั‚ะตะปัŒ', Url::current([ 'type' => NULL ]));
164 } 164 }
165 ?> 165 ?>
166 </ul> 166 </ul>
@@ -171,9 +171,15 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -171,9 +171,15 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
171 <div class="performance-vacancy-sidebar-stars style"> 171 <div class="performance-vacancy-sidebar-stars style">
172 <?php 172 <?php
173 echo StarRating::widget([ 173 echo StarRating::widget([
174 - 'name' => 'rating_company',  
175 - 'value' => $this->params[ 'user' ]->userInfo->rating,  
176 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 174 + 'name' => 'rating_company',
  175 + 'value' => $this->params[ 'user' ]->userInfo->rating,
  176 + 'pluginOptions' => [
  177 + 'displayOnly' => true,
  178 + 'size' => 'xxs',
  179 + 'min' => 0,
  180 + 'max' => 10,
  181 + 'stars' => 10,
  182 + ],
177 ]); 183 ]);
178 ?> 184 ?>
179 </div> 185 </div>
@@ -189,7 +195,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -189,7 +195,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
189 ?> 195 ?>
190 </div> 196 </div>
191 <div class="performer-vacancy-sidebar-img style"> 197 <div class="performer-vacancy-sidebar-img style">
192 - <?= Html::img($this->params['user']->userInfo->image);?> 198 + <?= Html::img($this->params[ 'user' ]->userInfo->image); ?>
193 </div> 199 </div>
194 </div> 200 </div>
195 </div> 201 </div>
@@ -205,11 +211,13 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;); @@ -205,11 +211,13 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
205 </div> 211 </div>
206 </div> 212 </div>
207 <script> 213 <script>
208 - $('div.rating').rating({  
209 - fx: 'full',  
210 - readOnly: 'true',  
211 - url: 'rating.php'  
212 - }); 214 + $('div.rating').rating(
  215 + {
  216 + fx : 'full',
  217 + readOnly : 'true',
  218 + url : 'rating.php'
  219 + }
  220 + );
213 </script> 221 </script>
214 222
215 <?php $this->endContent() ?> 223 <?php $this->endContent() ?>
216 \ No newline at end of file 224 \ No newline at end of file
frontend/views/layouts/main.php
  Show/Hide comments   View file @93a7a3c
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 /* @var $content string */ 4 /* @var $content string */
5 5
6 use yii\helpers\Html; 6 use yii\helpers\Html;
  7 + use yii\helpers\Url;
7 use yii\widgets\Menu; 8 use yii\widgets\Menu;
8 use frontend\assets\AppAsset; 9 use frontend\assets\AppAsset;
9 10
@@ -140,9 +141,9 @@ @@ -140,9 +141,9 @@
140 </ul> 141 </ul>
141 142
142 <div class="search-main-menu"> 143 <div class="search-main-menu">
143 - <form action="">  
144 - <input value="" name="" type="search"/>  
145 - <input type="hidden" value="1" name=""/> 144 + <form action="<?=Url::to(['search/common'])?>" method="get">
  145 + <input value="" name="query" type="text"/>
  146 + <input type="hidden" value="1" name="action"/>
146 <button type="submit" value=""></button> 147 <button type="submit" value=""></button>
147 <div class="search-list"> 148 <div class="search-list">
148 <span><?= Yii::t('app', 'Projects') ?></span> 149 <span><?= Yii::t('app', 'Projects') ?></span>
@@ -334,6 +335,7 @@ @@ -334,6 +335,7 @@
334 335
335 <div class="footer-menu-wrapper last-footer-menu"> 336 <div class="footer-menu-wrapper last-footer-menu">
336 <?php 337 <?php
  338 + /* No content
337 echo Menu::widget([ 339 echo Menu::widget([
338 'options' => [ 340 'options' => [
339 'class' => 'footer-menu', 341 'class' => 'footer-menu',
@@ -369,6 +371,7 @@ @@ -369,6 +371,7 @@
369 ], 371 ],
370 ], 372 ],
371 ]); 373 ]);
  374 + */
372 ?> 375 ?>
373 </div> 376 </div>
374 377
frontend/views/layouts/performer.php
  Show/Hide comments   View file @93a7a3c
@@ -178,9 +178,15 @@ @@ -178,9 +178,15 @@
178 <div class="performance-vacancy-sidebar-stars style"> 178 <div class="performance-vacancy-sidebar-stars style">
179 <?php 179 <?php
180 echo StarRating::widget([ 180 echo StarRating::widget([
181 - 'name' => 'rating_company',  
182 - 'value' => $this->params[ 'user' ]->userInfo->rating,  
183 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 181 + 'name' => 'rating_company',
  182 + 'value' => $this->params[ 'user' ]->userInfo->rating,
  183 + 'pluginOptions' => [
  184 + 'displayOnly' => true,
  185 + 'size' => 'xxs',
  186 + 'min' => 0,
  187 + 'max' => 10,
  188 + 'stars' => 10,
  189 + ],
184 ]); 190 ]);
185 ?> 191 ?>
186 </div> 192 </div>
@@ -260,7 +266,7 @@ @@ -260,7 +266,7 @@
260 <span class="sidebar-views-txt">ะกั‚ะพะธะผะพัั‚ัŒ ั€ะฐะฑะพั‚:<br/></span> 266 <span class="sidebar-views-txt">ะกั‚ะพะธะผะพัั‚ัŒ ั€ะฐะฑะพั‚:<br/></span>
261 <?php 267 <?php
262 if(!empty( $this->params[ 'user' ]->userInfo->salary )) { 268 if(!empty( $this->params[ 'user' ]->userInfo->salary )) {
263 - echo 'ะพั‚ '.$this->params[ 'user' ]->userInfo->salary . ' ' . $this->params[ 'user' ]->userInfo->currency->label.' ะทะฐ ั‡ะฐั'; 269 + echo 'ะพั‚ ' . $this->params[ 'user' ]->userInfo->salary . ' ' . $this->params[ 'user' ]->userInfo->currency->label . ' ะทะฐ ั‡ะฐั';
264 } else { 270 } else {
265 echo 'ะะต ัƒะบะฐะทะฐะฝะพ'; 271 echo 'ะะต ัƒะบะฐะทะฐะฝะพ';
266 } 272 }
@@ -308,7 +314,9 @@ @@ -308,7 +314,9 @@
308 <script> 314 <script>
309 $('div.rating').rating( 315 $('div.rating').rating(
310 { 316 {
311 - fx : 'full', readOnly : 'true', url : 'rating.php' 317 + fx : 'full',
  318 + readOnly : 'true',
  319 + url : 'rating.php'
312 } 320 }
313 ); 321 );
314 </script> 322 </script>
frontend/views/performer/common.php
  Show/Hide comments   View file @93a7a3c
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 * @var array $developments 10 * @var array $developments
11 * @var array $educations 11 * @var array $educations
12 * @var array $courses 12 * @var array $courses
13 - * @var int[] $geography 13 + * @var int[] $geography
14 */ 14 */
15 $this->params[ 'user' ] = $user; 15 $this->params[ 'user' ] = $user;
16 16
@@ -23,10 +23,10 @@ @@ -23,10 +23,10 @@
23 if(!$first) { 23 if(!$first) {
24 $geographyString .= ', '; 24 $geographyString .= ', ';
25 } 25 }
26 - $geographyString .= $city . ' ('.$count.')'; 26 + $geographyString .= $city . ' (' . $count . ')';
27 $first = 0; 27 $first = 0;
28 } 28 }
29 - unset($first); 29 + unset( $first );
30 ?> 30 ?>
31 <div class="proektant-profile-content"> 31 <div class="proektant-profile-content">
32 <?php 32 <?php
@@ -236,11 +236,17 @@ @@ -236,11 +236,17 @@
236 <div class="company-performer-comments-bl"> 236 <div class="company-performer-comments-bl">
237 <?php 237 <?php
238 if(!empty( $user->comments[ $i ]->rating )) { 238 if(!empty( $user->comments[ $i ]->rating )) {
239 - echo StarRating::widget([  
240 - 'name' => 'rating_common',  
241 - 'value' => $user->comments[ $i ]->rating->value,  
242 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs']  
243 - ]); 239 + echo StarRating::widget([
  240 + 'name' => 'rating_common',
  241 + 'value' => $user->comments[ $i ]->rating->value,
  242 + 'pluginOptions' => [
  243 + 'displayOnly' => true,
  244 + 'size' => 'xxs',
  245 + 'min' => 0,
  246 + 'max' => 10,
  247 + 'stars' => 10,
  248 + ],
  249 + ]);
244 } 250 }
245 ?> 251 ?>
246 <div class="company-performer-comments-autor">ะœะฝะตะฝะธะต ะพั‚: <?= $user->comments[ $i ]->getAuthor(' (ะ“ะพัั‚ัŒ)') ?></div> 252 <div class="company-performer-comments-autor">ะœะฝะตะฝะธะต ะพั‚: <?= $user->comments[ $i ]->getAuthor(' (ะ“ะพัั‚ัŒ)') ?></div>
frontend/views/performer/portfolio-view.php
  Show/Hide comments   View file @93a7a3c
@@ -80,6 +80,9 @@ @@ -80,6 +80,9 @@
80 'pluginOptions' => [ 80 'pluginOptions' => [
81 'displayOnly' => true, 81 'displayOnly' => true,
82 'size' => 'xxs', 82 'size' => 'xxs',
  83 + 'min' => 0,
  84 + 'max' => 10,
  85 + 'stars' => 10,
83 ], 86 ],
84 ]); 87 ]);
85 ?> 88 ?>
@@ -120,7 +123,9 @@ @@ -120,7 +123,9 @@
120 <?php 123 <?php
121 foreach($portfolio->ShowGallery($portfolio->gallery->photo) as $one_photo) { 124 foreach($portfolio->ShowGallery($portfolio->gallery->photo) as $one_photo) {
122 ?> 125 ?>
123 - <li><img src="<?= $portfolio->minImg($one_photo, 210, 150) ?>" alt=""/></li> 126 + <li>
  127 + <img src="<?= $portfolio->minImg($one_photo, 210, 150) ?>" alt=""/>
  128 + </li>
124 <?php 129 <?php
125 } 130 }
126 ?> 131 ?>
@@ -171,8 +176,11 @@ @@ -171,8 +176,11 @@
171 <div class="new-portf-slider-wr style"> 176 <div class="new-portf-slider-wr style">
172 <p>ะฃั‡ะฐัั‚ะฝะธะบะธ ะฟั€ะพะตะบั‚ะฐ:</p> 177 <p>ะฃั‡ะฐัั‚ะฝะธะบะธ ะฟั€ะพะตะบั‚ะฐ:</p>
173 <?php 178 <?php
174 - foreach($portfolio->getPortfolioUsers()->where(['status' => 1])->with('gallery')->all() as $portfolioUser) {  
175 - if(!empty($portfolioUser->gallery)) { 179 + foreach($portfolio->getPortfolioUsers()
  180 + ->where([ 'status' => 1 ])
  181 + ->with('gallery')
  182 + ->all() as $portfolioUser) {
  183 + if(!empty( $portfolioUser->gallery )) {
176 $gallery = $portfolio->ShowGallery($portfolioUser->gallery->photo); 184 $gallery = $portfolio->ShowGallery($portfolioUser->gallery->photo);
177 } 185 }
178 ?> 186 ?>
@@ -253,7 +261,10 @@ @@ -253,7 +261,10 @@
253 { 261 {
254 $('.new-portf-slider #demo5').scrollbox( 262 $('.new-portf-slider #demo5').scrollbox(
255 { 263 {
256 - direction : 'h', distance : 230, autoPlay : false, onMouseOverPause : false 264 + direction : 'h',
  265 + distance : 230,
  266 + autoPlay : false,
  267 + onMouseOverPause : false
257 } 268 }
258 ); 269 );
259 $('#demo5-backward').click( 270 $('#demo5-backward').click(
@@ -270,8 +281,9 @@ @@ -270,8 +281,9 @@
270 ); 281 );
271 var widthSlider = $('.new-portf-slider ul li').length 282 var widthSlider = $('.new-portf-slider ul li').length
272 $('.new-portf-slider ul').css({width : ((widthSlider * 230) - 20)}) 283 $('.new-portf-slider ul').css({width : ((widthSlider * 230) - 20)})
273 - if (widthSlider<=3) {  
274 - $('#demo5-forward, #demo5-backward').css({display:'none'}) 284 + if(widthSlider <= 3)
  285 + {
  286 + $('#demo5-forward, #demo5-backward').css({display : 'none'})
275 } 287 }
276 } 288 }
277 ); 289 );
frontend/views/search/_customer_list_view.php
  Show/Hide comments   View file @93a7a3c
@@ -31,27 +31,33 @@ @@ -31,27 +31,33 @@
31 </div> 31 </div>
32 <div class="search_perform-stars-wr"> 32 <div class="search_perform-stars-wr">
33 33
34 - <?php  
35 - if($rating = $model->userInfo->rating) {  
36 - echo StarRating::widget([  
37 - 'name' => 'rating_customer',  
38 - 'value' => $rating,  
39 - 'pluginOptions' => [  
40 - 'displayOnly' => true,  
41 - 'size' => 'xxs',  
42 - ],  
43 - ]);  
44 - } else {  
45 - echo StarRating::widget([  
46 - 'name' => 'rating_customer',  
47 - 'value' => 0,  
48 - 'pluginOptions' => [  
49 - 'displayOnly' => true,  
50 - 'size' => 'xxs',  
51 - ],  
52 - ]);  
53 - }  
54 - ?> 34 + <?php
  35 + if($rating = $model->userInfo->rating) {
  36 + echo StarRating::widget([
  37 + 'name' => 'rating_customer',
  38 + 'value' => $rating,
  39 + 'pluginOptions' => [
  40 + 'displayOnly' => true,
  41 + 'size' => 'xxs',
  42 + 'min' => 0,
  43 + 'max' => 10,
  44 + 'stars' => 10,
  45 + ],
  46 + ]);
  47 + } else {
  48 + echo StarRating::widget([
  49 + 'name' => 'rating_customer',
  50 + 'value' => 0,
  51 + 'pluginOptions' => [
  52 + 'displayOnly' => true,
  53 + 'size' => 'xxs',
  54 + 'min' => 0,
  55 + 'max' => 10,
  56 + 'stars' => 10,
  57 + ],
  58 + ]);
  59 + }
  60 + ?>
55 61
56 <div class="search_perform-stars-txt"> 62 <div class="search_perform-stars-txt">
57 <?= count($model->comments) ?> ะพั‚ะทั‹ะฒะพะฒ 63 <?= count($model->comments) ?> ะพั‚ะทั‹ะฒะพะฒ
frontend/views/search/_performer_list_view.php
  Show/Hide comments   View file @93a7a3c
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 ->limit(4) 16 ->limit(4)
17 ->all(), 'cover'); ?> 17 ->all(), 'cover'); ?>
18 <?php 18 <?php
19 - if(!empty($portfolios)) { 19 + if(!empty( $portfolios )) {
20 for($i = 0; $i < count($portfolios); $i++) { 20 for($i = 0; $i < count($portfolios); $i++) {
21 if($i) { 21 if($i) {
22 echo Html::a(Html::img($portfolios[ $i ]), '#', [ 'class' => 'small-img-search gallery-box-min' ]); 22 echo Html::a(Html::img($portfolios[ $i ]), '#', [ 'class' => 'small-img-search gallery-box-min' ]);
@@ -61,9 +61,15 @@ @@ -61,9 +61,15 @@
61 <div> 61 <div>
62 <?php 62 <?php
63 echo StarRating::widget([ 63 echo StarRating::widget([
64 - 'name' => 'rating_performer',  
65 - 'value' => $model->userInfo->rating,  
66 - 'pluginOptions' => ['displayOnly' => true, 'size' => 'xxs'] 64 + 'name' => 'rating_performer',
  65 + 'value' => $model->userInfo->rating,
  66 + 'pluginOptions' => [
  67 + 'displayOnly' => true,
  68 + 'size' => 'xxs',
  69 + 'min' => 0,
  70 + 'max' => 10,
  71 + 'stars' => 10,
  72 + ],
67 ]); 73 ]);
68 ?> 74 ?>
69 </div> 75 </div>
@@ -111,7 +117,10 @@ @@ -111,7 +117,10 @@
111 'data-id' => $model->id, 117 'data-id' => $model->id,
112 ]); 118 ]);
113 } 119 }
114 - echo Html::a(Yii::t('app', 'Offer project'), ['#'], ['class' => 'get-project', 'data' => ['performer-id' => $model->id]]); 120 + echo Html::a(Yii::t('app', 'Offer project'), [ '#' ], [
  121 + 'class' => 'get-project',
  122 + 'data' => [ 'performer-id' => $model->id ],
  123 + ]);
115 } 124 }
116 ?> 125 ?>
117 </div> 126 </div>
frontend/views/search/project.php
  Show/Hide comments   View file @93a7a3c
@@ -30,6 +30,11 @@ @@ -30,6 +30,11 @@
30 'options' => [ 'class' => 'search-work-form' ], 30 'options' => [ 'class' => 'search-work-form' ],
31 'action' => [ '' ], 31 'action' => [ '' ],
32 ]); 32 ]);
  33 + echo $form->field($model, 'info', [ 'options' => [ 'class' => 'info-search-input' ] ])
  34 + ->label('ะŸะพะธัะบ')
  35 + ->textInput([ 'class' => 'form-control',
  36 + 'placeholder' => 'ะขะตะบัั‚ ะดะปั ะฟะพะธัะบะฐ',
  37 + ]);
33 echo $form->field($model, 'specialization') 38 echo $form->field($model, 'specialization')
34 ->dropDownList($specialization, [ 'prompt' => 'ะ›ัŽะฑะฐั' ]); 39 ->dropDownList($specialization, [ 'prompt' => 'ะ›ัŽะฑะฐั' ]);
35 40
@@ -111,7 +116,9 @@ @@ -111,7 +116,9 @@
111 </div> 116 </div>
112 </div> 117 </div>
113 <div> 118 <div>
114 - 119 + <?php
  120 + /* ะ’ั€ะตะผะตะฝะฝะพ ัƒะฑะธั€ะฐะตะผ ะบะฐั€ั‚ัƒ 17.05.2016
  121 + ?>
115 <div class="section-box" style="height: 720px; overflow: hidden"> 122 <div class="section-box" style="height: 720px; overflow: hidden">
116 <div class="map-settings-opacity"></div> 123 <div class="map-settings-opacity"></div>
117 <div class="map-settings-wrapp"> 124 <div class="map-settings-wrapp">
@@ -296,6 +303,7 @@ @@ -296,6 +303,7 @@
296 </div> 303 </div>
297 <div id="map_canvas" style="width: 100%; height:100%;"></div> 304 <div id="map_canvas" style="width: 100%; height:100%;"></div>
298 <?php 305 <?php
  306 + */
299 /* ะ ะตัˆะตะฝะพ ัƒะฑั€ะฐั‚ัŒ ะฝะธะถะฝะธะน ัะปะฐะนะดะตั€ 307 /* ะ ะตัˆะตะฝะพ ัƒะฑั€ะฐั‚ัŒ ะฝะธะถะฝะธะน ัะปะฐะนะดะตั€
300 ?> 308 ?>
301 <div class="slider_map-wr"> 309 <div class="slider_map-wr">
@@ -391,8 +399,8 @@ @@ -391,8 +399,8 @@
391 </div> 399 </div>
392 <?php 400 <?php
393 */ 401 */
394 - ?>  
395 - </div>  
396 - 402 + ?>
397 </div> 403 </div>
  404 +
  405 +</div>
398 </div> 406 </div>
frontend/views/tender/view.php
  Show/Hide comments   View file @93a7a3c
@@ -67,6 +67,9 @@ @@ -67,6 +67,9 @@
67 'pluginOptions' => [ 67 'pluginOptions' => [
68 'displayOnly' => true, 68 'displayOnly' => true,
69 'size' => 'xxs', 69 'size' => 'xxs',
  70 + 'min' => 0,
  71 + 'max' => 10,
  72 + 'stars' => 10,
70 ], 73 ],
71 ]); 74 ]);
72 ?> 75 ?>
@@ -209,13 +212,18 @@ @@ -209,13 +212,18 @@
209 { 212 {
210 var start_position = new google.maps.LatLng('56', '30'); 213 var start_position = new google.maps.LatLng('56', '30');
211 var settings = { 214 var settings = {
212 - zoom : 7, scrollwheel : false, center : start_position, 215 + zoom : 7,
  216 + scrollwheel : false,
  217 + center : start_position,
213 mapTypeControl : false, 218 mapTypeControl : false,
214 mapTypeControlOptions : {style : google.maps.MapTypeControlStyle.DROPDOWN_MENU}, 219 mapTypeControlOptions : {style : google.maps.MapTypeControlStyle.DROPDOWN_MENU},
215 navigationControl : false, 220 navigationControl : false,
216 navigationControlOptions : {style : google.maps.NavigationControlStyle.SMALL}, 221 navigationControlOptions : {style : google.maps.NavigationControlStyle.SMALL},
217 - scaleControl : false, streetViewControl : false, rotateControl : false,  
218 - zoomControl : true, mapTypeId : google.maps.MapTypeId.ROADMAP 222 + scaleControl : false,
  223 + streetViewControl : false,
  224 + rotateControl : false,
  225 + zoomControl : true,
  226 + mapTypeId : google.maps.MapTypeId.ROADMAP
219 }; 227 };
220 var map = new google.maps.Map(document.getElementById("map_canvas"), settings); 228 var map = new google.maps.Map(document.getElementById("map_canvas"), settings);
221 229
@@ -225,8 +233,10 @@ @@ -225,8 +233,10 @@
225 233
226 var marker = new google.maps.Marker( 234 var marker = new google.maps.Marker(
227 { 235 {
228 - position : new google.maps.LatLng('56', '35.3'), map : map,  
229 - title : 'Marker Title2', icon : image1 236 + position : new google.maps.LatLng('56', '35.3'),
  237 + map : map,
  238 + title : 'Marker Title2',
  239 + icon : image1
230 } 240 }
231 ); 241 );
232 242
@@ -247,69 +257,69 @@ @@ -247,69 +257,69 @@
247 </div> 257 </div>
248 </div> 258 </div>
249 259
250 - </div>  
251 -  
252 - <div class="tabs_views-wr">  
253 - <div class="_tabs style">  
254 - <div class="box-wr">  
255 - <div class="box-all">  
256 - <?php  
257 - Pjax::begin();  
258 - echo \common\modules\comment\widgets\CommentWidget::widget([  
259 - 'context' => $this,  
260 - 'model' => $model::className(),  
261 - 'model_id' => $model->project_id,  
262 - 'comment_class' => \common\modules\comment\models\CommentProject::className(),  
263 - 'class_options' => [  
264 - 'scenario' => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,  
265 - 'user_id' => \Yii::$app->user->getId(),  
266 - 'guestComment' => false,  
267 - 'status' => \common\modules\comment\models\CommentProject::STATUS_ACTIVE,  
268 - ],  
269 - 'list_options' => [  
270 - 'view' => 'list-project-comment',  
271 - 'class' => 'section box tender-offer-proj-wr',  
272 - ],  
273 - 'form_options' => [  
274 - 'view' => 'form-project-comment',  
275 - 'tag' => 'div',  
276 - 'class' => 'artbox_comment_form section-box tender-add-answer',  
277 - ],  
278 - 'options' => [  
279 - 'tag' => false,  
280 - ],  
281 - ]);  
282 - Pjax::end();  
283 - ?> 260 + </div>
  261 +
  262 + <div class="tabs_views-wr">
  263 + <div class="_tabs style">
  264 + <div class="box-wr">
  265 + <div class="box-all">
  266 + <?php
  267 + Pjax::begin();
  268 + echo \common\modules\comment\widgets\CommentWidget::widget([
  269 + 'context' => $this,
  270 + 'model' => $model::className(),
  271 + 'model_id' => $model->project_id,
  272 + 'comment_class' => \common\modules\comment\models\CommentProject::className(),
  273 + 'class_options' => [
  274 + 'scenario' => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,
  275 + 'user_id' => \Yii::$app->user->getId(),
  276 + 'guestComment' => false,
  277 + 'status' => \common\modules\comment\models\CommentProject::STATUS_ACTIVE,
  278 + ],
  279 + 'list_options' => [
  280 + 'view' => 'list-project-comment',
  281 + 'class' => 'section box tender-offer-proj-wr',
  282 + ],
  283 + 'form_options' => [
  284 + 'view' => 'form-project-comment',
  285 + 'tag' => 'div',
  286 + 'class' => 'artbox_comment_form section-box tender-add-answer',
  287 + ],
  288 + 'options' => [
  289 + 'tag' => false,
  290 + ],
  291 + ]);
  292 + Pjax::end();
  293 + ?>
  294 + </div>
284 </div> 295 </div>
285 </div> 296 </div>
286 - </div>  
287 - <div class="_tabs style">  
288 - <div class="box-wr">  
289 - <div class="box-all">  
290 - <?php  
291 - Pjax::begin();  
292 - echo \common\modules\comment\widgets\CommentWidget::widget([  
293 - 'context' => $this,  
294 - 'model' => $model->className(),  
295 - 'model_id' => $model->project_id,  
296 - 'comment_class' => \common\modules\comment\models\CommentProjectAnswer::className(),  
297 - 'class_options' => [  
298 - 'scenario' => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,  
299 - 'user_id' => \Yii::$app->user->getId(),  
300 - 'guestComment' => false,  
301 - 'status' => \common\modules\comment\models\Comment::STATUS_ACTIVE,  
302 - ],  
303 - 'provider_options' => [  
304 - 'pagination' => [  
305 - 'pageSize' => 2, 297 + <div class="_tabs style">
  298 + <div class="box-wr">
  299 + <div class="box-all">
  300 + <?php
  301 + Pjax::begin();
  302 + echo \common\modules\comment\widgets\CommentWidget::widget([
  303 + 'context' => $this,
  304 + 'model' => $model->className(),
  305 + 'model_id' => $model->project_id,
  306 + 'comment_class' => \common\modules\comment\models\CommentProjectAnswer::className(),
  307 + 'class_options' => [
  308 + 'scenario' => is_int(\Yii::$app->user->getId()) ? \common\modules\comment\models\Comment::SCENARIO_USER : \common\modules\comment\models\Comment::SCENARIO_GUEST,
  309 + 'user_id' => \Yii::$app->user->getId(),
  310 + 'guestComment' => false,
  311 + 'status' => \common\modules\comment\models\Comment::STATUS_ACTIVE,
  312 + ],
  313 + 'provider_options' => [
  314 + 'pagination' => [
  315 + 'pageSize' => 2,
  316 + ],
306 ], 317 ],
307 - ],  
308 - 'success_options' => [  
309 - 'tag' => 'div',  
310 -// 'content' => 'ะ’ะพะฟั€ะพั ัƒัะฟะตัˆะฝะพ ัะพะทะดะฐะฝ ะธ ะฟะพัะฒะธั‚ัั ะบะฐะบ ั‚ะพะปัŒะบะพ ะฑัƒะดะตั‚ ะฟะพะปัƒั‡ะตะฝ ะพั‚ะฒะตั‚',  
311 - 'content' => function(){  
312 - return "<script> 318 + 'success_options' => [
  319 + 'tag' => 'div',
  320 + // 'content' => 'ะ’ะพะฟั€ะพั ัƒัะฟะตัˆะฝะพ ัะพะทะดะฐะฝ ะธ ะฟะพัะฒะธั‚ัั ะบะฐะบ ั‚ะพะปัŒะบะพ ะฑัƒะดะตั‚ ะฟะพะปัƒั‡ะตะฝ ะพั‚ะฒะตั‚',
  321 + 'content' => function() {
  322 + return "<script>
313 addRemoveBlocks() 323 addRemoveBlocks()
314 function addRemoveBlocks() 324 function addRemoveBlocks()
315 { 325 {
@@ -343,136 +353,148 @@ @@ -343,136 +353,148 @@
343 setTimeout(closeSuccsescomm, 4000) 353 setTimeout(closeSuccsescomm, 4000)
344 } 354 }
345 </script>"; 355 </script>";
346 - },  
347 - 'class' => 'test-class-success',  
348 - ],  
349 - 'list_options' => [  
350 - 'view' => 'list-comment-question',  
351 - ],  
352 - 'form_options' => [  
353 - 'view' => 'form-comment-answer',  
354 - 'tag' => 'span',  
355 - 'class' => ( ( $model->user_id == \Yii::$app->user->id ) ? 'hidden' : '' ),  
356 - ],  
357 - 'options' => [  
358 - 'class' => 'proektant-comments-wr fix_te style',  
359 - ],  
360 - ]);  
361 - Pjax::end();  
362 - ?> 356 + },
  357 + 'class' => 'test-class-success',
  358 + ],
  359 + 'list_options' => [
  360 + 'view' => 'list-comment-question',
  361 + ],
  362 + 'form_options' => [
  363 + 'view' => 'form-comment-answer',
  364 + 'tag' => 'span',
  365 + 'class' => ( ( $model->user_id == \Yii::$app->user->id ) ? 'hidden' : '' ),
  366 + ],
  367 + 'options' => [
  368 + 'class' => 'proektant-comments-wr fix_te style',
  369 + ],
  370 + ]);
  371 + Pjax::end();
  372 + ?>
  373 + </div>
363 </div> 374 </div>
364 </div> 375 </div>
365 </div> 376 </div>
366 </div> 377 </div>
367 - </div>  
368 378
369 379
370 -</div>  
371 -<script>  
372 - $(document).ready(  
373 - function()  
374 - {  
375 - tabs_();  
376 - inputNumber();  
377 - tenderMark();  
378 -  
379 - function inputNumber() 380 + </div>
  381 + <script>
  382 + $(document).ready(
  383 + function()
380 { 384 {
381 - $("#commentproject-budget_from, #commentproject-budget_to, #commentproject-term_from, #commentproject-term_to")  
382 - .keypress(  
383 - function(e)  
384 - {  
385 - return 8 == e.which || e.which > 47 && e.which < 58 ? void 0 : !1  
386 - }  
387 - )  
388 - } 385 + tabs_();
  386 + inputNumber();
  387 + tenderMark();
389 388
390 - function tabs_()  
391 - {  
392 - $('.tabs_list').css('display', 'block')  
393 - if(location.hash=='#tabs_2') {  
394 - $('._tabs').css({display : 'block'})  
395 - $('._tabs:first-child').css({display : 'none'})  
396 - $('.tabs_list ul li').addClass('active')  
397 - $('.tabs_list ul li:first-child').removeClass('active')  
398 - } else {  
399 - $('._tabs').css({display : 'none'})  
400 - $('._tabs:first-child').css({display : 'block'}) 389 + function inputNumber()
  390 + {
  391 + $("#commentproject-budget_from, #commentproject-budget_to, #commentproject-term_from, #commentproject-term_to")
  392 + .keypress(
  393 + function(e)
  394 + {
  395 + return 8 == e.which || e.which > 47 && e.which < 58 ? void 0 : !1
  396 + }
  397 + )
401 } 398 }
402 399
403 - $('.tabs_list ul li').click(  
404 - function() 400 + function tabs_()
  401 + {
  402 + $('.tabs_list').css('display', 'block')
  403 + if(location.hash == '#tabs_2')
405 { 404 {
406 - $('.tabs_list ul li').removeClass('active')  
407 - $(this).addClass('active')  
408 - var index = $(this).index()  
409 - var tabs = $('._tabs')  
410 - tabs.css({display : 'none'})  
411 - $(tabs[index]).css({display : 'block'})  
412 - var thisHash = $(this).find('a').attr('href')  
413 - window.location.hash = thisHash; 405 + $('._tabs').css({display : 'block'})
  406 + $('._tabs:first-child').css({display : 'none'})
  407 + $('.tabs_list ul li').addClass('active')
  408 + $('.tabs_list ul li:first-child').removeClass('active')
  409 + } else
  410 + {
  411 + $('._tabs').css({display : 'none'})
  412 + $('._tabs:first-child').css({display : 'block'})
414 } 413 }
415 - )  
416 -  
417 - }  
418 414
419 - function tenderMark()  
420 - {  
421 - var markParrent = $('.project_owner_control')  
422 - markParrent.addClass('_on')  
423 - for(var i = 0; i < markParrent.length; i++)  
424 - {  
425 - var markTxt = $(markParrent[i]).find('a.active')  
426 - $(markParrent[i]).find('p.new_mark_').html(markTxt.text())  
427 - markTxt.css({display : 'none'}) 415 + $('.tabs_list ul li').click(
  416 + function()
  417 + {
  418 + $('.tabs_list ul li').removeClass('active')
  419 + $(this).addClass('active')
  420 + var index = $(this).index()
  421 + var tabs = $('._tabs')
  422 + tabs.css({display : 'none'})
  423 + $(tabs[index]).css({display : 'block'})
  424 + var thisHash = $(this).find('a').attr('href')
  425 + window.location.hash = thisHash;
  426 + }
  427 + )
  428 +
428 } 429 }
429 430
430 - markParrent.click(  
431 - function() 431 + function tenderMark()
  432 + {
  433 + var markParrent = $('.project_owner_control')
  434 + markParrent.addClass('_on')
  435 + for(var i = 0; i < markParrent.length; i++)
432 { 436 {
433 - $(this).toggleClass('focus')  
434 - if($(this).hasClass('focus'))  
435 - {  
436 - $(this).addClass('shadow_')  
437 - var height = $(this).height()  
438 - var newHeight = ($(this).find('div').height()) + 2  
439 - $(this).css({height : (height + newHeight)})  
440 - markParrent.find('a').click(  
441 - function()  
442 - {  
443 - $(this).parent().prev().html($(this).text()) 437 + var markTxt = $(markParrent[i]).find('a.active')
  438 + $(markParrent[i]).find('p.new_mark_').html(markTxt.text())
  439 + markTxt.css({display : 'none'})
  440 + }
444 441
445 - }  
446 - )  
447 - } else 442 + markParrent.click(
  443 + function()
448 { 444 {
449 - $(this).removeClass('shadow_')  
450 - $(this).css({height : 29}) 445 + $(this).toggleClass('focus')
  446 + if($(this).hasClass('focus'))
  447 + {
  448 + $(this).addClass('shadow_')
  449 + var height = $(this).height()
  450 + var newHeight = ($(this).find('div').height()) + 2
  451 + $(this).css({height : (height + newHeight)})
  452 + markParrent.find('a').click(
  453 + function()
  454 + {
  455 + $(this).parent().prev().html($(this).text())
  456 +
  457 + }
  458 + )
  459 + } else
  460 + {
  461 + $(this).removeClass('shadow_')
  462 + $(this).css({height : 29})
  463 + }
451 } 464 }
452 - }  
453 - )  
454 -// submitForm();  
455 - function submitForm() {  
456 - $('.input-blocks-comm-button button').click(function () {  
457 - setInterval(function () {  
458 - var length = ($('.test-class-success').length)  
459 - if(length>0){  
460 - console.log('has') 465 + )
  466 + // submitForm();
  467 + function submitForm()
  468 + {
  469 + $('.input-blocks-comm-button button').click(
  470 + function()
  471 + {
  472 + setInterval(
  473 + function()
  474 + {
  475 + var length = ($('.test-class-success').length)
  476 + if(length > 0)
  477 + {
  478 + console.log('has')
  479 + }
  480 + }, 100
  481 + )
  482 +
461 } 483 }
462 - },100) 484 + )
  485 + }
463 486
464 - })  
465 } 487 }
466 488
467 } 489 }
468 -  
469 - }  
470 - )  
471 -</script>  
472 -<script>  
473 - $('div.rating, div.rating-new').rating(  
474 - {  
475 - fx : 'full', readOnly : 'true', url : 'rating.php'  
476 - }  
477 - );  
478 -</script>  
479 \ No newline at end of file 490 \ No newline at end of file
  491 + )
  492 + </script>
  493 + <script>
  494 + $('div.rating, div.rating-new').rating(
  495 + {
  496 + fx : 'full',
  497 + readOnly : 'true',
  498 + url : 'rating.php'
  499 + }
  500 + );
  501 + </script>
480 \ No newline at end of file 502 \ No newline at end of file
frontend/web/css/style.css
  Show/Hide comments   View file @93a7a3c
@@ -2917,7 +2917,7 @@ input[type=file]::-webkit-file-upload-button { @@ -2917,7 +2917,7 @@ input[type=file]::-webkit-file-upload-button {
2917 .company-performer-comments-bl .rating { 2917 .company-performer-comments-bl .rating {
2918 padding-left: 0; 2918 padding-left: 0;
2919 margin-left: -4px; 2919 margin-left: -4px;
2920 - width: 130px; 2920 + width: 2000px;
2921 overflow: hidden 2921 overflow: hidden
2922 } 2922 }
2923 2923
@@ -3516,6 +3516,15 @@ input[type=file]::-webkit-file-upload-button { @@ -3516,6 +3516,15 @@ input[type=file]::-webkit-file-upload-button {
3516 font-weight: 700; 3516 font-weight: 700;
3517 margin-bottom: 5px; 3517 margin-bottom: 5px;
3518 } 3518 }
  3519 +.search-work-form .info-search-input .form-control {
  3520 + height: 29px;
  3521 + color: #636363;
  3522 + background: #fff;
  3523 + border: 1px solid #dcdcdc;
  3524 + box-sizing: border-box;
  3525 + padding-left: 8px;
  3526 + margin-bottom: 8px;
  3527 +}
3519 3528
3520 .search-work-form select { 3529 .search-work-form select {
3521 border: 1px solid #dcdcdc; 3530 border: 1px solid #dcdcdc;
@@ -12275,7 +12284,7 @@ li.active-menu-admin:hover a .ico_num { @@ -12275,7 +12284,7 @@ li.active-menu-admin:hover a .ico_num {
12275 } 12284 }
12276 12285
12277 .search_perform-stars-wr .rating-container { 12286 .search_perform-stars-wr .rating-container {
12278 - width: 90px; 12287 + width: 180px;
12279 float: left; 12288 float: left;
12280 height: 34px; 12289 height: 34px;
12281 box-sizing: border-box; 12290 box-sizing: border-box;
frontend/web/js/artbox.maps.js
  Show/Hide comments   View file @93a7a3c
@@ -67,7 +67,6 @@ $( @@ -67,7 +67,6 @@ $(
67 ); 67 );
68 function showMarkers(variable, elements) 68 function showMarkers(variable, elements)
69 { 69 {
70 - console.log(elements);  
71 var position = { 70 var position = {
72 lat : undefined, 71 lat : undefined,
73 lng : undefined 72 lng : undefined