Merge remote-tracking branch 'origin/master'

Виталий
2 parents 157bff4e 65bb8189
Showing 50 changed files with 294 additions and 180 deletions Show diff stats
.bowerrc
backend/assets/AppAsset.php
backend/views/specialization/_form.php
backend/web/js/fieldWidget.js
common/models/CompanyInfo.php
common/models/CompanyInfoSearch.php
common/models/Job.php
common/models/JobSearch.php
common/models/Specialization.php
common/models/UserInfo.php
common/widgets/FieldEditor.php
common/widgets/views/education_field.php
common/widgets/views/phone_field.php
composer.lock
console/migrations/m160202_090343_user_add_fields.php
console/migrations/m160202_094943_user_info_country_city.php
console/migrations/m160203_133308_add_field_specialization.php
console/migrations/m160203_140144_add_field_user_info.php
console/migrations/m160204_103008_add_payment_connections.php
frontend/assets/AppAsset.php
@@ -23,7 +23,8 @@ class AppAsset extends AssetBundle
         'css/flags32.css'
     ];
     public $js = [
-        'js/option.js'
+        'js/option.js',
+        'js/fieldWidget.js'
     ];
     public $depends = [
         'yii\web\JqueryAsset',
@@ -14,15 +14,24 @@ use yii\helpers\ArrayHelper;
  
     <?= $form->field($model, 'specialization_pid')->dropDownList(ArrayHelper::map($model->find()->all(), 'specialization_id', 'specialization_name'), ['prompt' => 'Выберие родителя']) ?>
     <?= $form->field($model, 'specialization_name')->textInput(['maxlength' => true]) ?>
-    <?= \common\widgets\ImageUploader::widget([
-        'model'=> $model,
-        'field'=>'img',
-        'width'=>240,
-        'height'=>160,
-        'multi'=>false,
-        'gallery' =>$model->img,
-        'name' => 'Загрузить картинку'
-    ]); ?>
+
+    <?php
+
+    echo $form->field($model, 'background')->textInput();
+
+    if($model->specialization_pid == 0 && !empty($model->specialization_id) ){
+       echo  \common\widgets\ImageUploader::widget([
+            'model'=> $model,
+            'field'=>'image',
+            'width'=>940,
+            'height'=>324,
+            'multi'=>false,
+            'gallery' =>$model->image,
+            'name' => 'Загрузить картинку'
+        ]);
+    }
+ ?>
+
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
-$('body').on('click', '.delete-field-item', function(){
+$(document).ready(function(){
+    $('body').on('click', '.delete-field-item', function(){
  
-    $(this).parent('.form-group').remove();
+        $(this).parent('.form-group').remove();
  
-});
+    });
  
  
-$('.add_field').click(function(){
-    var block = $('.fields_video_result');
-    var sub_block = '<div class="form-group">'+
-        '<input type="text"   class="form-control" value="" name="Fields[video]['+ start_i++ +'][value]">'+
-        '<span data-id="none" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
-        '<div>';
-    block.append(sub_block);
  
+    $('.add_field').click(function(){
+        var block = $('.fields_video_result');
+        var sub_block = '<div class="form-group">'+
+            '<input type="text"   class="form-control" value="" name="Fields[video]['+ start_i++ +'][value]">'+
+            '<span data-id="none" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+            '<div>';
+        block.append(sub_block);
+
+    });
 });
 \ No newline at end of file
@@ -10,10 +10,11 @@ use Yii;
  * @property integer $specialization_id
  * @property integer $specialization_pid
  * @property string $specialization_name
+ * @property string $image
+ * @property string $background
  */
 class Specialization extends \yii\db\ActiveRecord
 {
-    public $img;
     /**
      * @inheritdoc
      */
@@ -28,10 +29,10 @@ class Specialization extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['specialization_pid'], 'integer'],
+            [['specialization_pid','status'], 'integer'],
             [['specialization_pid'], 'default', 'value' => '0',],
             [['specialization_name'], 'required'],
-            [['specialization_name'], 'string', 'max' => 255],
+            [['specialization_name','image','background'], 'string', 'max' => 255],
         ];
     }
  
@@ -45,6 +46,9 @@ class Specialization extends \yii\db\ActiveRecord
             'specialization_pid' => 'Specialization Pid',
             'specialization_name' => 'Specialization Name',
             'specialization_parent_name' => 'Specialization Parent Name',
+            'image' => 'Картинка',
+            'background' => 'Background',
+            'status' => 'Status',
         ];
     }
  
@@ -54,4 +58,9 @@ class Specialization extends \yii\db\ActiveRecord
         return $this->hasOne(self::className(), ['specialization_id' => 'specialization_pid']);
     }
  
+    public function getChildren()
+    {
+        return $this->hasMany(self::className(), ['specialization_pid' => 'specialization_id']);
+    }
+
 }
@@ -63,7 +63,7 @@ class UserInfo extends \yii\db\ActiveRecord
         return [
             [['user_id', 'view_count', 'contract', 'estimate', 'purchase', 'delivery'], 'integer'],
             [['date_visit'], 'safe'],
-            [['experience', 'soft', 'guarantee', 'about', 'city', 'country'], 'string'],
+            [['experience', 'soft', 'guarantee', 'about', 'city', 'country', 'image', 'poster'], 'string'],
             [['prepayment'], 'number'],
  
             [['rank', 'location'], 'string', 'max' => 50],
@@ -33,6 +33,7 @@ class FieldEditor extends Widget
     protected function findModel()
     {
  
+
         if (($model = Fields::find()->where([
                 'table_id'=>$this->item_id,
                 'table_name'=>$this->model,
 <?php
 use yii\helpers\Html;
+
 ?>
 <fieldset>
  
@@ -8,16 +9,20 @@ use yii\helpers\Html;
     <p class="btn btn-success add_field">Добавить поле</p>
  
  
-    <?php for($i=1; $i <= count($model); $i++):
+    <?php
+    $t = 0;
+    for($i=1; $i <= count($model); $i++):
         $row = $i;
+
         ?>
  
         <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
-            <input type="text" placeholder="С" class="form-control" value="<?= isset($model[$i]['value']) ? $model[$i]['value'] : '' ?>" name="Fields[education][<?=$row?>][0][year_from]" />
-            <input type="text" placeholder="По"  class="form-control" value="<?= isset($model[++$i]['value']) ? $model[$i]['value'] : ''  ?>" name="Fields[education][<?=$row?>][1][year_to]" />
-            <textarea placeholder="Место" name="Fields[education][<?=$row?>][2][place]" /><?= isset($model[++$i]['value']) ? $model[$i]['value'] : '' ?></textarea>
+            <input type="text" placeholder="С" class="form-control" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[education][<?=$row?>][0][year_from]" />
+            <input type="text" placeholder="По"  class="form-control" value="<?= isset($model[++$t]['value']) ? $model[$t]['value'] : ''  ?>" name="Fields[education][<?=$row?>][1][year_to]" />
+            <textarea placeholder="Место" name="Fields[education][<?=$row?>][2][place]" /><?= isset($model[++$t]['value']) ? $model[$t]['value'] : '' ?></textarea>
             <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
         <?= Html::endTag('div')?>
+        <?php $i = ++ $t; ?>
     <?php endfor; ?>
  
  
@@ -30,7 +35,7 @@ use yii\helpers\Html;
             var block = $(this).parent('fieldset');
             var block_id =  $(this).parent('fieldset');
             var sub_block = '<div class="form-group" >'+
-                '<input type="text" placeholder="С" class="form-control" value="" name="Fields[education]['+ start_i++ +'][0][year_from]" />'+
+                '<input type="text" placeholder="С" class="form-control" value="" name="Fields[education]['+ ++start_i +'][0][year_from]" />'+
                 '<input type="text" placeholder="По"  class="form-control" value="" name="Fields[education]['+ start_i +'][1][year_to]" />'+
                 '<textarea placeholder="Место" name="Fields[education]['+ start_i +'][2][place]" /></textarea>'+
                 '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+<?php
+use yii\helpers\Html;
+?>
+<fieldset>
+
+    <legend>Образование</legend>
+
+    <p class="btn btn-success add_field">Добавить поле</p>
+
+
+    <?php    $t = 0; for($i=1; $i <= count($model); $i++):
+        $row = $i;
+
+        ?>
+
+        <?= Html::beginTag('div',['class'=>'form-group','id'=>isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ])?>
+            <input type="text" placeholder="Телефон" class="form-control" value="<?= isset($model[$t]['value']) ? $model[$t]['value'] : '' ?>" name="Fields[phone][<?=$row?>][0][phone]" />
+            <span data-id="<?= isset($model[$i]['parent_key']) ? $model[$i]['parent_key'] : 0 ?>" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>
+        <?= Html::endTag('div')?>
+        <?php $i = ++ $t; ?>
+    <?php endfor; ?>
+
+
+
+</fieldset>
+<script>
+    $( document ).ready(function(){
+        var start_i = <?=$i?>;
+        $('.add_field').click(function(){
+            var block = $(this).parent('fieldset');
+            var block_id =  $(this).parent('fieldset');
+            var sub_block = '<div class="form-group" >'+
+                '<input type="text" placeholder="Телефон" class="form-control" value="" name="Fields[phone]['+ start_i++ +'][0][phone]" />'+
+                '<span title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+                '<div>';
+            block.append(sub_block);
+
+        });
+    });
+</script>
+
+
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d07e2c10b604fb6b814d10b2de6dcd2f",
+    "hash": "5f5473586959d0912177c3dace19c844",
     "content-hash": "2d0acd792b2e28f03338a962c2923bbe",
     "packages": [
         {
@@ -204,16 +204,16 @@
         },
         {
             "name": "bower-asset/jquery.inputmask",
-            "version": "3.2.5",
+            "version": "3.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/RobinHerbots/jquery.inputmask.git",
-                "reference": "d08264a678865849c808359d126e3bddb9ec87a6"
+                "reference": "5a72c563b502b8e05958a524cdfffafe9987be38"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/d08264a678865849c808359d126e3bddb9ec87a6",
-                "reference": "d08264a678865849c808359d126e3bddb9ec87a6",
+                "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/5a72c563b502b8e05958a524cdfffafe9987be38",
+                "reference": "5a72c563b502b8e05958a524cdfffafe9987be38",
                 "shasum": ""
             },
             "require": {
@@ -615,16 +615,16 @@
         },
         {
             "name": "kartik-v/yii2-krajee-base",
-            "version": "v1.7.9",
+            "version": "1.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-krajee-base.git",
-                "reference": "6f10fd0a0bfccd729764c65fa65eb4ccf2cbade9"
+                "reference": "0c274e31e4392cbafc5fe158eae81738794e02ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/6f10fd0a0bfccd729764c65fa65eb4ccf2cbade9",
-                "reference": "6f10fd0a0bfccd729764c65fa65eb4ccf2cbade9",
+                "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/0c274e31e4392cbafc5fe158eae81738794e02ce",
+                "reference": "0c274e31e4392cbafc5fe158eae81738794e02ce",
                 "shasum": ""
             },
             "require": {
@@ -657,7 +657,7 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2015-11-25 07:03:35"
+            "time": "2016-01-10 12:26:29"
         },
         {
             "name": "kartik-v/yii2-widget-select2",
@@ -665,12 +665,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/kartik-v/yii2-widget-select2.git",
-                "reference": "701bf8069a85fafbac1ced54dcd00e579e60471b"
+                "reference": "519241c7360a0470624f24d872741e1ea880de75"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/519241c7360a0470624f24d872741e1ea880de75",
-                "reference": "701bf8069a85fafbac1ced54dcd00e579e60471b",
+                "reference": "519241c7360a0470624f24d872741e1ea880de75",
                 "shasum": ""
             },
             "require": {
@@ -705,7 +705,7 @@
                 "widget",
                 "yii2"
             ],
-            "time": "2016-01-10 16:51:42"
+            "time": "2016-02-01 02:19:01"
         },
         {
             "name": "lusitanian/oauth",
@@ -1080,12 +1080,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-framework.git",
-                "reference": "e4359f68b70caede1e09ecefb56e9435f7d140af"
+                "reference": "7ccbfdf4cfb0ce025e27455dc3e516af23eb2800"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/7ccbfdf4cfb0ce025e27455dc3e516af23eb2800",
-                "reference": "e4359f68b70caede1e09ecefb56e9435f7d140af",
+                "reference": "7ccbfdf4cfb0ce025e27455dc3e516af23eb2800",
                 "shasum": ""
             },
             "require": {
@@ -1166,7 +1166,7 @@
                 "framework",
                 "yii2"
             ],
-            "time": "2016-01-23 08:43:29"
+            "time": "2016-01-28 20:15:10"
         },
         {
             "name": "yiisoft/yii2-bootstrap",
@@ -1319,12 +1319,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-jui.git",
-                "reference": "7ab7ff56bd54500212523e38f5fe3b9210325041"
+                "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/1425ab29929dd195f468d3c4eb340ab509f28b83",
-                "reference": "7ab7ff56bd54500212523e38f5fe3b9210325041",
+                "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83",
                 "shasum": ""
             },
             "require": {
@@ -1361,7 +1361,7 @@
                 "jQuery UI",
                 "yii2"
             ],
-            "time": "2015-12-07 11:33:55"
+            "time": "2015-12-24 06:23:53"
         },
         {
             "name": "yiisoft/yii2-swiftmailer",
@@ -1448,12 +1448,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "de2ed3bbe68254efeff68db60092fc8ed5298055"
+                "reference": "b312ab9d0c446971069e22a524fec01c7cddc75e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/e493d3dc48d15a6d44e213d02c729ad61cc758a9",
-                "reference": "de2ed3bbe68254efeff68db60092fc8ed5298055",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/b312ab9d0c446971069e22a524fec01c7cddc75e",
+                "reference": "b312ab9d0c446971069e22a524fec01c7cddc75e",
                 "shasum": ""
             },
             "require": {
@@ -1490,7 +1490,7 @@
                 "faker",
                 "fixtures"
             ],
-            "time": "2016-01-08 14:16:18"
+            "time": "2016-02-01 17:08:46"
         },
         {
             "name": "phpspec/php-diff",
@@ -1671,12 +1671,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/yiisoft/yii2-gii.git",
-                "reference": "d1a58d8c64f9075960665dc5347f5906ecb063cf"
+                "reference": "bb0eba84639a99bff6c8bc9e803bd8ac3ab66297"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/d1a58d8c64f9075960665dc5347f5906ecb063cf",
-                "reference": "d1a58d8c64f9075960665dc5347f5906ecb063cf",
+                "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/bb0eba84639a99bff6c8bc9e803bd8ac3ab66297",
+                "reference": "bb0eba84639a99bff6c8bc9e803bd8ac3ab66297",
                 "shasum": ""
             },
             "require": {
@@ -1716,7 +1716,7 @@
                 "gii",
                 "yii2"
             ],
-            "time": "2016-01-15 17:12:14"
+            "time": "2016-02-02 07:11:51"
         }
     ],
     "aliases": [],
@@ -8,8 +8,8 @@ class m160202_090343_user_add_fields extends Migration
     public function up()
     {
         $this->addColumn('user', 'type', $this->smallInteger());
-        $this->addColumn('user_info', 'image', $this->integer());
-        $this->addColumn('user_info', 'poster', $this->integer());
+        $this->addColumn('user_info', 'image', $this->string());
+        $this->addColumn('user_info', 'poster', $this->string());
         $this->addColumn('user_info', 'member', $this->smallInteger());
  
         $this->createTable('{{%company_info}}', [
+<?php
+    use yii\db\Migration;
+
+    class m160204_103008_add_payment_connections extends Migration
+    {
+        public function up ()
+        {
+            $this->createTable (
+                '{{%payment}}', [
+                'payment_id' => $this->primaryKey (), 'name' => $this->string (255)
+                                                                     ->notNull (), 'status' => $this->integer ()
+                                                                                                    ->defaultValue (1),
+            ], null
+            );
+            $this->batchInsert ('{{%payment}}', ['name'], [['Наличный расчет'], ['Безналичный расчет'], ['Электронные деньги']]);
+            $this->createTable (
+                '{{%user_payment}}', [
+                    'user_payment_id' => $this->primaryKey (), 'user_id' => $this->integer (), 'payment_id' => $this->integer (),
+                ]
+            );
+            $this->createTable (
+                '{{%user_specialization}}', [
+                    'user_specialization_id' => $this->primaryKey (), 'user_id' => $this->integer (), 'specialization_id' => $this->integer (),
+                ]
+            );
+            $this->addForeignKey ('user_speialization_specialization', '{{%user_specialization}}', 'specialization_id', '{{%specialization}}', 'specialization_id', 'CASCADE', 'CASCADE');
+            $this->addForeignKey ('user_payment_payment', '{{%user_payment}}', 'payment_id', '{{%payment}}', 'payment_id', 'CASCADE', 'CASCADE');
+        }
+
+        public function down ()
+        {
+            $this->dropTable ('{{%payment}}');
+            $this->dropTable('{{%user_specialization}}');
+            $this->dropTable('{{%user_payment}}');
+        }
+        /*
+        // Use safeUp/safeDown to run migration code within a transaction
+        public function safeUp()
+        {
+        }
+
+        public function safeDown()
+        {
+        }
+        */
+    }
@@ -6,7 +6,6 @@
  */
  
 namespace frontend\assets;
-
 use yii\web\AssetBundle;
  
 /**
@@ -20,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',
     ];
     public $js = [
         '/js/script.js',
@@ -35,9 +34,11 @@ class AppAsset extends AssetBundle
         '/js/forms.js',
         '/js/jquery.MultiFile.js',
         '/js/myGallery_min.js',
+        'js/fieldWidget.js'
     ];
     public $depends = [
         'yii\web\YiiAsset',
+        'backend\assets\FileUploadAsset'
     ];
     public $jsOptions = array(
         'position' => \yii\web\View::POS_HEAD
@@ -48,11 +48,10 @@ class AccountsController extends Controller
  
         $langs = Language::getActiveLanguages();
  
-
         if ($user->load(Yii::$app->request->post()) && $user->save()) {
             $user->userInfo->load(Yii::$app->request->post());
             $user->userInfo->save();
-            Fields::saveFieldData( Yii::$app->request->post('Fields'), $user->id, $user::className());
+            Fields::saveFieldData( Yii::$app->request->post('Fields'), $user->id, $user::className(),'ru');
             return $this->render('cabinet', [
                 'user' => $user,
                 'user_info' => $user->userInfo,
@@ -151,6 +150,9 @@ class AccountsController extends Controller
  
     public function actionContacts()
     {
+        if(!empty(\Yii::$app->request->post())) {
+            Fields::saveFieldData( Yii::$app->request->post('Fields'), \Yii::$app->user->identity->id, User::className(),'ru');
+        }
         $user_info = UserInfo::find()->where(['user_id' => \Yii::$app->user->getId()])->one();
         if(empty($user_info)) {
             $user_info = new UserInfo(['user_id' => \Yii::$app->user->getId()]);
@@ -170,16 +172,29 @@ class AccountsController extends Controller
  
     public function actionEmployment()
     {
-        $job = Job::find()->where(['user_id' => \Yii::$app->user->getId()])->orderBy(['current' => SORT_DESC])->all();
-        if(empty($job)) {
-            $job[] = new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 0]);
-        }
-        if(!$job[0]->current) {
-            array_unshift($job, new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 1]));
-        }
-        if(!empty(\Yii::$app->request->post())) {
-            var_dump(\Yii::$app->request->post());
-            die();
+        $post = \Yii::$app->request->post();
+        if(!empty($post)) {
+            $job = [];
+            for($i = 0; $i < count($post['Job']); $i++) {
+                $job[$i] = new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 0]);
+            }
+            if(Job::loadMultiple($job, $post)) {
+                $job[0]->current = 1;
+                if(Job::validateMultiple($job)) {
+                    Job::deleteAll(['user_id' => \Yii::$app->user->getId()]);
+                    foreach($job as $onejob) {
+                        $onejob->save(false);
+                    }
+                }
+            }
+        } else {
+            $job = Job::find()->where(['user_id' => \Yii::$app->user->getId()])->orderBy(['current' => SORT_DESC])->all();
+            if(empty($job)) {
+                $job[] = new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 0]);
+            }
+            if(!$job[0]->current) {
+                array_unshift($job, new Job(['user_id' => \Yii::$app->user->getId(), 'current' => 1]));
+            }
         }
         return $this->render('employment', ['job' => $job]);
     }
 <?php
 namespace frontend\controllers;
  
+use common\models\Specialization;
 use common\models\UserInfo;
 use Yii;
 use common\models\LoginForm;
@@ -62,7 +63,11 @@ class SiteController extends Controller
      */
     public function actionIndex()
     {
-        return $this->render('index'); 
+        $specializations = Specialization::find()->where(['specialization_pid'=>0])->all();
+
+        return $this->render('index',[
+            'specializations' => $specializations,
+        ]);
     }
  
     /**
@@ -56,7 +56,7 @@ use mihaildev\elfinder\ElFinder;
     'template'=>'education',
     'item_id'=> $user->id,
     'model'=>'common\models\User',
-    'language'=>'0'
+    'language'=>'ru'
 ]); ?>
  
  
@@ -6,21 +6,22 @@ use \common\widgets\MultiLangForm;
  
     $this->title = 'Мой профиль';
     $this->params['breadcrumbs'][] = $this->title;
+    $user = \Yii::$app->user->identity;
 ?>
  
 <h1><?=  $this->title ?></h1>
-
-
-
 <?php
-
-$form = $this->render('_form', [
-    'user' => $user,
-    'user_info' => $user_info,
-]);
-
-echo MultiLangForm::widget(['form'=>$form]);
-
+$form = ActiveForm::begin();
+?>
+<?= \common\widgets\FieldEditor::widget([
+    'template'=>'phone',
+    'item_id'=> $user->id,
+    'model'=>'common\models\User',
+    'language'=>'ru'
+]); ?>
+<?php
+    echo Html::submitButton('submit');
+    $form->end();
 ?>
  
  
@@ -19,9 +19,6 @@
         <p>Текущее место работы:</p>
         <div class="current_job_inputs">
             <?php
-                echo $form->field ($current, '[0]current')
-                          ->label (false)
-                          ->hiddenInput (['value' => 1]);
                 echo $form->field ($current, '[0]name')
                           ->label ('Название')
                           ->textInput ();
@@ -76,6 +73,7 @@
     </div>
 <?php
     echo Html::button('Добавить место работы', ['id' => 'add_job_button']);
+    echo Html::submitButton('Обновить');
     $form->end ();
 ?>
 <script>
@@ -8,6 +8,7 @@
     use common\models\Option;
     use common\models\User;
     use common\models\UserInfo;
+    use common\widgets\ImageUploader;
     use yii\helpers\Html;
     use yii\widgets\ActiveForm;
     use \common\widgets\MultiLangForm;
@@ -69,6 +70,24 @@
                   ->label ('Членство в МФП')
                   ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.')
                   ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']);
+        echo ImageUploader::widget([
+            'model'=> $user_info,
+            'field'=>'image',
+            'width'=>100,
+            'height'=>100,
+            'multi'=>false,
+            'gallery' =>$user_info->image,
+            'name' => 'Загрузить аватар'
+        ]);
+        echo ImageUploader::widget([
+            'model'=> $user_info,
+            'field'=>'poster',
+            'width'=>1200,
+            'height'=>600,
+            'multi'=>false,
+            'gallery' =>$user_info->poster,
+            'name' => 'Загрузить постер'
+        ]);
         echo Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
         $form->end ();
     ?>
@@ -9,18 +9,6 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
 ?>
     <div class="wrap">
         <div class="container">
-            <div class="left_block">
-                <?php
-                echo Menu::widget([
-                    'options' => ['class' => 'nav nav-pills nav-stacked'],
-                    'items' => [
-                        ['label' => 'Кабинет', 'url' => ['accounts/cabinet']],
-
-                        ['label' => 'Выход', 'url' => ['/site/logout']],
-                    ],
-                ]);
-                ?>
-            </div>
             <div class="right_block">
                 <?= Breadcrumbs::widget([
                     'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
@@ -71,6 +59,10 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                                             'label' => 'Галерея',
                                             'url' => ['accounts/gallery'],
                                         ],
+                                        [
+                                            'label' => 'Выход',
+                                            'url' => ['/site/logout']
+                                        ],
                                     ],
                                 ]);
                             ?>
@@ -3,7 +3,7 @@
 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');
 ?>
 <?php
  
 use \yii\helpers\Html;
-
-/* @var $this yii\web\View */
+use \common\models\Specialization;
+/**
+ * @var $this yii\web\View
+ * @var $specializations common\models\Specialization
+ */
  
 $this->title = 'My Yii Application';
 ?>
@@ -49,83 +52,29 @@ $this-&gt;title = &#39;My Yii Application&#39;;
                 <div class="menu-two-wrapp-title">Специализация работ по исполнителям</div>
                 <div class="menu-two-wrapp" style="background: url('/images/menu-pic-1.jpg') 100% 100% no-repeat">
                     <ul class="content-menu-first">
-                        <li data-img="/images/menu-pic-1-2.jpg">
-                            <span data-menu-bg="#bb0f3f"  style="background: #bb0f3f"></span><a href="#">Жилые</a>
-                            <ul>
-                                <li>
-                                    <a href="#">Жилые дома</a>
-                                    <ul>
-                                        <li><a href="#">Дизайн</a></li>
-                                        <li>
-                                            <a href="#">Разработка градостроительной документации</a>
-                                            <ul>
-                                                <li><a href="#">Архитекторы</a></li>
-                                                <li><a href="#">Junior-архитекторы</a></li>
-                                            </ul>
-                                        </li>
-                                        <li><a href="#">Проектирование объектов архитектуры</a></li>
-                                        <li><a href="#">Инжиниринговая деятельность в сфере строительства</a>
-                                            <ul>
-                                                <li><a href="#">йййййй</a></li>
-                                                <li><a href="#">ййййййййййй</a></li>
-                                            </ul>
-                                        </li>
-                                        <li><a href="#">Анимация и реклама</a></li>
-                                    </ul>
-                                </li>
-                                <li><a href="#">Виллы</a></li>
-                                <li><a href="#">Коттеджи</a></li>
-                                <li><a href="#">Гостиницы</a></li>
-                                <li>
-                                    <a href="#">Базы отдыха</a>
-                                    <ul>
-                                        <li><a href="#">2---2</a></li>
-                                        <li><a href="#">2---3</a></li>
-                                        <li><a href="#">2---4</a></li>
-                                    </ul>
-                                </li>
-                                <li><a href="#">Таунхаусы</a></li>
-                                <li><a href="#">Квартиры</a></li>
-                                <li><a href="#">Квартиры</a></li>
-                                <li><a href="#">Квартиры</a></li>
-                            </ul>
-                        </li>
-                        <li data-img="/images/menu-pic-1.jpg">
-                            <span data-menu-bg="#ea640b"  style="background: #ea640b"></span><a href="#">Офисные</a>
-                            <ul>
-                                <li>
-                                    <a href="#">Коттеджи</a>
-                                    <ul>
-                                        <li><a href="#">1---1</a></li>
-                                        <li>
-                                            <a href="#">1---2</a>
-                                            <ul>
-                                                <li><a href="#">Архитекторы</a></li>
-                                                <li><a href="#">Junior-архитекторы</a></li>
-                                            </ul>
-                                        </li>
-                                        <li><a href="#">1---3</a></li>
-                                        <li><a href="#">1---4</a></li>
-                                    </ul>
-                                </li>
-                                <li><a href="#">Гостиницы</a></li>
-                                <li>
-                                    <a href="#">Базы отдыха</a>
-                                    <ul>
-                                        <li><a href="#">2---2</a></li>
-                                        <li><a href="#">2---3</a></li>
-                                        <li><a href="#">2---4</a></li>
-                                    </ul>
-                                </li>
-                            </ul>
-                        </li>
-                        <li data-img="/images/menu-pic-1-2.jpg"><span  data-menu-bg="#f7a901" style="background: #f7a901"></span><a href="#">Торговые</a></li>
-                        <li data-img="/images/menu-pic-1.jpg"><span  data-menu-bg="#53a827" style="background: #53a827"></span><a href="#">Мосты</a></li>
-                        <li data-img="/images/menu-pic-1-2.jpg"><span  data-menu-bg="#018232" style="background: #018232"></span><a href="#">Дороги</a></li>
-                        <li data-img="/images/menu-pic-1.jpg"><span  data-menu-bg="#02857d" style="background: #02857d"></span><a href="#">Сооружения</a></li>
-                        <li data-img="/images/menu-pic-1-2.jpg"><span  data-menu-bg="#019abf" style="background: #019abf"></span><a href="#">Склады</a></li>
-                        <li data-img="/images/menu-pic-1.jpg"><span  data-menu-bg="#116da8" style="background: #116da8"></span><a href="#">Заводы</a></li>
-                        <li data-img="/images/menu-pic-1-2.jpg"><span  data-menu-bg="#413e7f" style="background: #413e7f"></span><a href="#">Разное</a></li>
+                        <?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="#"><?= $child_second->specialization_name?></a></li>
+                                                        <?php endif;?>
+                                                    <?php endforeach; ?>
+                                                </ul>
+                                            </li>
+                                        <?php endif; ?>
+                                    <?php endforeach; ?>
+
+                                </ul>
+                            </li>
+                        <?php endforeach; ?>
                     </ul>
                 </div>
             </div>
+$(document).ready(function(){
+    $('body').on('click', '.delete-field-item', function(){
+        console.log('sfddf');
+        $(this).parent('.form-group').remove();
+
+    });
+
+
+    $('.add_field').click(function(){
+        var block = $('.fields_video_result');
+        var sub_block = '<div class="form-group">'+
+            '<input type="text"   class="form-control" value="" name="Fields[video]['+ start_i++ +'][value]">'+
+            '<span data-id="none" title="удалить" class="glyphicon glyphicon-trash delete-field-item"></span>'+
+            '<div>';
+        block.append(sub_block);
+
+    });
+});