Merge remote-tracking branch 'origin/master'

Administrator
2 parents ab6d9045 e9013fc3
Showing 39 changed files with 1565 additions and 10 deletions Show diff stats
backend/web/js/option.js
common/models/CompanyInfo.php
common/models/CompanyInfoSearch.php
common/models/Job.php
common/models/JobSearch.php
common/models/User.php
common/models/UserInfo.php
console/migrations/m160202_090343_user_add_fields.php
console/migrations/m160202_094943_user_info_country_city.php
console/migrations/m160203_082111_jobs.php
frontend/controllers/AccountsController.php
frontend/controllers/CompanyInfoController.php
frontend/controllers/JobController.php
frontend/views/accounts/_job_form.php
frontend/views/accounts/add-skills.php
frontend/views/accounts/contacts.php
frontend/views/accounts/employment.php
frontend/views/accounts/gallery.php
frontend/views/accounts/general.php
frontend/views/accounts/portfolio.php
@@ -17,6 +17,14 @@ function checkboxerInit() {
         $(value).trigger('change');
     });
 }
+function accountRedraw() {
+    var type = $('input[name="User[type]"]:checked').val();
+    if(type == 2) {
+        $('#form_definition').addClass('form_for_company');
+    } else {
+        $('#form_definition').removeClass('form_for_company');
+    }
+}
 $(function() {
     var counter = 0;
     $(document).on('click', '.add_row', function() {
@@ -137,4 +145,8 @@ $(function() {
         $(val).find('a[role=tab]').first().trigger('click');
     });
     checkboxerInit();
+    accountRedraw();
+    $(document).on('change', 'input[name="User[type]"]', function() {
+        accountRedraw();
+    });
 });
 \ No newline at end of file
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "company_info".
+ *
+ * @property integer $company_info_id
+ * @property string $name
+ * @property integer $staff
+ * @property string $street
+ * @property string $house
+ * @property integer $hide_mail
+ */
+class CompanyInfo extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'company_info';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name', 'street', 'house'], 'string'],
+            [['staff', 'hide_mail'], 'integer']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'company_info_id' => Yii::t('app', 'Company Info ID'),
+            'name' => Yii::t('app', 'Name'),
+            'staff' => Yii::t('app', 'Staff'),
+            'street' => Yii::t('app', 'Street'),
+            'house' => Yii::t('app', 'House'),
+            'hide_mail' => Yii::t('app', 'Hide Mail'),
+        ];
+    }
+}
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\CompanyInfo;
+
+/**
+ * CompanyInfoSearch represents the model behind the search form about `common\models\CompanyInfo`.
+ */
+class CompanyInfoSearch extends CompanyInfo
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['company_info_id', 'staff', 'hide_mail'], 'integer'],
+            [['name', 'street', 'house'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = CompanyInfo::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'company_info_id' => $this->company_info_id,
+            'staff' => $this->staff,
+            'hide_mail' => $this->hide_mail,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'street', $this->street])
+            ->andFilterWhere(['like', 'house', $this->house]);
+
+        return $dataProvider;
+    }
+}
+<?php
+
+namespace common\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "job".
+ *
+ * @property integer $job_id
+ * @property string $name
+ * @property string $link
+ * @property string $date_start
+ * @property string $date_end
+ * @property string $position
+ * @property integer $user_id
+ * @property integer $total_count
+ * @property integer $complete_count
+ * @property integer $current
+ */
+class Job extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'job';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name'], 'required'],
+            [['date_start', 'date_end'], 'safe'],
+            [['user_id', 'total_count', 'complete_count', 'current'], 'integer'],
+            [['name', 'link', 'position'], 'string', 'max' => 255]
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'job_id' => Yii::t('app', 'Job ID'),
+            'name' => Yii::t('app', 'Name'),
+            'link' => Yii::t('app', 'Link'),
+            'date_start' => Yii::t('app', 'Date Start'),
+            'date_end' => Yii::t('app', 'Date End'),
+            'position' => Yii::t('app', 'Position'),
+            'user_id' => Yii::t('app', 'User ID'),
+            'total_count' => Yii::t('app', 'Total Count'),
+            'complete_count' => Yii::t('app', 'Complete Count'),
+            'current' => Yii::t('app', 'Current'),
+        ];
+    }
+}
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use common\models\Job;
+
+/**
+ * JobSearch represents the model behind the search form about `common\models\Job`.
+ */
+class JobSearch extends Job
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['job_id', 'user_id', 'total_count', 'complete_count', 'current'], 'integer'],
+            [['name', 'link', 'date_start', 'date_end', 'position'], 'safe'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = Job::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        $query->andFilterWhere([
+            'job_id' => $this->job_id,
+            'date_start' => $this->date_start,
+            'date_end' => $this->date_end,
+            'user_id' => $this->user_id,
+            'total_count' => $this->total_count,
+            'complete_count' => $this->complete_count,
+            'current' => $this->current,
+        ]);
+
+        $query->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'link', $this->link])
+            ->andFilterWhere(['like', 'position', $this->position]);
+
+        return $dataProvider;
+    }
+}
@@ -31,6 +31,9 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
     const STATUS_DELETED = 0;
     const STATUS_ACTIVE = 10;
     public $profile;
+    public $old_password;
+    public $new_password;
+    public $password_reply;
  
     /**
      * @inheritdoc
@@ -58,6 +61,8 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
         return [
             ['status', 'default', 'value' => self::STATUS_ACTIVE],
             ['status', 'in', 'range' => [self::STATUS_ACTIVE, self::STATUS_DELETED]],
+            [['username', 'lastname', 'firstname', 'middlename'], 'string', 'max' => 255],
+            [['type'], 'in', 'range' => [1, 2]],
         ];
     }
  
@@ -263,4 +268,14 @@ class User extends ActiveRecord implements IdentityInterface, UserRbacInterface
     public function getUserInfo(){
         return $this->hasOne(UserInfo::className(), ['user_id' => 'id']);
     }
+
+    public function getIsPerformer()
+    {
+        return true;
+    }
+
+    public function getIsCustomer()
+    {
+        return true;
+    }
 }
@@ -25,9 +25,28 @@ use Yii;
  * @property integer $delivery
  * @property double $prepayment
  * @property string $about
+ * @property integer $type
  */
 class UserInfo extends \yii\db\ActiveRecord
 {
+    // Константа обознащающая физическое лицо
+    const USER_TYPE_FIZ = 1;
+
+    // Константа обозначающая компанию
+    const USER_TYPE_COMPANY = 2;
+
+    // Константа обозначающая, что компания/физ.лицо свободно
+    const USER_STATUS_FREE = 1;
+
+    // Константа обозначающая, что компания/физ.лицо занято
+    const USER_STATUS_BUSY = 2;
+
+    // Константа обозначающая, что компания/физ.лицо хочет стать членом МФП
+    const USER_MEMBER_FALSE = 1;
+
+    // Константа обозначающая, что компания/физ.лицо не хочет стать членом МФП
+    const USER_MEMBER_TRUE = 2;
+
     /**
      * @inheritdoc
      */
@@ -44,10 +63,11 @@ class UserInfo extends \yii\db\ActiveRecord
         return [
             [['user_id', 'view_count', 'contract', 'estimate', 'purchase', 'delivery'], 'integer'],
             [['date_visit'], 'safe'],
-            [['experience', 'soft', 'guarantee', 'about'], 'string'],
+            [['experience', 'soft', 'guarantee', 'about', 'city', 'country'], 'string'],
             [['prepayment'], 'number'],
-            [['busy', 'rank', 'location'], 'string', 'max' => 50],
-            [['salary', 'job'], 'string', 'max' => 255]
+            [['rank', 'location'], 'string', 'max' => 50],
+            [['salary', 'job'], 'string', 'max' => 255],
+            [['busy', 'member'], 'boolean'],
         ];
     }
  
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+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', 'member', $this->smallInteger());
+
+        $this->createTable('{{%company_info}}', [
+            'company_info_id' => $this->primaryKey(),
+            'name' => $this->string(255)->notNull(),
+            'staff' => $this->integer(),
+            'street' => $this->string(255),
+            'house' => $this->string(255),
+            'hide_mail' => $this->smallInteger(),
+            'user_id' => $this->integer(),
+        ], null);
+    }
+
+    public function down()
+    {
+        $this->dropColumn('user', 'type');
+        $this->dropColumn('user_info', 'image');
+        $this->dropColumn('user_info', 'poster');
+        $this->dropColumn('user_info', 'member');
+        $this->dropTable('company_info');
+    }
+}
+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m160202_094943_user_info_country_city extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('user_info', 'country', $this->string(255));
+        $this->addColumn('user_info', 'city', $this->string(255));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('user_info', 'country');
+        $this->dropColumn('user_info', 'city');
+    }
+
+    /*
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+    }
+
+    public function safeDown()
+    {
+    }
+    */
+}
@@ -18,6 +18,7 @@ class m160203_082111_jobs extends Migration
             'user_id' =>  $this->integer(),
             'total_count' =>  $this->integer(),
             'complete_count' =>  $this->integer(),
+            'current' => $this->smallInteger(),
         ], $tableOptions);
  
     }
 <?php
 namespace frontend\controllers;
  
+use common\models\CompanyInfo;
 use common\models\Fields;
+use common\models\Job;
 use common\models\Language;
 use Yii;
 use common\models\User;
@@ -28,7 +30,7 @@ class AccountsController extends Controller
                 'class' => AccessControl::className(),
                 'rules' => [
                     [
-                        'actions' => ['cabinet','change-password', 'bookmarks'],
+                        //'actions' => ['cabinet','change-password', 'bookmarks', 'projects'],
                         'allow' => true,
                         'roles' => ['@'],
                     ],
@@ -75,6 +77,127 @@ class AccountsController extends Controller
         return $this->render('bookmarks');
     }
  
+    public function actionGeneral()
+    {
+        $user_info = UserInfo::find()->where(['user_id' => \Yii::$app->user->getId()])->one();
+        $company_info = CompanyInfo::find()->where(['user_id' => \Yii::$app->user->getId()])->one();
+        $user = \Yii::$app->user->identity;
+        if(empty($user_info))
+        {
+            $user_info = new UserInfo(['user_id' => \Yii::$app->user->getId()]);
+        }
+        if(empty($company_info))
+        {
+            $company_info = new CompanyInfo(['user_id' => \Yii::$app->user->getId()]);
+        }
+        $post = \Yii::$app->request->post();
+        if(!empty($post))
+        {
+            $user_info->load($post);
+            $company_info->load($post);
+            $user->load($post);
+            if($user_info->save() && $user->save() && $company_info->save())
+            {
+                \Yii::$app->session->setFlash('userinfoupdate', 'Информация успешно обновлена');
+            } else {
+                \Yii::$app->session->setFlash('userinfoupdate', 'Ошибка обновления. Проверьте форму');
+            }
+        }
+        return $this->render('general', ['user_info' => $user_info, 'user' => $user, 'company_info' => $company_info]);
+    }
+
+    public function actionPortfolio()
+    {
+
+    }
+
+    /**
+     * $user User
+     */
+    public function actionSetting()
+    {
+        $user = \Yii::$app->user->identity;
+        $post = \Yii::$app->request->post('User');
+        if(!empty($post)) {
+            if(empty($post['new_password'])) {
+                $user->addError('new_password', 'Введите новый пароль');
+            } else {
+                $user->new_password = $post['new_password'];
+            }
+            if(empty($post['old_password'])) {
+                $user->addError('old_password', 'Введите новый пароль');
+            } else {
+                $user->old_password = $post['old_password'];
+            }
+            if(empty($post['password_reply']) || $post['password_reply'] !== $post['new_password']) {
+                $user->addError('password_reply', 'Неправильный повтор пароля');
+            } else {
+                $user->password_reply = $post['password_reply'];
+            }
+            if(!$user->hasErrors()) {
+                if($user->validatePassword($user->old_password)) {
+                    $user->setPassword($user->new_password);
+                    $user->generateAuthKey();
+                    if($user->save()) {
+                        \Yii::$app->session->setFlash('passwordupdate', 'Пароль успешно обновлен');
+                    }
+                } else {
+                    $user->addError('old_password', 'Неправильный старый пароль');
+                }
+            }
+        }
+        return $this->render('setting', ['user' => $user]);
+    }
+
+    public function actionContacts()
+    {
+        $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()]);
+        }
+        return $this->render('contacts', ['user_info' => $user_info]);
+    }
+
+    public function actionService()
+    {
+        return $this->render('service');
+    }
+
+    public function actionAddSkills()
+    {
+
+    }
+
+    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();
+        }
+        return $this->render('employment', ['job' => $job]);
+    }
+
+    public function actionProjects()
+    {
+        return $this->render('projects');
+    }
+
+    public function actionGallery()
+    {
+
+    }
+
+    public function actionGetForm($lastindex)
+    {
+        return $this->renderAjax('_job_form', ['index' => $lastindex+1]);
+    }
  
     /**
      * @param $id
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\CompanyInfo;
+use common\models\CompanyInfoSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * CompanyInfoController implements the CRUD actions for CompanyInfo model.
+ */
+class CompanyInfoController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all CompanyInfo models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new CompanyInfoSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single CompanyInfo model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new CompanyInfo model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new CompanyInfo();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->company_info_id]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing CompanyInfo model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->company_info_id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing CompanyInfo model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the CompanyInfo model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return CompanyInfo the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = CompanyInfo::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
+<?php
+
+namespace frontend\controllers;
+
+use Yii;
+use common\models\Job;
+use common\models\JobSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * JobController implements the CRUD actions for Job model.
+ */
+class JobController extends Controller
+{
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all Job models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new JobSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single Job model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new Job model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new Job();
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->job_id]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing Job model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->job_id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing Job model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the Job model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return Job the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = Job::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
+<?php
+    /**
+     * @var integer $index
+     */
+    use common\models\Job;
+    use yii\jui\DatePicker;
+    use yii\widgets\ActiveForm;
+
+    $model = new Job(['user_id' => \Yii::$app->user->getId (), 'current' => 0]);
+    $form = ActiveForm::begin ();
+    echo "<div class='ajax-loaded'><div class='prev_job_inputs'>";
+    echo $form->field ($model, '[' . $index . ']name')
+              ->label ('Название')
+              ->textInput ();
+    echo $form->field ($model, '[' . $index . ']link')
+              ->label ('Ссылка на компанию на сайте МФП')
+              ->textInput ();
+    echo $form->field ($model, '[' . $index . ']date_start')
+              ->label ('Дата начала работы')
+              ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+    echo $form->field ($model, '[' . $index . ']date_end')
+              ->label ('Дата окончания работы')
+              ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+    echo $form->field ($model, '[' . $index . ']position')
+              ->label ('Должность')
+              ->textInput ();
+    echo $form->field ($model, '[' . $index . ']total_count')
+              ->label ('Количество проектов, в которых принимали участие')
+              ->input ('number');
+    echo $form->field ($model, '[' . $index . ']complete_count')
+              ->label ('из них реализовано')
+              ->input ('number');
+    echo "</div></div>";
+    $form->end ();
+?>
+<?php
+use common\models\Option;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use \common\widgets\MultiLangForm;
+
+    $this->title = 'Мой профиль';
+    $this->params['breadcrumbs'][] = $this->title;
+?>
+
+<h1><?=  $this->title ?></h1>
+
+
+
+<?php
+
+$form = $this->render('_form', [
+    'user' => $user,
+    'user_info' => $user_info,
+]);
+
+echo MultiLangForm::widget(['form'=>$form]);
+
+?>
+
+
+<?php
+use common\models\Option;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use \common\widgets\MultiLangForm;
+
+    $this->title = 'Мой профиль';
+    $this->params['breadcrumbs'][] = $this->title;
+?>
+
+<h1><?=  $this->title ?></h1>
+
+
+
+<?php
+
+$form = $this->render('_form', [
+    'user' => $user,
+    'user_info' => $user_info,
+]);
+
+echo MultiLangForm::widget(['form'=>$form]);
+
+?>
+
+
+<?php
+    /**
+     * @var Job[] $job
+     */
+    use common\models\Job;
+    use yii\helpers\Html;
+    use yii\jui\DatePicker;
+    use yii\widgets\ActiveForm;
+
+    $this->title = 'Трудовой стаж';
+    $this->params['breadcrumbs'][] = $this->title;
+?>
+    <h1><?= $this->title ?></h1>
+<?php
+    $form = ActiveForm::begin ();
+    $current = array_shift ($job);
+?>
+    <div class="current_job_container">
+        <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 ();
+                echo $form->field ($current, '[0]link')
+                          ->label ('Ссылка на компанию на сайте МФП')
+                          ->textInput ();
+                echo $form->field ($current, '[0]date_start')
+                          ->label ('Дата начала работы')
+                          ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                echo $form->field ($current, '[0]position')
+                          ->label ('Должность')
+                          ->textInput ();
+                echo $form->field ($current, '[0]total_count')
+                          ->label ('Количество проектов, в которых принимали участие')
+                          ->input ('number');
+                echo $form->field ($current, '[0]complete_count')
+                          ->label ('из них реализовано')
+                          ->input ('number');
+            ?>
+        </div>
+    </div>
+    <div class="prev_job_container">
+        <p>Предыдущие места работы</p>
+        <?php
+            foreach ($job as $index => $job_model)
+            {
+                echo "<div class='prev_job_inputs'>";
+                echo $form->field ($job_model, '['. ($index + 1) .']name')
+                          ->label ('Название')
+                          ->textInput ();
+                echo $form->field ($job_model, '['. ($index + 1) .']link')
+                          ->label ('Ссылка на компанию на сайте МФП')
+                          ->textInput ();
+                echo $form->field ($job_model, '['. ($index + 1) .']date_start')
+                          ->label ('Дата начала работы')
+                          ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                echo $form->field ($job_model, '['. ($index + 1) .']date_end')
+                          ->label ('Дата окончания работы')
+                          ->widget (DatePicker::className (), ['language' => 'ru', 'dateFormat' => 'dd-MM-yyyy']);
+                echo $form->field ($job_model, '['. ($index + 1) .']position')
+                          ->label ('Должность')
+                          ->textInput ();
+                echo $form->field ($job_model, '['. ($index + 1) .']total_count')
+                          ->label ('Количество проектов, в которых принимали участие')
+                          ->input ('number');
+                echo $form->field ($job_model, '['. ($index + 1) .']complete_count')
+                          ->label ('из них реализовано')
+                          ->input ('number');
+                echo "</div>";
+            }
+        ?>
+    </div>
+<?php
+    echo Html::button('Добавить место работы', ['id' => 'add_job_button']);
+    $form->end ();
+?>
+<script>
+    $(function() {
+        var regexp = /^[\w]+\[(\d+)\].*$/;
+        $(document).on('click', '#add_job_button', function() {
+            var inputs = $('.prev_job_inputs').last();
+            var name = $(inputs).find('input, textarea').first().attr('name');
+            var lastindex = regexp.exec(name)[1];
+            $.get('/accounts/get-form', { lastindex: lastindex }, function(data) {
+                $('.prev_job_container').append($(data).find('.ajax-loaded').first().html());
+                $(data).filter('script').appendTo('body');
+            });
+        });
+    });
+</script>
+<?php
+use common\models\Option;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use \common\widgets\MultiLangForm;
+
+    $this->title = 'Мой профиль';
+    $this->params['breadcrumbs'][] = $this->title;
+?>
+
+<h1><?=  $this->title ?></h1>
+
+
+
+<?php
+
+$form = $this->render('_form', [
+    'user' => $user,
+    'user_info' => $user_info,
+]);
+
+echo MultiLangForm::widget(['form'=>$form]);
+
+?>
+
+
+<?php
+    /**
+     * @var UserInfo    $user_info
+     * @var User        $user
+     * @var CompanyInfo $company_info
+     */
+    use common\models\CompanyInfo;
+    use common\models\Option;
+    use common\models\User;
+    use common\models\UserInfo;
+    use yii\helpers\Html;
+    use yii\widgets\ActiveForm;
+    use \common\widgets\MultiLangForm;
+
+    $this->title = 'Учетные данные';
+    $this->params['breadcrumbs'][] = $this->title;
+?>
+<h1><?= $this->title ?></h1>
+<div class="" id="form_definition">
+    <?php
+        $form = ActiveForm::begin ();
+        echo $form->field ($user, 'isPerformer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])
+                  ->label ('Я - исполнитель')
+                  ->hint ('Отображается если указать специализации услуг в личном кабинете.')
+                  ->checkbox ([], false);
+        echo $form->field ($user, 'isCustomer', ['template' => "{label}:\n{input}\n{hint}\n{error}"])
+                  ->label ('Я - заказчик')
+                  ->hint ('Отображается если созданы заказы.')
+                  ->checkbox ([], false);
+        echo $form->field ($user, 'type')
+                  ->label ('Кто вы')
+                  ->radioList ([1 => 'Частное лицо', 2 => 'Компания']);
+        echo $form->field ($company_info, 'name', ['options' => ['class' => 'form-group company_info']])
+                  ->label ('Название компании')
+                  ->textInput ();
+        echo $form->field ($company_info, 'staff', ['options' => ['class' => 'form-group company_info']])
+                  ->label ('Количество сотрудников')
+                  ->input ('number');
+        echo '<div class="company_info">Контакты представителя</div>';
+        echo $form->field ($user, 'lastname')
+                  ->label ('Фамилия')
+                  ->textInput ();
+        echo $form->field ($user, 'firstname')
+                  ->label ('Имя')
+                  ->textInput ();
+        echo $form->field ($user_info, 'country')
+                  ->label ('Ваша страна')
+                  ->textInput ();
+        echo $form->field ($user_info, 'city')
+                  ->label ('Ваш город')
+                  ->textInput ();
+        echo $form->field ($company_info, 'street', ['options' => ['class' => 'form-group company_info']])
+                  ->label ('Улица')
+                  ->textInput ();
+        echo $form->field ($company_info, 'house', ['options' => ['class' => 'form-group company_info']])
+                  ->label ('Дом')
+                  ->textInput ();
+        echo $form->field ($user, 'email')
+                  ->label ('Email')
+                  ->textInput (['disabled' => 'disabled']);
+        echo $form->field ($company_info, 'hide_mail', ['options' => ['class' => 'form-group company_info'], 'template' => "{input}{label}\n{hint}\n{error}"])
+                  ->label ('Не публиковать Email')
+                  ->checkbox ([], false);
+        echo $form->field ($user_info, 'busy')
+                  ->label ('Статус')
+                  ->radioList ([0 => 'Свободен', 1 => 'Занят']);
+        echo $form->field ($user_info, 'member')
+                  ->label ('Членство в МФП')
+                  ->hint ('Выберите если хотите стать членом МФП и наш менеджер свяжется с Вами.')
+                  ->radioList ([0 => 'Не хочу', 1 => 'Хочу стать']);
+        echo Html::submitButton('Обновить', ['class' => 'btn btn-primary']);
+        $form->end ();
+    ?>
+</div>
+<?php
+use common\models\Option;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+use \common\widgets\MultiLangForm;
+
+    $this->title = 'Мой профиль';
+    $this->params['breadcrumbs'][] = $this->title;
+?>
+
+<h1><?=  $this->title ?></h1>
+
+
+
+<?php
+
+$form = $this->render('_form', [
+    'user' => $user,
+    'user_info' => $user_info,
+]);
+
+echo MultiLangForm::widget(['form'=>$form]);
+
+?>
+
+
+<?php
+    $this->title = 'Мой профиль';
+    $this->params['breadcrumbs'][] = $this->title;
+?>
+
+<h1><?= $this->title ?></h1>
+
+
+
+
+<?php
+    /**
+     * @var User $user
+     */
+    use common\models\Option;
+    use common\models\User;
+    use yii\helpers\Html;
+    use yii\widgets\ActiveForm;
+    use \common\widgets\MultiLangForm;
+
+    $this->title = 'Настройки профиля';
+    $this->params['breadcrumbs'][] = $this->title;
+?>
+
+<h1><?= $this->title ?></h1>
+
+<?php
+    if (\Yii::$app->session->hasFlash ('passwordupdate'))
+    {
+        ?>
+        <div class="alert alert-warning alert-dismissible" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
+            <p><?= \Yii::$app->session->getFlash ('passwordupdate') ?></p>
+        </div>
+        <?
+    }
+    $form = ActiveForm::begin ();
+    echo "<p>Сменить пароль:</p>";
+    echo $form->field ($user, 'old_password', ['template' => "{input}{label}\n{hint}\n{error}"])
+              ->label ('Старый пароль')
+              ->passwordInput (['value' => '']);
+    echo $form->field ($user, 'new_password', ['template' => "{input}{label}\n{hint}\n{error}"])
+              ->label ('Новый пароль')
+              ->passwordInput (['value' => '']);
+    echo $form->field ($user, 'password_reply', ['template' => "{input}{label}\n{hint}\n{error}"])
+              ->label ('Повторите пароль')
+              ->passwordInput (['value' => '']);
+    echo Html::submitButton ('Обновить', ['class' => 'btn btn-primary']);
+    $form->end ();
+?>
+
+
 <?php
     use common\models\Option;
+    use yii\widgets\DetailView;
  
     $this->title = 'Мой профиль';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
-
 <div class="section-box content">
     <div class="section-box-15">
         <div class="box-wr">
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\CompanyInfo */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="company-info-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput() ?>
+
+    <?= $form->field($model, 'staff')->textInput() ?>
+
+    <?= $form->field($model, 'street')->textInput() ?>
+
+    <?= $form->field($model, 'house')->textInput() ?>
+
+    <?= $form->field($model, 'hide_mail')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\CompanyInfoSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="company-info-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'company_info_id') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'staff') ?>
+
+    <?= $form->field($model, 'street') ?>
+
+    <?= $form->field($model, 'house') ?>
+
+    <?php // echo $form->field($model, 'hide_mail') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('app', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\CompanyInfo */
+
+$this->title = Yii::t('app', 'Create Company Info');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Company Infos'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="company-info-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel common\models\CompanyInfoSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('app', 'Company Infos');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="company-info-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('app', 'Create Company Info'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'company_info_id',
+            'name',
+            'staff',
+            'street',
+            'house',
+            // 'hide_mail',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\CompanyInfo */
+
+$this->title = Yii::t('app', 'Update {modelClass}: ', [
+    'modelClass' => 'Company Info',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Company Infos'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->company_info_id]];
+$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
+?>
+<div class="company-info-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\CompanyInfo */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Company Infos'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="company-info-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->company_info_id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->company_info_id], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'company_info_id',
+            'name',
+            'staff',
+            'street',
+            'house',
+            'hide_mail',
+        ],
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Job */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="job-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'link')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'date_start')->textInput() ?>
+
+    <?= $form->field($model, 'date_end')->textInput() ?>
+
+    <?= $form->field($model, 'position')->textInput(['maxlength' => true]) ?>
+
+    <?= $form->field($model, 'user_id')->textInput() ?>
+
+    <?= $form->field($model, 'total_count')->textInput() ?>
+
+    <?= $form->field($model, 'complete_count')->textInput() ?>
+
+    <?= $form->field($model, 'current')->textInput() ?>
+
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\JobSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="job-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'job_id') ?>
+
+    <?= $form->field($model, 'name') ?>
+
+    <?= $form->field($model, 'link') ?>
+
+    <?= $form->field($model, 'date_start') ?>
+
+    <?= $form->field($model, 'date_end') ?>
+
+    <?php // echo $form->field($model, 'position') ?>
+
+    <?php // echo $form->field($model, 'user_id') ?>
+
+    <?php // echo $form->field($model, 'total_count') ?>
+
+    <?php // echo $form->field($model, 'complete_count') ?>
+
+    <?php // echo $form->field($model, 'current') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton(Yii::t('app', 'Search'), ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton(Yii::t('app', 'Reset'), ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Job */
+
+$this->title = Yii::t('app', 'Create Job');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Jobs'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="job-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel common\models\JobSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('app', 'Jobs');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="job-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a(Yii::t('app', 'Create Job'), ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'job_id',
+            'name',
+            'link',
+            'date_start',
+            'date_end',
+            // 'position',
+            // 'user_id',
+            // 'total_count',
+            // 'complete_count',
+            // 'current',
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Job */
+
+$this->title = Yii::t('app', 'Update {modelClass}: ', [
+    'modelClass' => 'Job',
+]) . ' ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Jobs'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->job_id]];
+$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
+?>
+<div class="job-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model common\models\Job */
+
+$this->title = $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Jobs'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="job-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->job_id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->job_id], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'job_id',
+            'name',
+            'link',
+            'date_start',
+            'date_end',
+            'position',
+            'user_id',
+            'total_count',
+            'complete_count',
+            'current',
+        ],
+    ]) ?>
+
+</div>
@@ -25,7 +25,58 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                 <?= Breadcrumbs::widget([
                     'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
                 ]) ?>
-
+                <div class="section-box menu-content-wr">
+                    <div class="box-wr">
+                        <div class="box-all">
+                            <?php
+                                echo Menu::widget([
+                                    'options' => [
+                                        'class' => 'menu-content',
+                                    ],
+                                    'activeCssClass' => 'active-menu-content',
+                                    'items' => [
+                                        [
+                                            'label' => 'Общее',
+                                            'url' => ['accounts/general'],
+                                        ],
+                                        [
+                                            'label' => 'Портфолио',
+                                            'url' => ['accounts/portfolio'],
+                                        ],
+                                        [
+                                            'label' => 'Настройка аккаунта',
+                                            'url' => ['accounts/setting'],
+                                        ],
+                                        [
+                                            'label' => 'Контакты',
+                                            'url' => ['accounts/contacts'],
+                                        ],
+                                        [
+                                            'label' => 'Услуги',
+                                            'url' => ['accounts/service'],
+                                        ],
+                                        [
+                                            'label' => 'Дополнительные навыки',
+                                            'url' => ['accounts/add-skills'],
+                                        ],
+                                        [
+                                            'label' => 'Трудовой стаж',
+                                            'url' => ['accounts/employment'],
+                                        ],
+                                        [
+                                            'label' => 'Проекты',
+                                            'url' => ['accounts/projects'],
+                                        ],
+                                        [
+                                            'label' => 'Галерея',
+                                            'url' => ['accounts/gallery'],
+                                        ],
+                                    ],
+                                ]);
+                            ?>
+                        </div>
+                    </div>
+                </div>
                 <div class="menu-location-index">
                     <?= $content ?>
  
@@ -33,6 +84,5 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
  
             </div>
         </div>
-</div>
-
+    </div>
 <?php $this->endContent() ?>
 \ No newline at end of file
@@ -34,7 +34,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                                     'url' => ['performer/common'],
                                 ],
                                 [
-                                    'label' => 'Выполненные работы',
+                                    'label' => 'Портфолио',
                                     'url' => ['performer/portfolio'],
                                 ],
                                 [
@@ -34,7 +34,7 @@ $this-&gt;beginContent(&#39;@app/views/layouts/main.php&#39;);
                                     'url' => ['performer/common'],
                                 ],
                                 [
-                                    'label' => 'Выполненные работы',
+                                    'label' => 'Портфолио',
                                     'url' => ['performer/portfolio'],
                                 ],
                                 [
 .glyphicon_right{
     top: -55px;
     left: 50px;
+}
+.form_for_company .company_info {
+    display: none;
 }
 \ No newline at end of file