git

Виталий
1 parent 57bb4b5a
Showing 3 changed files with 224 additions and 156 deletions Show diff stats
frontend/views/accounts/_portfolio_form.php
frontend/views/ajax/project_user.php
frontend/web/css/style.css
 <?php
-    /**
-     * @var View            $this
-     * @var Portfolio       $portfolio
-     * @var integer[]       $specializations
-     * @var string[]        $galleries
-     * @var PortfolioUser[] $portfolioUsers
-     * @var PortfolioUser[] $portfolioUsersConfirmed
-     */
-    use common\components\Request;
-    use common\models\Option;
-    use common\models\Portfolio;
-    use common\models\PortfolioUser;
-    use common\models\Specialization;
-    use common\modules\file\widgets\ImageUploader;
-    use common\modules\file\widgets\ImageUploaderInput;
-    use mihaildev\ckeditor\CKEditor;
-    use yii\helpers\ArrayHelper;
-    use yii\helpers\Html;
-    use yii\web\View;
-    use yii\widgets\ActiveForm;
-    use \common\widgets\MultiLangForm;
-    use kartik\select2\Select2;
-    use yii\web\JsExpression;
+/**
+ * @var View            $this
+ * @var Portfolio       $portfolio
+ * @var integer[]       $specializations
+ * @var string[]        $galleries
+ * @var PortfolioUser[] $portfolioUsers
+ * @var PortfolioUser[] $portfolioUsersConfirmed
+ */
+use common\components\Request;
+use common\models\Option;
+use common\models\Portfolio;
+use common\models\PortfolioUser;
+use common\models\Specialization;
+use common\modules\file\widgets\ImageUploader;
+use common\modules\file\widgets\ImageUploaderInput;
+use mihaildev\ckeditor\CKEditor;
+use yii\helpers\ArrayHelper;
+use yii\helpers\Html;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+use \common\widgets\MultiLangForm;
+use kartik\select2\Select2;
+use yii\web\JsExpression;
-    $this->title = 'Портфолио';
-    $this->params[ 'breadcrumbs' ][] = $this->title;
+$this->title = 'Портфолио';
+$this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
 <div class="login-left-column-title"><?= $this->title ?></div>
 <?php
-    $form = ActiveForm::begin();
+$form = ActiveForm::begin();
 ?>
 <div class="input-blocks-wrapper full-blocks data-block">
     <?= !empty( $portfolio->date_add ) ? "Дата создания: $portfolio->date_add" : "" ?>
@@ -40,7 +40,7 @@
     <div class="input-blocks-wrapper">
         <div class="input-blocks">
             <?= $form->field($portfolio, 'name')
-                     ->textInput([ 'class' => 'custom-input-2 fix-input-2' ]); ?>
+                ->textInput([ 'class' => 'custom-input-2 fix-input-2' ]); ?>
         </div>
     </div>
@@ -71,13 +71,13 @@
                                                             <?= $form->field($portfolio, "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; ?>
@@ -105,126 +105,126 @@
     <div class="input-blocks-wrapper admin-avatar admin-blog-min-img admin-portfolio-foto">
         <div style="font-size: 13px;color: inherit;font-weight: 700;">Фото главное</div>
         <?= $form->field($portfolio, 'cover')
-                 ->widget(ImageUploaderInput::className(), [
-                     'size'    => [
-                         [
-                             'width'  => 720,
-                             'height' => 280,
-                         ],
-                         [
-                             'width'  => 318,
-                             'height' => 228,
-                         ],
-                         [
-                             'width'  => 152,
-                             'height' => 108,
-                         ],
-                         [
-                             'width'  => 210,
-                             'height' => 150,
-                         ],
-                     ],
-                     'multi'   => false,
-                     'gallery' => $portfolio->cover,
-                     'name'    => 'Загрузить фото',
-                 ]); ?>
+            ->widget(ImageUploaderInput::className(), [
+                'size'    => [
+                    [
+                        'width'  => 720,
+                        'height' => 280,
+                    ],
+                    [
+                        'width'  => 318,
+                        'height' => 228,
+                    ],
+                    [
+                        'width'  => 152,
+                        'height' => 108,
+                    ],
+                    [
+                        'width'  => 210,
+                        'height' => 150,
+                    ],
+                ],
+                'multi'   => false,
+                'gallery' => $portfolio->cover,
+                'name'    => 'Загрузить фото',
+            ]); ?>
     </div>
     <div class="input-blocks-wrapper">
         <div class="input-blocks admin-project-list admin-currency-second admin-portfolio-select">
             <?= $form->field($portfolio, 'gallery_id')
-                     ->hint("<p>Для создания галереи перейдите по " . Html::a('ссылке', [ 'accounts/gallery-create' ], [ 'target' => '_BLANK' ]) . "</p>")
-                     ->dropDownList($galleries, [ 'prompt' => 'Выберите галерею' ]) ?>
+                ->hint("<p>Для создания галереи перейдите по " . Html::a('ссылке', [ 'accounts/gallery-create' ], [ 'target' => '_BLANK' ]) . "</p>")
+                ->dropDownList($galleries, [ 'prompt' => 'Выберите галерею' ]) ?>
         </div>
     </div>
     <div class="input-blocks-wrapper">
         <div class="input-blocks">
             <?= $form->field($portfolio, 'city')
-                     ->widget(Select2::classname(), [
-                         'options'       => [ 'class' => 'Выбор города ...' ],
-                         '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'       => [ 'class' => 'Выбор города ...' ],
+                    '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($portfolio, 'street', [ 'options' => [ 'class' => 'form-group company_info' ] ])
-                     ->label('Улица')
-                     ->textInput([ 'class' => 'custom-input-2' ]); ?>
+                ->label('Улица')
+                ->textInput([ 'class' => 'custom-input-2' ]); ?>
         </div>
         <div class="input-blocks home-input">
             <?= $form->field($portfolio, 'house', [ 'options' => [ 'class' => 'form-group company_info' ] ])
-                     ->label('Дом')
-                     ->textInput([ 'class' => 'custom-input-2' ]); ?>
+                ->label('Дом')
+                ->textInput([ 'class' => 'custom-input-2' ]); ?>
         </div>
     </div>
     <div class="input-blocks-wrapper full-blocks admin-editor-bl">
         <div class="input-blocks">
             <?= $form->field($portfolio, 'preview')
-                     ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]) ?>
+                ->widget(CKEditor::className(), [ 'editorOptions' => [ 'preset' => 'basic' ] ]) ?>
         </div>
     </div>
     <div class="input-blocks-wrapper full-blocks admin-editor-bl">
         <div class="input-blocks">
             <?= $form->field($portfolio, 'description')
-                     ->widget(CKEditor::className()) ?>
+                ->widget(CKEditor::className()) ?>
         </div>
     </div>
     <div class="clearfix"></div>
     <?php
-        /* == Project add user block == */
+    /* == Project add user block == */
     ?>
     <div class="add_project_user_wrapper" id="<?= $form->id ?>_project_user">
-        <p>Добавить пользователя</p>
-        <p><?= Html::a('Добавить', false, [ 'class' => 'add_project_user_link' ]) ?></p>
-        <p>Отправлено предложение:</p>
-        <div class="add_project_user_list">
+        <div class="style add_participant-wr">Добавить участника(ов) проекта</div>
+        <div class="style" style="margin-top: 10px"><?= Html::a('Добавить', false, [ 'class' => 'add_project_user_link add-participant' ]) ?></div>
+        <div class="hidden_sentence style" style="display: none">Отправленные предложения:</div>
+        <div class="add_project_user_list style">
             <?php
-                foreach($portfolioUsers as $portfolioUser) {
-                    echo $this->render('@frontend/views/ajax/project_user', [
-                        'model' => $portfolioUser,
-                        'user'  => $portfolioUser->user,
-                    ]);
-                }
+            foreach($portfolioUsers as $portfolioUser) {
+                echo $this->render('@frontend/views/ajax/project_user', [
+                    'model' => $portfolioUser,
+                    'user'  => $portfolioUser->user,
+                ]);
+            }
             ?>
         </div>
         <?php
-            if(!empty( $portfolioUsersConfirmed )) {
-                ?>
-                <p class="added_project_user_header">Подтвержденные:</p>
-                <div class="added_project_user_list">
-                    <?php
-                        foreach($portfolioUsersConfirmed as $portfolioUserConfirmed) {
-                            echo $this->render('@frontend/views/ajax/project_user', [
-                                'model' => $portfolioUserConfirmed,
-                                'user'  => $portfolioUserConfirmed->user,
-                            ]);
-                        }
-                    ?>
-                </div>
+        if(!empty( $portfolioUsersConfirmed )) {
+            ?>
+            <div class="added_project_user_header _hidden_sentence style">Подтвержденные предложения:</div>
+            <div class="added_project_user_list">
                 <?php
-            }
+                foreach($portfolioUsersConfirmed as $portfolioUserConfirmed) {
+                    echo $this->render('@frontend/views/ajax/project_user', [
+                        'model' => $portfolioUserConfirmed,
+                        'user'  => $portfolioUserConfirmed->user,
+                    ]);
+                }
+                ?>
+            </div>
+            <?php
+        }
         ?>
     </div>
     <?php
-        /* == End of project add user block == */
+    /* == End of project add user block == */
     ?>
 </div>
@@ -234,18 +234,18 @@
         <?= Html::submitButton($portfolio->isNewRecord ? Yii::t('app', 'add') : 'Обновить', [ 'class' => 'input-blocks-wrapper button' ]) ?>
         <div class="admin-remove-note">
             <?php
-                if(!$portfolio->isNewRecord) {
-                    echo Html::a(Yii::t('app', 'delete'), [
-                        'accounts/portfolio-delete',
-                        'id' => $portfolio->portfolio_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(!$portfolio->isNewRecord) {
+                echo Html::a(Yii::t('app', 'delete'), [
+                    'accounts/portfolio-delete',
+                    'id' => $portfolio->portfolio_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>
@@ -255,12 +255,11 @@
     </div>
 </div>
 <?php
-    $form->end();
+$form->end();
 ?>
 <script>
     $(document).ready(
-        function()
-        {
+        function() {
             bottomButton()
             function bottomButton()
             {
@@ -299,6 +298,17 @@
                     );
                 }
             );
+                var blocks = $('.add_project_user_list .project_user_wrapper')
+                if(blocks.length>0) {
+                    $('.hidden_sentence').css({display:'block'})
+                }
+            $('body').on('click', '.project_user_remove', function () {
+                blocks = $('.add_project_user_list .project_user_wrapper')
+                    if((blocks.length-1)<1) {
+                        $('.hidden_sentence').css({display:'none'})
+                    }
+            })
+
         }
     );
 </script>
@@ -10,30 +10,50 @@
     use yii\web\View;
 ?>
-<div class="form-inline project_user_wrapper" data-id="<?=$user->id?>" <?php if($model->status == 1) { echo 'data-portfolio="'.$model->portfolio_id.'"'; } ?>>
+<div class="form-inline project_user_wrapper style" data-id="<?=$user->id?>" <?php if($model->status == 1) { echo 'data-portfolio="'.$model->portfolio_id.'"'; } ?>>
     <div class="error-summary">
         <?=Html::errorSummary($model)?>
     </div>
-    <div class="form-group" style="display: inline-block">
-        <label class="sr-only">User name</label>
-        <p class="form-control-static"><?=Html::a($user->name, ['performer/common', 'performer_id' => $user->id], ['target' => '_blank'])?></p>
-        <?=Html::activeHiddenInput($model, "[{$user->id}]user_id", ['value' => $user->id])?>
-        <?php
-        if($model->status == 1) {
-            echo Html::activeHiddenInput($model, "[{$user->id}]status", ['value' => $model->status]);
-        }
-        ?>
-        <?=Html::activeHiddenInput($model, "[{$user->id}]user_id", ['value' => $user->id])?>
-    </div>
-    <div class="form-group" style="display: inline-block">
-        <?=Html::activeLabel($model, 'position', ['label' => Yii::t('app', 'Должность: ')])?>
-        <?=Html::activeTextInput($model, "[{$user->id}]position", ['class' => 'form-control'])?>
-    </div>
-    <div class="form-group" style="display: inline-block">
-        <?=Html::activeLabel($model, 'time', ['label' => Yii::t('app', 'Часы: ')])?>
-        <?=Html::activeInput('number', $model, "[{$user->id}]time", ['class' => 'form-control'])?>
+
+    <div class="input-blocks-wrapper autor_link_">
+        <div class="form-group">
+            <label class="sr-only">User name</label>
+            <div class="form-control-static fix-link"><?=Html::a($user->name, ['performer/common', 'performer_id' => $user->id], ['target' => '_blank'])?></div>
+            <?=Html::activeHiddenInput($model, "[{$user->id}]user_id", ['value' => $user->id])?>
+            <?php
+            if($model->status == 1) {
+                echo Html::activeHiddenInput($model, "[{$user->id}]status", ['value' => $model->status]);
+            }
+            ?>
+            <?=Html::activeHiddenInput($model, "[{$user->id}]user_id", ['value' => $user->id])?>
+        </div>
     </div>
-    <div class="form-group" style="display:inline-block">
-        <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 class="input-blocks-wrapper" style="margin-top: 0">
+        <div class="input-blocks">
+            <div class="form-group">
+                <?=Html::activeLabel($model, 'position', ['label' => Yii::t('app', 'Должность: ')])?>
+                <?=Html::activeTextInput($model, "[{$user->id}]position", ['class' => 'form-control custom-input-2'])?>
+            </div>
+        </div>
+        <div class="input-blocks home-input">
+            <div class="form-group">
+                <?=Html::activeLabel($model, 'time', ['label' => Yii::t('app', 'Часы: ')])?>
+                <?=Html::activeInput('number', $model, "[{$user->id}]time", ['class' => 'form-control custom-input-2'])?>
+            </div>
+        </div>
+        <div class="form-group remove_people">
+            <span class="project_user_remove" style="background: url('/images/delete-ico.png') no-repeat; width: 13px; height: 13px; display: block; background-size: cover; cursor:pointer"></span>
+        </div>
     </div>
+
+
+
+
 </div>
+<script>
+    var blocks = $('.add_project_user_list .project_user_wrapper')
+    if(blocks.length>0) {
+        $('.hidden_sentence').css({display:'block'})
+    }
+</script>
 \ No newline at end of file
@@ -5060,22 +5060,22 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
     border: 1px solid #fff;
 }
-.input-blocks .required:before {
-    display: block;
-    content: "*";
-    color: #D40000;
-    position: absolute;
-    top: 32px;
-    left: -12px;
-    width: 15px;
-}
+/*.input-blocks .required:before {*/
+    /*display: block;*/
+    /*content: "*";*/
+    /*color: #D40000;*/
+    /*position: absolute;*/
+    /*top: 32px;*/
+    /*left: -12px;*/
+    /*width: 15px;*/
+/*}*/
 .input-blocks .required label:before {
     display: block;
     content: "*";
     color: #D40000;
     position: absolute;
     top: 0px;
-    right: -10px;
+    right: -7px;
 }
 .input-blocks .required.required-no-star:before {
     display: none;
@@ -5749,7 +5749,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     text-align: center;
     margin-bottom: 50px;
 }
-.admin-save-btn button {
+.admin-save-btn button, .add-participant {
     width: 160px;
     height: 29px;
     color: #fff;
@@ -5762,12 +5762,25 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     outline: none;
     border-radius: 4px;
 }
-.admin-save-btn button:hover{
+.add-participant {
+    display: block;
+    text-align: center;
+    background: #fff;
+    color: #0072bc;
+
+}
+.admin-save-btn button:hover {
     background: #fff;
     color: #0072bc;
     transition: 0.2s;
 }
-.admin-save-btn button:focus{background: #00568e;color: #fff;}
+.add-participant:hover {
+    background: #0072bc;
+    color: #fff;
+    text-decoration: none;
+    transition: 0.2s;
+}
+.admin-save-btn button:focus, .add-participant:active {background: #00568e;color: #fff}
 /*select-new*/
 .select2-container--krajee .select2-selection--single {
     height: 29px;
@@ -6152,7 +6165,7 @@ a {color: #0072bc}
     width: 340px;
     height: 260px;
 }
-.admin-blog-min-img .uploader-button {
+.admin-blog-min-img .uploader-button, .btn.add-participant {
     width: auto;
     padding: 0 10px;
     margin-left: 0}
@@ -6823,3 +6836,28 @@ li.active-menu-admin:hover a .ico_num {
 }
 .hint-link-check {margin-top: 23px}
 .fix-color-datepicker .ui-datepicker-title {color: #fff}
+.form-control-static.fix-link {font-size: 13px}
+.form-control-static.fix-link a:hover {color: #0072bc; text-decoration: underline}
+.form-control.custom-input-2 {width: 300px}
+.autor_link_ .form-control-static {
+    margin: 0;
+    padding: 0;
+    min-height: 0;
+}
+.remove_people {
+    position: absolute;
+    width: 13px;
+    height: 13px;
+    left: 414px;
+    top: 30px;
+}
+.add_participant-wr {font-size: 18px; margin-top: 28px}
+.fancybox-overlay {
+    z-index: 9991 !important;
+}
+.hidden_sentence, ._hidden_sentence {
+    font-size: 18px;
+    border-bottom: 1px solid #dcdcdc;
+    margin-top: 27px;
+    padding-bottom: 10px;
+}
 \ No newline at end of file