From c6206ab62a0c3c43d5426cb99b4eaea76ffe2e16 Mon Sep 17 00:00:00 2001
From: icemate <icemate.job@gmail.com>
Date: Mon, 18 Apr 2016 17:07:06 +0300
Subject: [PATCH] git

---
 frontend/views/accounts/participant-edit.php | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
 frontend/views/accounts/participant.php      |   2 +-
 frontend/views/accounts/projects.php         | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------
 frontend/web/css/style.css                   |  13 +++++++++++--
 4 files changed, 230 insertions(+), 142 deletions(-)

diff --git a/frontend/views/accounts/participant-edit.php b/frontend/views/accounts/participant-edit.php
index 05ca1eb..e05c2dc 100644
--- a/frontend/views/accounts/participant-edit.php
+++ b/frontend/views/accounts/participant-edit.php
@@ -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="alert alert-info" role="alert">
-                <strong>Внимание:</strong> данным действием Вы подтверждаете свое участие в проекте.
-            </div>
-            <?php
-        }
+    if($model->status != 1) {
+        ?>
+        <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');
+        $form = ActiveForm::begin();
         ?>
-    </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,
+        <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', 'Для добавления фотографий Вы должны подтвердить свое участие');
-        }
-    ?>
-    <p class="text-right">
+                    '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
-            echo Html::a('Вернуться', [ 'accounts/participant' ]);
-            echo Html::submitButton('Обновить');
-            $form->end();
+        $form->end();
         ?>
-    </p>
-</div>
\ No newline at end of file
+    </div>
+
+
+
+<!--<div>-->
+<!--    <p>Редактировать информацию о себе:</p>-->
+<!--    --><?php
+//        if($model->status != 1) {
+//            ?>
+<!--            <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
diff --git a/frontend/views/accounts/participant.php b/frontend/views/accounts/participant.php
index e7b93e9..8df7d44 100644
--- a/frontend/views/accounts/participant.php
+++ b/frontend/views/accounts/participant.php
@@ -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' ],
diff --git a/frontend/views/accounts/projects.php b/frontend/views/accounts/projects.php
index 6e2d6ce..82261ad 100755
--- a/frontend/views/accounts/projects.php
+++ b/frontend/views/accounts/projects.php
@@ -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>
+
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 6ce2a9c..b48fc3c 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -2535,6 +2535,7 @@ input[type=file]::-webkit-file-upload-button {
     appearance: none;
     background-color: transparent;
     margin-bottom: 16px;
+    padding-left: 8px;
 }
 
 .search-work-form select option:first-child{border-top: none}
@@ -5556,8 +5557,6 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     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}
@@ -6754,4 +6753,14 @@ input[disabled], select[disabled] {
     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;
+}
+#projectsearch-contractual {
+
 }
\ No newline at end of file
--
libgit2 0.21.4