Merge remote-tracking branch 'origin/master'

Conflicts: frontend/views/accounts/participant-edit.php

Merge remote-tracking branch 'origin/master'
Conflicts: frontend/views/accounts/participant-edit.php
Administrator
2 parents d772a604 6fc9a376
Showing 15 changed files with 486 additions and 325 deletions Show diff stats
frontend/assets/AppAsset.php
frontend/views/accounts/_job_form.php
frontend/views/accounts/_projects_form.php
frontend/views/accounts/_vacancy_form.php
frontend/views/accounts/employment.php
frontend/views/accounts/general.php
frontend/views/accounts/participant-edit.php
frontend/views/accounts/participant.php
frontend/views/accounts/projects.php
frontend/views/ajax/project_user.php
frontend/views/layouts/admin.php
frontend/views/layouts/main.php
frontend/web/css/style.css
frontend/web/images/icon_help_01.png
frontend/web/images/icon_question_01.png
@@ -19,7 +19,7 @@ class AppAsset extends AssetBundle
     public $css = [
         '/css/style.css',
         '/admin/css/flags32.css',
-        //'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin',
+        'https://fonts.googleapis.com/css?family=Roboto:400,700&subset=cyrillic,latin',
         '/css/owl.carousel.css'
     ];
     public $js = [
@@ -22,7 +22,7 @@
                          ->textInput([ 'class' => 'custom-input-2' ]); ?>
             </div>
         </div>
-        <div class="input-blocks-wrapper">
+        <div class="input-blocks-wrapper hint-link">
             <div class="input-blocks">
                 <?= $form->field($model, '[' . $index . ']link')
                          ->label('Ссылка на компанию на сайте МФП')
 <?php
-    /**
-     * @var Project          $project
-     * @var Specialization[] $specialization
-     * @var Payment[]        $payment
-     * @var string[]         $projects
-     */
-    use common\components\Request;
-    use common\models\Currency;
-    use common\models\File;
-    use common\models\Payment;
-    use common\models\Project;
-    use common\models\Specialization;
-    use common\modules\file\widgets\ImageUploader;
-    use common\modules\fileloader\widgets\FileloaderWidget;
-    use kartik\select2\Select2;
-    use mihaildev\ckeditor\CKEditor;
-    use yii\helpers\Html;
-    use yii\jui\DatePicker;
-    use yii\web\JsExpression;
-    use yii\widgets\ActiveForm;
-
-    $this->title = 'Проекты';
-    $this->params[ 'breadcrumbs' ][] = $this->title;
+/**
+ * @var Project          $project
+ * @var Specialization[] $specialization
+ * @var Payment[]        $payment
+ * @var string[]         $projects
+ */
+use common\components\Request;
+use common\models\Currency;
+use common\models\File;
+use common\models\Payment;
+use common\models\Project;
+use common\models\Specialization;
+use common\modules\file\widgets\ImageUploader;
+use common\modules\fileloader\widgets\FileloaderWidget;
+use kartik\select2\Select2;
+use mihaildev\ckeditor\CKEditor;
+use yii\helpers\Html;
+use yii\jui\DatePicker;
+use yii\web\JsExpression;
+use yii\widgets\ActiveForm;
+
+$this->title = 'Проекты';
+$this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="login-left-column-title"><?= $this->title ?></div>
 <?php
-    $form = ActiveForm::begin([ 'options' => [ 'enctype' => 'multipart/form-data' ] ]);
+$form = ActiveForm::begin([ 'options' => [ 'enctype' => 'multipart/form-data' ] ]);
 ?>
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($project, 'name')
-                 ->textInput([ 'class' => 'custom-input-2' ]) ?>
+            ->textInput([ 'class' => 'custom-input-2' ]) ?>
     </div>
 </div>
 <div class="input-blocks-wrapper">
     <div class="input-blocks admin-project-list admin-currency-second">
         <?= $form->field($project, 'project_pid')
-                 ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?>
+            ->dropDownList($projects, [ 'prompt' => 'Родительский проект' ]) ?>
     </div>
 </div>
@@ -68,13 +68,13 @@
                                                         <?= $form->field($project, "specializationInput[{$child_second->specialization_id}]", [
                                                             'template' => '{input}{label}{hint}{error}',
                                                         ])
-                                                                 ->label('<span></span>' . $child_second->specialization_name)
-                                                                 ->checkbox([
-                                                                     'value'   => $child_second->specialization_id,
-                                                                     'label'   => NULL,
-                                                                     'uncheck' => NULL,
-                                                                     'class'   => 'custom-check',
-                                                                 ], false) ?>
+                                                            ->label('<span></span>' . $child_second->specialization_name)
+                                                            ->checkbox([
+                                                                'value'   => $child_second->specialization_id,
+                                                                'label'   => NULL,
+                                                                'uncheck' => NULL,
+                                                                'class'   => 'custom-check',
+                                                            ], false) ?>
                                                     </a>
                                                 </li>
                                             <?php endif; ?>
@@ -104,33 +104,33 @@
     <div class="input-blocks-wrapper">
         <div class="input-blocks">
             <?= $form->field($project, 'city')
-                     ->widget(Select2::classname(), [
-                         'options'       => [ 'placeholder' => 'Выбор города ...' ],
-                         'pluginOptions' => [
-                             'allowClear'         => true,
-                             'minimumInputLength' => 3,
-                             'ajax'               => [
-                                 'url'      => \yii\helpers\Url::to([ 'site/city' ]),
-                                 'dataType' => 'json',
-                                 'data'     => new JsExpression('function(params) { return {q:params.term}; }'),
-                             ],
-                             'escapeMarkup'       => new JsExpression('function (markup) { return markup; }'),
-                             'templateResult'     => new JsExpression('function(city) { return city.text; }'),
-                             'templateSelection'  => new JsExpression('function (city) { return city.text; }'),
-                         ],
-                     ]); ?>
+                ->widget(Select2::classname(), [
+                    'options'       => [ 'placeholder' => 'Выбор города ...' ],
+                    'pluginOptions' => [
+                        'allowClear'         => true,
+                        'minimumInputLength' => 3,
+                        'ajax'               => [
+                            'url'      => \yii\helpers\Url::to([ 'site/city' ]),
+                            'dataType' => 'json',
+                            'data'     => new JsExpression('function(params) { return {q:params.term}; }'),
+                        ],
+                        'escapeMarkup'       => new JsExpression('function (markup) { return markup; }'),
+                        'templateResult'     => new JsExpression('function(city) { return city.text; }'),
+                        'templateSelection'  => new JsExpression('function (city) { return city.text; }'),
+                    ],
+                ]); ?>
         </div>
         <div class="input-blocks street-input">
             <?= $form->field($project, 'street', [ 'template' => "{label}{input}{hint}{error}" ])
-                     ->textInput([ 'class' => 'custom-input-2' ]) ?>
+                ->textInput([ 'class' => 'custom-input-2' ]) ?>
         </div>
         <div class="input-blocks home-input">
             <?= $form->field($project, 'house', [ 'template' => "{label}{input}{hint}{error}" ])
-                     ->textInput([ 'class' => 'custom-input-2' ]) ?>
+                ->textInput([ 'class' => 'custom-input-2' ]) ?>
         </div>
     </div>
 </div>
@@ -140,20 +140,20 @@
         <?= $form->field($project, 'budget', [
             'template' => "{label}<br />{input}\n{hint}\n{error}",
         ])
-                 ->textInput([
-                     'class' => 'custom-input-2 custom-input-2-date',
-                     'type'  => 'number',
-                 ]) ?>
+            ->textInput([
+                'class' => 'custom-input-2 custom-input-2-date',
+                'type'  => 'number',
+            ]) ?>
     </div>
     <div class="input-blocks admin-project-list-two admin-currency-second">
         <?= $form->field($project, 'budget_currency')
-                 ->label(false)
-                 ->dropDownList(Currency::getCurrencyDropdown(), [ 'class' => 'custom-input-2' ]); ?>
+            ->label(false)
+            ->dropDownList(Currency::getCurrencyDropdown(), [ 'class' => 'custom-input-2' ]); ?>
     </div>
     <div class="input-blocks admin-who-check-payment admin-project-contractual">
         <?= $form->field($project, 'contractual', [ 'template' => "{input}{label}\n{hint}\n{error}" ])
-                 ->checkbox([ 'class' => 'custom-check' ], false)
-                 ->label('<span></span>Договорной') ?>
+            ->checkbox([ 'class' => 'custom-check' ], false)
+            ->label('<span></span>Договорной') ?>
     </div>
 </div>
@@ -161,37 +161,37 @@
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($project, 'payment_variant')
-                 ->radioList([
-                     1 => 'Без предоплаты',
-                     2 => 'Предоплата возможна',
-                 ], [
-                     'item' => function($index, $label, $name, $checked, $value) {
-                         $return = '<div class="admin-who-check">';
-                         $return .= '<input class="custom-radio" id="select_admin_mfp' . $value . '" type="radio" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
-                         $return .= '<label for="select_admin_mfp' . $value . '" >';
-                         $return .= '<span></span>' . ucwords($label);
-                         $return .= '</label>';
-                         $return .= '</div>';
-                         return $return;
-                     },
-                 ]) ?>
+            ->radioList([
+                1 => 'Без предоплаты',
+                2 => 'Предоплата возможна',
+            ], [
+                'item' => function($index, $label, $name, $checked, $value) {
+                    $return = '<div class="admin-who-check">';
+                    $return .= '<input class="custom-radio" id="select_admin_mfp' . $value . '" type="radio" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
+                    $return .= '<label for="select_admin_mfp' . $value . '" >';
+                    $return .= '<span></span>' . ucwords($label);
+                    $return .= '</label>';
+                    $return .= '</div>';
+                    return $return;
+                },
+            ]) ?>
     </div>
 </div>
 <div class="input-blocks-wrapper">
     <div class="input-blocks">
         <?= $form->field($project, 'paymentInput')
-                 ->checkboxList($payment, [
-                     'item' => function($index, $label, $name, $checked, $value) {
-                         $return = '<div class="admin-who-check-payment">';
-                         $return .= '<input class="custom-check" id="check_admin_mfp' . $value . '" type="checkbox" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
-                         $return .= '<label for="check_admin_mfp' . $value . '" >';
-                         $return .= '<span></span>' . ucwords($label);
-                         $return .= '</label>';
-                         $return .= '</div>';
-                         return $return;
-                     },
-                 ]) ?>
+            ->checkboxList($payment, [
+                'item' => function($index, $label, $name, $checked, $value) {
+                    $return = '<div class="admin-who-check-payment">';
+                    $return .= '<input class="custom-check" id="check_admin_mfp' . $value . '" type="checkbox" name="' . $name . '" value="' . $value . '" ' . ( $checked ? "checked" : "" ) . ' >';
+                    $return .= '<label for="check_admin_mfp' . $value . '" >';
+                    $return .= '<span></span>' . ucwords($label);
+                    $return .= '</label>';
+                    $return .= '</div>';
+                    return $return;
+                },
+            ]) ?>
     </div>
 </div>
@@ -199,70 +199,71 @@
 <div class="input-blocks-wrapper">
     <div class="input-blocks admin-project-days">
         <?= $form->field($project, 'deadline', [ 'template' => "{label}<br />{input}<span class='admn-input-txt' style='padding-left: 10px'>дней</span>\n{hint}\n{error}" ])
-                 ->textInput([
-                     'class' => 'custom-input-2 custom-input-2-date',
-                     'type'  => 'number',
-                 ]) ?>
+            ->textInput([
+                'class' => 'custom-input-2 custom-input-2-date',
+                'type'  => 'number',
+            ]) ?>
     </div>
 </div>
 <div class="input-blocks-wrapper full-blocks admin-editor-bl">
     <div class="input-blocks">
         <?= $form->field($project, 'description')
-                 ->widget(CKEditor::className()) ?>
+            ->widget(CKEditor::className()) ?>
     </div>
 </div>
 <?php
-    /* == Old file upload ==
-    ?>
-    <div class="input-blocks-wrapper admin-project-file">
-        <div class="input-blocks">
-            <div style="position: absolute; float: left;top: 0; left: 0; z-index: 1; width: 100%; overflow: hidden">
-                <div class="gen-admin-title">Присоединить файл</div>
-                <div class="admin-project-file-btn">Загрузить</div>
-                <div class="not-file-mb-adm">До 3 Мб файл</div>
-            </div>
-            <div style="opacity: 0; height: 54px; width: 100%; float: left;position: absolute; top: 0;left: 0; z-index: 2;-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)'">
-                <?= $form->field($project, 'files[]')
-                         ->fileInput([ 'multiple' => 'multiple' ]) ?>
-            </div>
+/* == Old file upload ==
+?>
+<div class="input-blocks-wrapper admin-project-file">
+    <div class="input-blocks">
+        <div style="position: absolute; float: left;top: 0; left: 0; z-index: 1; width: 100%; overflow: hidden">
+            <div class="gen-admin-title">Присоединить файл</div>
+            <div class="admin-project-file-btn">Загрузить</div>
+            <div class="not-file-mb-adm">До 3 Мб файл</div>
+        </div>
+        <div style="opacity: 0; height: 54px; width: 100%; float: left;position: absolute; top: 0;left: 0; z-index: 2;-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=0)'">
+            <?= $form->field($project, 'files[]')
+                     ->fileInput([ 'multiple' => 'multiple' ]) ?>
         </div>
     </div>
-    <?php
-        == End of old file upload == */
+</div>
+<?php
+    == End of old file upload == */
 ?>
 <div class="input-blocks-wrapper">
     <?php
-        echo $form->field($project, 'fileloader')
-                  ->label(false)
-                  ->widget(FileloaderWidget::className(), [
-                      'labelOptions' => [ 'label' => '<div class="gen-admin-title">Присоединить файлы</div><div class="admin-project-file-btn">Загрузить</div><div class="not-file-mb-adm">До 3 Мб файл</div>' ],
-                      'inputOptions' => [
-                          'multiple' => 'multiple',
-                          'class'    => 'hidden',
-                      ],
-                      'options'      => [ 'class' => 'fileloader-file' ],
-                  ]);
+    echo $form->field($project, 'fileloader')
+        ->label(false)
+        ->widget(FileloaderWidget::className(), [
+            'labelOptions' => [ 'label' => '<div class="gen-admin-title">Присоединить файлы</div><div class="admin-project-file-btn">Загрузить</div><div class="not-file-mb-adm">До 3 Мб файл</div>' ],
+            'inputOptions' => [
+                'multiple' => 'multiple',
+                'class'    => 'hidden',
+            ],
+            'options'      => [ 'class' => 'fileloader-file' ],
+        ]);
     ?>
 </div>
 <div class="input-blocks-wrapper">
     <div class="input-blocks admin-project-list admin-currency-second">
         <?= $form->field($project, 'date_end')
-                 ->widget(DatePicker::className(), [
-                     'dateFormat'    => 'yyyy-MM-dd',
-                     'clientOptions' => [ 'minDate' => 1 ],
-                 ]) ?>
+            ->widget(DatePicker::className(), [
+                'dateFormat'    => 'yyyy-MM-dd',
+                'clientOptions' => [ 'minDate' => 1 ],
+            ]) ?>
     </div>
 </div>
-<div class="input-blocks-wrapper">
+<div class="input-blocks-wrapper hint-link hint-link-check">
     <div class="input-blocks admin-project-list admin-currency-second">
-        <?= $form->field($project, 'hidden')
-                 ->checkbox()
-                 ->hint('Проект, снятый с тендера, будет добавлен в Архив (не доступен в поиске, но доступен по ссылке)') ?>
+        <?= $form->field($project, 'hidden', [ 'template' => "{input}{label}\n{hint}\n{error}" ])
+            ->checkbox([ 'class' => 'custom-check admin-check' ], false)
+            ->label('<span></span>Снять с тендера')
+            ->hint('Проект, снятый с тендера, будет добавлен в Архив (не доступен в поиске, но доступен по ссылке)') ?>
     </div>
 </div>
@@ -271,18 +272,18 @@
         <?= Html::submitButton($project->isNewRecord ? Yii::t('app', 'add') : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
         <div class="admin-remove-note">
             <?php
-                if(!$project->isNewRecord) {
-                    echo Html::a(Yii::t('app', 'delete'), [
-                        'accounts/projects-delete',
-                        'id' => $project->project_id,
-                    ], [
-                        'title'        => Yii::t('app', 'delete'),
-                        'aria-label'   => Yii::t('app', 'delete'),
-                        'data-confirm' =>  Yii::t('app', 'delete_confirm'),
-                        'data-method'  => 'post',
-                        'data-pjax'    => 0,
-                    ]);
-                }
+            if(!$project->isNewRecord) {
+                echo Html::a(Yii::t('app', 'delete'), [
+                    'accounts/projects-delete',
+                    'id' => $project->project_id,
+                ], [
+                    'title'        => Yii::t('app', 'delete'),
+                    'aria-label'   => Yii::t('app', 'delete'),
+                    'data-confirm' =>  Yii::t('app', 'delete_confirm'),
+                    'data-method'  => 'post',
+                    'data-pjax'    => 0,
+                ]);
+            }
             ?>
         </div>
         <div class="admin-back-note">
@@ -292,7 +293,7 @@
 </div>
 <?php
-    $form->end();
+$form->end();
 ?>
 <script>
     $(document).ready(
@@ -308,7 +309,7 @@
             if($('.admin-project-contractual input[type="checkbox"]').prop("checked"))
             {
                 $('.admin-project-list-two input, .admin-project-list-two select')
-                .attr('disabled', 'disabled')
+                    .attr('disabled', 'disabled')
             }
             $('.admin-project-contractual input[type="checkbox"]').change(
                 function()
@@ -316,11 +317,11 @@
                     if($(this).prop("checked"))
                     {
                         $('.admin-project-list-two input, .admin-project-list-two select')
-                        .attr('disabled', 'disabled')
+                            .attr('disabled', 'disabled')
                     } else
                     {
                         $('.admin-project-list-two input, .admin-project-list-two select')
-                        .removeAttr('disabled')
+                            .removeAttr('disabled')
                     }
                 }
             )
@@ -334,6 +335,10 @@
                 }
             );
+            $('#project-date_end').focus(function () {
+                $('#ui-datepicker-div').addClass('fix-color-datepicker')
+            })
         }
     )
 </script>
+
@@ -66,7 +66,7 @@
     </div>
 </div>
-<div class="input-blocks-wrapper">
+<div class="input-blocks-wrapper hint-link hint-link-fx">
     <div class="input-blocks">
         <?= $form->field($vacancy, 'city')
                  ->hint('Город, в котором предлагается работа', ['tag' => 'span'])
@@ -28,7 +28,7 @@
             </div>
         </div>
-        <div class="input-blocks-wrapper">
+        <div class="input-blocks-wrapper hint-link">
             <div class="input-blocks">
                 <?= $form->field($current, '[0]link')
                          ->label('Ссылка на компанию на сайте МФП')
@@ -113,7 +113,7 @@
                     </div>
                 </div>
-                <div class="input-blocks-wrapper">
+                <div class="input-blocks-wrapper hint-link">
                     <div class="input-blocks">
                         <?= $form->field($job_model, '[' . ( $index + 1 ) . ']link')
                                  ->label('Ссылка на компанию на сайте МФП')
@@ -33,20 +33,18 @@
                          ], false); ?>
             </div>
             <div class="general-check-right">
-                <div class="general-check-right-txt general-check-right-txt-fix">Обязательно должны быть указаны специализации услуг, что бы вы попали в рейтинг исполнителей</div>
+                <div class="general-check-right-txt">
+                    Обязательно должны быть указаны специализации услуг, что бы вы попали в рейтинг исполнителей
+                        <?php
+                        if(!empty($user->specializations)) {
+                            echo "<p>В Вашем профиле указаны специализации: ".count($user->specializations)."</p>";
+                        } else {
+                            echo "<p>В Вашем профиле не указаны специализации. Чтобы указать - перейдите по ".Html::a('ссылке', ['accounts/service'], ['target' => '_blank'])."</p>";
+                        }
+                        ?>
+                </div>
             </div>
         </div>
-        <div>
-            <p>
-                <?php
-                if(!empty($user->specializations)) {
-                    echo "<p>В Вашем профиле указаны специализации: ".count($user->specializations)."</p>";
-                } else {
-                    echo "<p>В Вашем профиле не указаны специализации. Чтобы указать - перейдите по ".Html::a('ссылке', ['accounts/service'], ['target' => '_blank'])."</p>";
-                }
-                ?>
-            </p>
-        </div>
         <div class="general-check">
             <div class="general-check-left">
                 <?= $form->field($user_info, 'is_customer', [ 'template' => "{input}\n{label}\n{error}" ])
@@ -56,19 +54,17 @@
                          ], false); ?>
             </div>
             <div class="general-check-right">
-                <div class="general-check-right-txt general-check-right-txt-fix">Обязательно должны быть созданы проекты вами, что бы вы попали в рейтинг заказчиков</div>
-            </div>
-        </div>
-        <div>
-            <p>
-                <?php
+                <div class="general-check-right-txt">
+                    Обязательно должны быть созданы проекты вами, что бы вы попали в рейтинг заказчиков
+                    <?php
                     if(!empty($user->projects)) {
                         echo "<p>В Вашем профиле добавлены проекты: ".count($user->projects)."</p>";
                     } else {
                         echo "<p>В Вашем профиле не добавлены проекты. Чтобы добавить - перейдите по ".Html::a('ссылке', ['accounts/projects'], ['target' => '_blank'])."</p>";
                     }
-                ?>
-            </p>
+                    ?>
+                </div>
+            </div>
         </div>
     </div>
     <div class="general-who style border-general">
@@ -14,53 +14,129 @@
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="login-left-column-title"><?= $this->title ?></div>
-<div>
-    <p>Редактировать информацию о себе:</p>
+<div class="login-left-column-title-two style">Редактировать информацию о себе:</div>
+    <?php
+    if($model->status != 1) {
+        ?>
+        <div class="attention_bl style" role="alert">
+            <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте.
+        </div>
+        <?php
+    }
+    ?>
+
+        <?php
+        $form = ActiveForm::begin();
+        ?>
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?= $form->field($model, 'position')
+                    ->textInput([ 'class' => 'custom-input-2' ]);
+                ?>
+            </div>
+        </div>
+
+        <div class="input-blocks-wrapper">
+            <div class="input-blocks">
+                <?=
+                $form->field($model, 'time')
+                    ->textInput([
+                        'class' => 'custom-input-2',
+                        'type'  => 'number',
+                        'min'   => 0,
+                    ])
+                ?>
+            </div>
+        </div>
+
+
+    <div class="login-left-column-title-two style">Добавить фотографию в личный альбом данного проекта:</div>
+    <div class="input-blocks-wrapper full-blocks admin-editor-bl">
+        <div class="input-blocks">
+            <?php
+            if($model->status == 1 && !empty( $model->gallery )) {
+                echo $form->field($model->portfolioGallery, 'caption')
+                    ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]);
+                echo Html::tag('div', ImageUploader::widget([
+                    'model'   => $model->gallery,
+                    'field'   => 'photo',
+                    'size'    => [
+                        [
+                            'width'  => 152,
+                            'height' => 108,
+                        ],
+                    ],
+                    'multi'   => true,
+                    'gallery' => $model->gallery->photo,
+                    'name'    => 'Загрузить фото галереи',
+                ]), [ 'class' => 'admin-gallery-photos-load-wr style' ]);
+            } else {
+                echo Html::tag('p', 'Для добавления фотографий Вы должны подтвердить свое участие');
+            }
+            ?>
+        </div>
+    </div>
+
+    <div class="admin-save-btn skills-save-btn admin-add-remove-wr style">
+       <div class="admin-back-note">
+           <?= Html::a('Вернуться', [ 'accounts/participant' ]); ?>
+       </div>
+
+        <?= Html::submitButton('Обновить'); ?>
+        <?php
+        $form->end();
+        ?>
+    </div>
+
+
+
+<!--<div>-->
+<!--    <p>Редактировать информацию о себе:</p>-->
 <!--    --><?php
 //        if($model->status != 1) {
 //            ?>
-            <div class="alert alert-info" role="alert">
-                <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте.
-            </div>
+<!--            <div class="alert alert-info" role="alert">-->
+<!--                <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте.-->
+<!--            </div>-->
 <!--            --><?php
 //        }
 //    ?>
-    <div>
-        <?php
-            $form = ActiveForm::begin();
-            echo $form->field($model, 'position')
-                      ->textInput();
-            echo $form->field($model, 'time')
-                      ->input('number');
-        ?>
-    </div>
-    <p>Добавить фотографию в личный альбом данного проекта:</p>
-    <?php
-        if($model->status == 1 && !empty( $model->gallery )) {
-            echo $form->field($model->portfolioGallery, 'caption')
-                      ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]);
-            echo Html::tag('div', ImageUploader::widget([
-                'model'   => $model->gallery,
-                'field'   => 'photo',
-                'size'    => [
-                    [
-                        'width'  => 152,
-                        'height' => 108,
-                    ],
-                ],
-                'multi'   => true,
-                'gallery' => $model->gallery->photo,
-                'name'    => 'Загрузить фото галереи',
-            ]), [ 'class' => 'admin-gallery-photos-load-wr style' ]);
-        } else {
-            echo Html::tag('p', 'Для добавления фотографий Вы должны подтвердить свое участие');
-        }
-    ?>
-    <p class="text-right">
-        <?php
-            echo Html::a('Вернуться', [ 'accounts/participant' ]);
-            echo Html::submitButton('Обновить');
-            $form->end();
-        ?>
-    </p>
-</div>
 \ No newline at end of file
+<!--    <div>-->
+<!--        --><?php
+//            $form = ActiveForm::begin();
+//            echo $form->field($model, 'position')
+//                      ->textInput();
+//            echo $form->field($model, 'time')
+//                      ->input('number');
+//        ?>
+<!--    </div>-->
+<!--    <p>Добавить фотографию в личный альбом данного проекта:</p>-->
+<!--    --><?php
+//        if($model->status == 1 && !empty( $model->gallery )) {
+//            echo $form->field($model->portfolioGallery, 'caption')
+//                      ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]);
+//            echo Html::tag('div', ImageUploader::widget([
+//                'model'   => $model->gallery,
+//                'field'   => 'photo',
+//                'size'    => [
+//                    [
+//                        'width'  => 152,
+//                        'height' => 108,
+//                    ],
+//                ],
+//                'multi'   => true,
+//                'gallery' => $model->gallery->photo,
+//                'name'    => 'Загрузить фото галереи',
+//            ]), [ 'class' => 'admin-gallery-photos-load-wr style' ]);
+//        } else {
+//            echo Html::tag('p', 'Для добавления фотографий Вы должны подтвердить свое участие');
+//        }
+//    ?>
+<!--    <p class="text-right">-->
+<!--        --><?php
+//            echo Html::a('Вернуться', [ 'accounts/participant' ]);
+//            echo Html::submitButton('Обновить');
+//            $form->end();
+//        ?>
+<!--    </p>-->
+<!--</div>-->
 \ No newline at end of file
@@ -16,7 +16,7 @@
     $this->title = 'Портфолио участник';
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
-<div class="login-left-column-title"><?= $this->title ?></div>
+<div class="login-left-column-title fix"><?= $this->title ?></div>
 <div class="admin-table-portfolio">
     <?= GridView::widget([
         'options'      => [ 'class' => 'style admin-all-pages-wr' ],
@@ -19,109 +19,112 @@
 <div class="admin-all-pages-add">
     <?= Html::a(Yii::t('app', 'add'), [ 'projects-create' ], [ 'class' => 'btn btn-success' ]) ?>
 </div>
-<?= GridView::widget([
-    'options' => ['class'=>'style admin-all-pages-wr'],
-    'dataProvider' => $dataProvider,
-    'filterModel'  => $searchModel,
-    'columns'      => [
-        [
-            'attribute' => 'project_id',
-            'label'     => 'ID',
-        ],
-        'name',
-        [
-            'attribute' => 'date_add',
-            'filter' => "<div class=\"input-group input-group-xs input-daterange\">
+<div class="admin-table-portfolio">
+    <?= GridView::widget([
+        'options' => ['class'=>'style admin-all-pages-wr'],
+        'dataProvider' => $dataProvider,
+        'filterModel'  => $searchModel,
+        'columns'      => [
+            [
+                'attribute' => 'project_id',
+                'label'     => 'ID',
+            ],
+            'name',
+            [
+                'attribute' => 'date_add',
+                'filter' => "<div class=\"input-group input-group-xs input-daterange\">
 <span class='field-teamsearch-experience_from_from'>".
-                DatePicker::widget([
-                    'model' => $searchModel,
-                    'attribute' => 'date_add_from',
-                    'language' => 'ru',
-                    'dateFormat' => 'yyyy-MM-dd',
-                    'clientOptions' => [
-                        'changeYear' => true,
-                        'changeMonth' => true,
-                    ],
-                ]).
-                "</span>
+                    DatePicker::widget([
+                        'model' => $searchModel,
+                        'attribute' => 'date_add_from',
+                        'language' => 'ru',
+                        'dateFormat' => 'yyyy-MM-dd',
+                        'clientOptions' => [
+                            'changeYear' => true,
+                            'changeMonth' => true,
+                        ],
+                    ]).
+                    "</span>
 <span class=\"input-group-addon kv-field-separator\">
 <i class=\"glyphicon glyphicon-resize-horizontal\"></i>
 </span>
 <span class='field-teamsearch-experience_from_to'>".
-                DatePicker::widget([
-                    'model' => $searchModel,
-                    'attribute' => 'date_add_to',
-                    'language' => 'ru',
-                    'dateFormat' => 'yyyy-MM-dd',
-                    'clientOptions' => [
-                        'changeYear' => true,
-                        'changeMonth' => true,
-                    ],
-                ])
-                ."</span>
+                    DatePicker::widget([
+                        'model' => $searchModel,
+                        'attribute' => 'date_add_to',
+                        'language' => 'ru',
+                        'dateFormat' => 'yyyy-MM-dd',
+                        'clientOptions' => [
+                            'changeYear' => true,
+                            'changeMonth' => true,
+                        ],
+                    ])
+                    ."</span>
 </div>",
-            'format' => 'html',
-        ],
-        [
-            'attribute' => 'budget',
-            'filter' => Html::activeInput('text', $searchModel, 'budget_approx'),
-            'value' => function($model, $key, $index, $column) {
-                /**
-                 * @var Project $model
-                 */
-                if($model->contractual) {
-                    return 'Договорной';
-                } elseif(empty($model->budget)) {
-                    return 'Не задано';
-                } else {
-                    return $model->budget;
-                }
-            },
-            'label' => $searchModel->getAttributeLabel('budget').' +/- 10%',
-        ],
-        [
-            'attribute' => 'contractual',
-            'filter' => Html::activeDropDownList($searchModel, 'contractual', [1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все']),
-            'value' => function($model) {
-                return \Yii::$app->formatter->asBoolean($model->contractual);
-            }
-        ],
-        'city',
-        [
-            'attribute' => 'specializationString',
-        ],
-        'view_count',
-        [
-            'value' => function($model, $key, $index, $column) {
-                return count($model->comments);
-            },
-            'label' => 'Отклики',
-        ],
-        [
-            'class'    => ActionColumn::className(),
-            'buttons'  => [
-                'update' => function($url, $model, $key) {
-                    return Html::a('<img src="/images/ico_pencil.png" alt="">', [
-                        'projects-update',
-                        'id' => $model->project_id,
-                    ],[
-                        'title'        => 'Редактировать',
-                    ]);
+                'format' => 'html',
+            ],
+            [
+                'attribute' => 'budget',
+                'filter' => Html::activeInput('text', $searchModel, 'budget_approx', ['class'=>'form-control']),
+                'value' => function($model, $key, $index, $column) {
+                    /**
+                     * @var Project $model
+                     */
+                    if($model->contractual) {
+                        return 'Договорной';
+                    } elseif(empty($model->budget)) {
+                        return 'Не задано';
+                    } else {
+                        return $model->budget;
+                    }
                 },
-                'delete' => function($url, $model, $key) {
-                    return Html::a('<img src="/images/delete-ico.png" alt="">', [
-                        'projects-delete',
-                        'id' => $model->project_id,
-                    ], [
-                        'title'        => Yii::t('app', 'delete'),
-                        'aria-label'   => Yii::t('app', 'delete'),
-                        'data-confirm' =>  Yii::t('app', 'delete_confirm'),
-                        'data-method'  => 'post',
-                        'data-pjax'    => '0',
-                    ]);
+                'label' => $searchModel->getAttributeLabel('budget').' +/- 10%',
+            ],
+            [
+                'attribute' => 'contractual',
+                'filter' => Html::activeDropDownList($searchModel, 'contractual',[1 => 'Только договорные', 2 => 'Без договорных'], ['prompt' => 'Все', 'class'=>'form-control']),
+                'value' => function($model) {
+                    return \Yii::$app->formatter->asBoolean($model->contractual);
+                }
+            ],
+            'city',
+            [
+                'attribute' => 'specializationString',
+            ],
+            'view_count',
+            [
+                'value' => function($model, $key, $index, $column) {
+                    return count($model->comments);
                 },
+                'label' => 'Отклики',
+            ],
+            [
+                'class'    => ActionColumn::className(),
+                'buttons'  => [
+                    'update' => function($url, $model, $key) {
+                        return Html::a('<img src="/images/ico_pencil.png" alt="">', [
+                            'projects-update',
+                            'id' => $model->project_id,
+                        ],[
+                            'title'        => 'Редактировать',
+                        ]);
+                    },
+                    'delete' => function($url, $model, $key) {
+                        return Html::a('<img src="/images/delete-ico.png" alt="">', [
+                            'projects-delete',
+                            'id' => $model->project_id,
+                        ], [
+                            'title'        => Yii::t('app', 'delete'),
+                            'aria-label'   => Yii::t('app', 'delete'),
+                            'data-confirm' =>  Yii::t('app', 'delete_confirm'),
+                            'data-method'  => 'post',
+                            'data-pjax'    => '0',
+                        ]);
+                    },
+                ],
+                'template' => '{update} {delete}',
             ],
-            'template' => '{update} {delete}',
         ],
-    ],
-]); ?>
+    ]); ?>
+</div>
+
@@ -34,6 +34,6 @@
         <?=Html::activeInput('number', $model, "[{$user->id}]time", ['class' => 'form-control'])?>
     </div>
     <div class="form-group" style="display:inline-block">
-        <span class="project_user_remove" style="background: url('/images/delete-ico.png'); width: 15px; height: 15px; display: block; background-size: cover; cursor:pointer"></span>
+        <span class="project_user_remove" style="background: url('/images/delete-ico.png'); width: 13px; height: 13px; display: block; background-size: cover; cursor:pointer"></span>
     </div>
 </div>
@@ -55,7 +55,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                         'active' => preg_match('/^portfolio.*$/', $this->context->action->id)?true:false,
                     ],
                     [
-                        'label' => "Портфолио участник <span class='badge'>{$this->params['portfolio_user_count']}</span>",
+                        'label' => "Портфолио участник <span class='ico_num'>{$this->params['portfolio_user_count']}</span>",
                         'encode' => false,
                         'url' => ['accounts/participant'],
                         'active' => preg_match('/^participant.*$/', $this->context->action->id)?true:false,
@@ -39,8 +39,8 @@ AppAsset::register($this);
                 <a href="/"><img class="logo" src="/images/logo.png" width="100" height="68" alt=""/></a>
                 <div class="header-proektant-slogan">Международная Федерация Проектантов</div>
                 <ul class="header-contacts-menu">
-                    <li><span><img src="/images/ico-contact.png" alt=""/></span><?=  Html::a('Контакты','', ['class' =>'contactsLinkModalFirst'])?></li>
-                    <li><span><img src="/images/ico-question.png" alt=""/></span><?=  Html::a('Помощь',['/site/help'], ['class' =>'contactsLinkModal'])?></li>
+                    <li><span><img src="/images/icon_question_01.png" alt=""/></span><?=  Html::a('Задать вопрос','', ['class' =>'contactsLinkModalFirst'])?></li>
+                    <li><span><img src="/images/icon_help_01.png" alt=""/></span><?=  Html::a('Помощь',['/site/help'], ['class' =>'contactsLinkModal'])?></li>
                 </ul>
                 <div class="header-cabinet-wr">
                     <?php
@@ -113,7 +113,7 @@ AppAsset::register($this);
                     </div>
                 </li>
                 <li>
-                    <span>Компаням</span>
+                    <span>Компаниям</span>
                     <div class="main-menu-hover">
                         <ul>
@@ -146,12 +146,13 @@ ul.header-contacts-menu li span {
 }
 ul.header-contacts-menu li a {
     color: #0072bc;
-    text-decoration: underline;
+    text-decoration: none;
     font-size: 13px;
     height: 20px;
     display: block;
     line-height: 20px;
 }
+ul.header-contacts-menu li a:hover {text-decoration: underline}
 ul.header-contacts-menu li:last-child a {
     text-decoration: dashed;
 }
@@ -185,7 +186,7 @@ ul.header-contacts-menu li:last-child a {
 }
 .header-cabinet-wr a {
     float: left;
-    text-decoration: underline;
+    text-decoration: none;
     color: #0072bc;
     font-size: 13px;
     transition: 0.3s;
@@ -196,7 +197,7 @@ ul.header-contacts-menu li:last-child a {
     height: 15px;
     white-space: nowrap;
 }
-.header-cabinet-wr a:hover{opacity: 0.9}
+.header-cabinet-wr a:hover{opacity: 0.9; text-decoration: underline}
 .header-cabinet-wr a:before{
     content: '';
     height: 15px;
@@ -2535,6 +2536,8 @@ input[type=file]::-webkit-file-upload-button {
     appearance: none;
     background-color: transparent;
     margin-bottom: 16px;
+    padding-left: 8px;
+    margin-top: 5px;
 }
 .search-work-form select option:first-child{border-top: none}
@@ -3362,7 +3365,7 @@ ul.proektant-comments {margin-top: 15px}
     width: 104px;
     height: 41px;
     float: right;
-    margin-right: 20px;
+    margin-right: 38px;
     position: relative;
 }
 .main-menu-icons-wr a{
@@ -4098,7 +4101,9 @@ ul.min_markers_two
 }
 .cabinet-list li:first-child{margin-left: 0}
 .cabinet-list li img {margin-top: 4px; float: left; margin-right: 10px}
-.cabinet-list li span{ border-bottom: 1px solid #333333;}
+.cabinet-list li span{
+    /*border-bottom: 1px solid #333333;*/
+}
 .cabinet-list a {color: inherit}
 .left-proektant-cabinet .navi-buttons-yet-wr {margin-bottom: 50px}
 .right-proektant-cabinet-candidate, .right-proektant-cabinet-message, .right-proektant-cabinet-message-new {
@@ -4646,7 +4651,7 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
     float: left;
 }
-.custom-input-2 {
+.custom-input-2, input.hasDatepicker {
     width: 300px;
     height: 29px;
     border: 1px solid #dcdcdc;
@@ -4661,12 +4666,13 @@ ul.download-list-files li:hover .download-link {transition: 0.2s; opacity: 1; -m
     outline: none;
 }
 .custom-input-2.fix-input-2 {width: 100%}
-.custom-input-2:focus, .selectize-input input:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none}
+.custom-input-2:focus, .selectize-input input:focus, .search-work-form select:focus, input.hasDatepicker:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none}
 .input-blocks select {margin-top: 5px}
 .input-blocks label, .skills-title {
     font-size: 13px;
     color: inherit;
     font-weight: 700;
+    position: relative;
 }
 .input-blocks-help-wr {
@@ -5060,9 +5066,17 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
     color: #D40000;
     position: absolute;
     top: 32px;
-    left: -15px;
+    left: -12px;
     width: 15px;
 }
+.input-blocks .required label:before {
+    display: block;
+    content: "*";
+    color: #D40000;
+    position: absolute;
+    top: 0px;
+    right: -10px;
+}
 .input-blocks .required.required-no-star:before {
     display: none;
 }
@@ -5549,14 +5563,13 @@ ul.menu-admin li:hover a{
     color: #62b8ef;
     transition: 0.2s;
 }
+ul.menu-admin li:hover a .ico_num {color: #fff}
 ul.menu-admin li.active-menu-admin {background: #62b8ef;}
 ul.menu-admin li.active-menu-admin a{color: #fff}
 ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-child, ul.menu-admin li:last-child a{
     height: 34px;
     line-height: 34px;
 }
-
-
 .login-left-column-title {border-bottom: 1px solid #dbdbdb;  margin-top: 15px;  padding-bottom: 27px;}
 .login-left-column-title,  .login-left-column-title h1{font-size: 18px}
 .form-group{margin-bottom: 0}
@@ -5577,17 +5590,15 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     width: 595px;
     float: right;
 }
-.general-check {  height: 30px; position: relative }
+.general-check-right p {margin:0 !important; color: #333}
+.general-check {position: relative; width: 100%; float: left; margin-top: 10px; }
+.general-check:first-child {margin-top: 0}
 .general-check-right-txt {
     font-size: 13px;
     color: #b7b7b7;
-    display: table-cell;
-    vertical-align: middle;
-    height: 19px;
-}
-.general-check-right-txt-fix {
-    height: 30px;
+    display: block;
 }
+
 .general-check input.custom-check + label span {margin-top: 4px;}
 .gen-admin-title {
     font-size: 18px;
@@ -5825,11 +5836,15 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     background-image: none;
     background: #dcdcdc !important;
     padding-top: 9px;
+    box-shadow: none !important;
 }
 .admin-editor-bl .cke_bottom {
     background-image: none;
     background: #dcdcdc !important;
 }
+.admin-editor-bl .cke_reset, .admin-editor-bl .cke_chrome {
+    box-shadow: none !important;
+}
 .remove.input-blocks-wrapper button {margin-left: 10px}
 .data-block {font-size: 13px; color: #b7b7b7; text-align: right}
 .hidden-foto .file-uploader-block, .hidden-foto .tst, .hidden-foto .admin-avatar-pattern-wr {width: 100%}
@@ -6456,6 +6471,7 @@ input[disabled], select[disabled] {
     padding-left: 8px;
     width: 85px;
     float: left;
+    margin-top: 0;
 }
 .admin-table-portfolio .input-group.input-group-xs input:focus{
     box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none
@@ -6742,3 +6758,68 @@ input[disabled], select[disabled] {
 .add_project_user_wrapper .add_project_user_link {
     cursor: pointer;
 }
+.ico_num {
+    background: #62b8ef;
+    height: 18px;
+    min-width: 18px;
+    padding: 0 2px;
+    line-height: 18px;
+    display: block;
+    text-align: center;
+    position: absolute;
+    top: 50%;
+    right: 7px;
+    margin-top: -10px;
+    border-radius: 4px;
+}
+li.active-menu-admin .ico_num {
+    background: #0072BC;
+    color: #62b8ef;
+}
+li.active-menu-admin:hover a .ico_num {
+    color: #62b8ef !important;
+}
+/***form-rating***/
+.search-work-form .ui-widget {
+    height: 1px;
+    border: 0;
+    background: #0072bc;
+}
+.search-work-form .ui-state-default {
+    background: #0072bc;
+    border-radius: 100%;
+    outline: none;
+    margin-top: -5px;
+}
+.search-work-form .ui-state-hover {
+    background: #0072bc;
+}
+.search-work-form #w0-rating {
+    font-family: inherit;
+    font-size: 13px;
+    color: inherit;
+}
+/*****************/
+.hint-link .hint-block {
+    font-size: 13px;
+    position: absolute;
+    top: 50%;
+    margin-top: 5px;
+    left: 310px;
+    color: #b7b7b7;
+}
+.hint-link.hint-link-fx .hint-block{
+    margin-left: 36px;
+}
+.attention_bl {
+    font-size: 13px;
+    color: #D40000;
+    margin-top: 12px;
+}
+.hint-link.hint-link-check .hint-block {
+    top:0;
+    margin-top: -3px;
+    left: 133px;
+}
+.hint-link-check {margin-top: 23px}
+.fix-color-datepicker .ui-datepicker-title {color: #fff}