From df1b36d6cb0f91e05ebad052f562688e6d15ca5e Mon Sep 17 00:00:00 2001
From: icemate <icemate.job@gmail.com>
Date: Fri, 19 Feb 2016 13:28:09 +0200
Subject: [PATCH] tokar commit

---
 frontend/views/accounts/_portfolio_form.php |  16 ++++++++++------
 frontend/views/accounts/portfolio.php       | 136 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
 frontend/web/css/style.css                  |  30 +++++++++++++++++++++++++++++-
 3 files changed, 108 insertions(+), 74 deletions(-)

diff --git a/frontend/views/accounts/_portfolio_form.php b/frontend/views/accounts/_portfolio_form.php
index b8102cf..eaf7c8c 100644
--- a/frontend/views/accounts/_portfolio_form.php
+++ b/frontend/views/accounts/_portfolio_form.php
@@ -59,12 +59,16 @@ use yii\web\JsExpression;
                                             <?php if($child_first instanceof Specialization): ?>
                                                 <li>
                                                     <a href="#">
-                                                        <?= $form->field($portfolio, "specializationInput[{$child_second->specialization_id}]")
-                                                                 ->checkbox([
-                                                                     'value'   => $child_second->specialization_id,
-                                                                     'label'   => $child_second->specialization_name,
-                                                                     'uncheck' => NULL,
-                                                                 ]) ?>
+                                                        <?= $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) ?>
                                                     </a>
                                                 </li>
                                             <?php endif; ?>
diff --git a/frontend/views/accounts/portfolio.php b/frontend/views/accounts/portfolio.php
index 2b487bb..0aade90 100755
--- a/frontend/views/accounts/portfolio.php
+++ b/frontend/views/accounts/portfolio.php
@@ -17,78 +17,80 @@
 <div class="admin-all-pages-add">
     <?= Html::a(Yii::t('app', 'Добавить'), [ 'portfolio-create' ], [ 'class' => 'btn btn-success' ]) ?>
 </div>
-<?= GridView::widget([
-    'options' => ['class'=>'style admin-all-pages-wr'],
-    'dataProvider' => $dataProvider,
-    'filterModel'  => $searchModel,
-    'columns'      => [
-        [
-            'attribute' => 'portfolio_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' => 'portfolio_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',
-        ],
-        'view_count',
-        [
-            'attribute' => 'specializationString',
-        ],
-        [
-            'class'    => ActionColumn::className(),
-            'buttons'  => [
-                'update' => function($url, $model, $key) {
-                    return Html::a('<img src="/images/ico_pencil.png" alt="">', [
-                        'portfolio-update',
-                        'id' => $model->portfolio_id,
-                    ],[
-                        'title'        => 'Редактировать',
-                    ]);
-                },
-                'delete' => function($url, $model, $key) {
-                    return Html::a('<img src="/images/delete-ico.png" alt="">', [
-                        'portfolio-delete',
-                        'id' => $model->portfolio_id,
-                    ], [
-                        'title'        => 'Удалить',
-                        'aria-label'   => 'Удалить',
-                        'data-confirm' => 'Вы уверены, что хотите удалить этот элемент?',
-                        'data-method'  => 'post',
-                        'data-pjax'    => '0',
-                    ]);
-                },
+                'format' => 'html',
+            ],
+            'view_count',
+            [
+                'attribute' => 'specializationString',
+            ],
+            [
+                'class'    => ActionColumn::className(),
+                'buttons'  => [
+                    'update' => function($url, $model, $key) {
+                        return Html::a('<img src="/images/ico_pencil.png" alt="">', [
+                            'portfolio-update',
+                            'id' => $model->portfolio_id,
+                        ],[
+                            'title'        => 'Редактировать',
+                        ]);
+                    },
+                    'delete' => function($url, $model, $key) {
+                        return Html::a('<img src="/images/delete-ico.png" alt="">', [
+                            'portfolio-delete',
+                            'id' => $model->portfolio_id,
+                        ], [
+                            'title'        => 'Удалить',
+                            'aria-label'   => 'Удалить',
+                            'data-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 9a22c3f..d70d5b3 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -6188,9 +6188,37 @@ input[disabled], select[disabled] {
     width: 360px;
     height: 29px;
     cursor: pointer;
+    margin-top: 8px;
 }
 .admin-project-file .not-file-mb-adm{
     position: static;
     margin-left: 10px;
     width: 540px;
-}
\ No newline at end of file
+}
+.admin-table-portfolio .input-group.input-group-xs input{
+    height: 29px;
+    border: 1px solid #dcdcdc;
+    outline: none;
+    padding-left: 8px;
+    width: 85px;
+    float: left;
+}
+.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
+}
+.admin-table-portfolio .field-teamsearch-experience_from_from, .admin-table-portfolio .field-teamsearch-experience_from_to {float: left}
+.admin-table-portfolio .input-group-addon.kv-field-separator {
+    float: left;
+    width: 30px;
+    margin-top: -1px;
+    padding: 0;
+    height: 31px;
+    line-height: 31px;
+}
+.admin-table-portfolio .input-group.input-group-xs.input-daterange {width: 200px}
+.admin-page .content-menu-first {border-top: 1px solid #dfdfdf;}
+
+
+
+
+
--
libgit2 0.21.4