Merge remote-tracking branch 'origin/master'

# Conflicts: # frontend/controllers/AccountsController.php

Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/controllers/AccountsController.php
Yarik
2 parents a02e2fdb 34e7b1a4
Showing 11 changed files with 163 additions and 40 deletions Show diff stats
common/behaviors/ShowImage.php
frontend/controllers/AccountsController.php
frontend/views/accounts/_portfolio_form.php
frontend/views/accounts/blog.php
frontend/views/accounts/gallery.php
frontend/views/accounts/portfolio.php
frontend/views/layouts/gallery.php
frontend/views/performer/_gallery_list_view.php
frontend/views/performer/gallery.php
frontend/web/css/style.css
frontend/web/images/ico_pencil.png
@@ -27,5 +27,17 @@ class ShowImage extends Behavior
     }
+    function ShowGallery($array){
+
+        $gallery = explode(',', $array );
+        if(is_array($gallery)){
+            array_splice($gallery,-1);
+            return $gallery;
+        } else {
+            return [];
+        }
+
+    }
+
 }
 \ No newline at end of file
@@ -424,7 +424,7 @@
         {
             $searchModel = new PortfolioSearch();
             $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-
+            $dataProvider->pagination->pageSize=5;
             return $this->render('portfolio', [
                 'searchModel'  => $searchModel,
                 'dataProvider' => $dataProvider,
@@ -434,14 +434,7 @@
         public function actionPortfolioCreate()
         {
             $portfolio = new Portfolio();
-            $specialization = Specialization::find()
-                                            ->select([
-                                                'specialization_name',
-                                                'specialization_id',
-                                            ])
-                                            ->indexBy('specialization_id')
-                                            ->asArray()
-                                            ->column();
+            $specializations = Specialization::find()->where(['specialization_pid' => 0])->orderBy('specialization_id')->all();
             $post = \Yii::$app->request->post();
             if(!empty( $post )) {
                 $portfolio->load($post);
@@ -450,14 +443,17 @@
                     $portfolio->save();
                     $portfolio->unlinkAll('specializations', true);
                     foreach($portfolio->specializationInput as $one_specialization) {
-                        $portfolio->link('specializations', Specialization::findOne($one_specialization));
+                        if($one_specialization){
+
+                            $portfolio->link('specializations', Specialization::findOne($one_specialization));
+                        }
                     }
                     return $this->redirect('portfolio');
                 }
             }
             return $this->render('_portfolio_form', [
                 'portfolio'      => $portfolio,
-                'specialization' => $specialization,
+                'specializations' => $specializations,
             ]);
         }
@@ -470,14 +466,7 @@
             if(!$portfolio instanceof ActiveRecord) {
                 throw new NotFoundHttpException('Запись не найдена');
             }
-            $specialization = Specialization::find()
-                                            ->select([
-                                                'specialization_name',
-                                                'specialization_id',
-                                            ])
-                                            ->indexBy('specialization_id')
-                                            ->asArray()
-                                            ->column();
+            $specializations = Specialization::find()->where(['specialization_pid' => 0])->orderBy('specialization_id')->all();
             $post = \Yii::$app->request->post();
             if(!empty( $post )) {
                 $portfolio->load($post);
@@ -485,15 +474,18 @@
                 if(!$portfolio->hasErrors()) {
                     $portfolio->save();
                     $portfolio->unlinkAll('specializations', true);
+
                     foreach($portfolio->specializationInput as $one_specialization) {
-                        $portfolio->link('specializations', Specialization::findOne($one_specialization));
+                        if($one_specialization){
+                            $portfolio->link('specializations', Specialization::findOne($one_specialization));
+                        }
                     }
                     return $this->redirect('portfolio');
                 }
             }
             return $this->render('_portfolio_form', [
                 'portfolio'      => $portfolio,
-                'specialization' => $specialization,
+                'specializations' => $specializations,
             ]);
         }
@@ -4,7 +4,8 @@
      */
     use common\models\Option;
     use common\models\Portfolio;
-    use common\widgets\ImageUploader;
+use common\models\Specialization;
+use common\widgets\ImageUploader;
     use mihaildev\ckeditor\CKEditor;
     use yii\helpers\Html;
     use yii\widgets\ActiveForm;
@@ -42,8 +43,31 @@ use yii\web\JsExpression;
 <div class="input-blocks-wrapper">
-    <?= $form->field($portfolio, 'specializationInput')
-        ->checkboxList($specialization) ?>
+    <ul class="content-menu-first">
+        <?php foreach($specializations as $specialization):?>
+            <li data-img="<?= $specialization->image?>">
+                <span data-menu-bg="<?= $specialization->background ?>"  style="background: <?= $specialization->background ?>"></span><a href="#"><?= $specialization->specialization_name?></a>
+                <ul>
+                    <?php  foreach($specialization->children as $child_first):?>
+
+                        <?php if($child_first instanceof Specialization):?>
+                            <li>
+                                <a href="#"><?= $child_first->specialization_name?></a>
+                                <ul>
+                                    <?php foreach($child_first->children as $child_second):?>
+                                        <?php if($child_first instanceof Specialization): ?>
+                                            <li><a href="#"><?= $form->field($portfolio, 'specializationInput[]')->checkbox(['value' => $child_second->specialization_id, 'label' =>$child_second->specialization_name])?></a></li>
+                                        <?php endif;?>
+                                    <?php endforeach; ?>
+                                </ul>
+                            </li>
+                        <?php endif; ?>
+                    <?php endforeach; ?>
+
+                </ul>
+            </li>
+        <?php endforeach; ?>
+    </ul>
 </div>
@@ -12,11 +12,12 @@
     $this->title = 'Блог';
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
-<h1><?= $this->title ?></h1>
-<p>
+<div class="login-left-column-title"><?= $this->title ?></div>
+<div class="admin-all-pages-add">
     <?= Html::a(Yii::t('app', 'Добавить'), [ 'blog-create' ], [ 'class' => 'btn btn-success' ]) ?>
-</p>
+</div>
 <?= GridView::widget([
+    'options' => ['class'=>'style admin-all-pages-wr'],
     'dataProvider' => $dataProvider,
     'filterModel'  => $searchModel,
     'columns'      => [
@@ -31,13 +32,15 @@
             'class'    => ActionColumn::className(),
             'buttons'  => [
                 'update' => function($url, $model, $key) {
-                    return Html::a('Update', [
+                    return Html::a('<img src="/images/ico_pencil.png" alt="">', [
                         'blog-update',
                         'id' => $model->blog_id,
+                    ],[
+                        'title'        => 'Редактировать',
                     ]);
                 },
                 'delete' => function($url, $model, $key) {
-                    return Html::a('Delete', [
+                    return Html::a('<img src="/images/delete-ico.png" alt="">', [
                         'blog-delete',
                         'id' => $model->blog_id,
                     ], [
@@ -23,6 +23,7 @@
         [
             'attribute' => 'gallery_id',
             'label' => 'ID',
+            'filterOptions' => ['class' => 'text-center']
         ],
         'name',
         'date_add',
@@ -12,11 +12,12 @@
     $this->title = 'Портфолио';
     $this->params[ 'breadcrumbs' ][] = $this->title;
 ?>
-<h1><?= $this->title ?></h1>
-<p>
+<div class="login-left-column-title"><?= $this->title ?></div>
+<div class="admin-all-pages-add">
     <?= Html::a(Yii::t('app', 'Добавить'), [ 'portfolio-create' ], [ 'class' => 'btn btn-success' ]) ?>
-</p>
+</div>
 <?= GridView::widget([
+    'options' => ['class'=>'style admin-all-pages-wr'],
     'dataProvider' => $dataProvider,
     'filterModel'  => $searchModel,
     'columns'      => [
 <?php
+use yii\helpers\Html;
 use yii\widgets\Breadcrumbs;
 use yii\widgets\Menu;
-\frontend\assets\AdminAsset::register($this);
+\frontend\assets\AppAsset::register($this);
 /* @var $content string */
 $this->beginContent('@app/views/layouts/main.php');
 ?>
     <div class="section-box content">
-        <div class="section-box-16" style="background: url('/images/blog/box-16.jpg') no-repeat">
+        <div class="section-box-16" style="background: url('<?= $this->params['user']->userInfo->poster;?>') 50% no-repeat">
             <div class="box-wr">
                 <div class="box-all">
                     <div class="blog-buttons-wr style">
@@ -90,7 +91,9 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                                 <div class="performance-vacancy-sidebar-comm style">30 отзывов</div>
                                 <a href="#" class="performance-vacancy-sidebar-write style">написать отзыв</a>
                             </div>
-                            <div class="performer-vacancy-sidebar-img style"><img src="/images/ded-foto.jpg" alt=""/></div>
+                            <div class="performer-vacancy-sidebar-img style">
+                                <?= Html::img($this->params['user']->userInfo->image);?>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -5,7 +5,7 @@
     <a href="#" class="gallery-box-min"><?= Html::img($model->cover)?></a>
     <div class="gallery-box-hidden">
         <div class="gallery-box-preview">
-            <?php foreach(explode(',', $model->photo ) as $image):?>
+            <?php foreach($model->ShowGallery($model->photo ) as $image):?>
             <span data-link="<?= $image ?>"></span>
             <?php endforeach; ?>
@@ -4,12 +4,16 @@ use \yii\helpers\Html;
 use yii\widgets\LinkPager;
 use yii\widgets\ListView;
+
+
 /* @var $this yii\web\View */
+
+
 $this->params['user'] = $user;
 $this->title = 'My Yii Application';
 ?>
 <div class="video-performer-wrapper style">
-    <div class="gallery-title">Видео: 12</div>
+    <div class="gallery-title">Видео: <?= count($videos)?></div>
     <div class="slider-video-wr">
         <div id="demo5" class="scroll-img video-slider">
             <ul>
@@ -50,4 +54,19 @@ $this-&gt;title = &#39;My Yii Application&#39;;
         ?>
     </div>
-</div>
 \ No newline at end of file
+</div>
+<script>
+    $(function () {
+        $('#demo5').scrollbox({
+            direction: 'h',
+            distance: 220,
+            autoPlay: false
+        });
+        $('#demo5-backward').click(function () {
+            $('#demo5').trigger('backward');
+        });
+        $('#demo5-forward').click(function () {
+            $('#demo5').trigger('forward');
+        });
+    });
+</script>
 \ No newline at end of file
@@ -5433,7 +5433,7 @@ ul.menu-admin li.logout-li, ul.menu-admin li.logout-li a, ul.menu-admin li:last-
     margin-left: 193px;
     margin-top: 7px;
 }
-.skills-admin-wrapper .btn:focus, .skills-admin-wrapper .btn:active, .add-field-employment .btn:focus, .add-field-employment .btn:active, .admin-contacts-wr .btn:focus, .admin-contacts-wr .btn:active {
+.skills-admin-wrapper .btn:focus, .skills-admin-wrapper .btn:active, .add-field-employment .btn:focus, .add-field-employment .btn:active, .admin-contacts-wr .btn:focus, .admin-contacts-wr .btn:active, .admin-all-pages-add .btn:active, .skills-admin-wrapper .btn:focus, .skills-admin-wrapper .btn:active, .add-field-employment .btn:focus, .add-field-employment .btn:active, .admin-contacts-wr .btn:focus, .admin-contacts-wr .btn:active, .admin-all-pages-add .btn:focus {
     background: none;
     color: #003AA7;
     box-shadow: none;
@@ -5590,4 +5590,72 @@ background: #f3f3f3;
     padding: 2px 0 !important;
     border: 1px solid #0072bc !important;
 }
-a {color: #0072bc}
 \ No newline at end of file
+a {color: #0072bc}
+.admin-all-pages-add {
+    margin-top: 20px;
+    margin-bottom: 20px;
+}
+.admin-all-pages-add .btn{
+    width: 160px;
+    height: 29px;
+    color: #fff;
+    background: #0072bc;
+    border: 1px solid #0072bc;
+    font-size: 13px;
+    margin-top: 0 !important;
+    float: none;
+    outline: none;
+    border-radius: 4px;
+}
+.admin-all-pages-add .btn:hover {
+    background: #fff;
+    color: #0072bc;
+}
+.admin-all-pages-add .btn:focus {
+    border: 1px solid #00558C;
+    color: #00558C;
+}
+.table-striped > tbody > tr:nth-of-type(odd) {
+    background-color: #F1F1F1;
+}
+.table-striped tr:hover{
+    background-color: #eef8ff !important;
+}
+.admin-all-pages-wr {margin-bottom: 30px}
+.admin-all-pages-wr .form-control {
+    height: 29px;
+    border: 1px solid #dcdcdc;
+    box-sizing: border-box;
+    outline: none;
+    color: #636363;
+    font-size: 13px;
+    line-height: 27px;
+    padding-left: 8px;
+    border-radius: 0;
+    outline: none;
+}
+.admin-all-pages-wr table .form-control:focus {border: 1px solid #dcdcdc;box-shadow: 1px 2px 2px 0px rgba(215, 215, 215, 0.75) inset; transition: 0.1s; outline: none}
+.admin-all-pages-wr table tbody tr td {padding: 4px 8px; vertical-align: middle}
+.admin-all-pages-wr table {font-size: 13px}
+.admin-all-pages-wr .table > thead > tr > th {vertical-align: middle}
+.admin-all-pages-wr .pagination {float: right}
+.admin-all-pages-wr .pagination > li > a, .pagination > li > span {
+    background: none;
+    border: 0;
+}
+.admin-all-pages-wr .pagination > li.active:hover {
+    cursor: default;
+
+}
+.admin-all-pages-wr .pagination > li.active > a, .admin-all-pages-wr .pagination > li.active > span {
+    color: inherit;
+}
+.admin-all-pages-wr .pagination > li.active a:hover, .admin-all-pages-wr .pagination > li.active span:hover {
+    color: inherit;
+    background: none;
+}
+
+
+
+
+