Merge branch 'Yarik'

andryeyev
2 parents eb896676 6f8e46af
Showing 147 changed files with 1967 additions and 744 deletions Show diff stats
backend/controllers/AdminMenuController.php
backend/controllers/LanguageController.php
backend/controllers/MenuController.php
backend/controllers/SettingsController.php
backend/controllers/TerminController.php
backend/models/AdminMenu.php
backend/models/AdminMenuAccessGroup.php
backend/models/AdminMenuAccessUser.php
backend/models/AdminMenuSearch.php
backend/models/Import.php
backend/models/LanguageSearch.php
backend/models/Menu.php
backend/models/MenuLocation.php
backend/models/MenuLocationLang.php
backend/models/MenuSearch.php
backend/models/NewOptionsLang.php
backend/models/NewOptionsLangSearch.php
backend/models/Termin.php
backend/models/TerminLang.php
backend/views/admin-menu/_form.php
+<?php
+
+namespace backend\controllers;
+
+use Yii;
+use backend\models\AdminMenu;
+use backend\models\AdminMenuSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * AdminMenuController implements the CRUD actions for AdminMenu model.
+ */
+class AdminMenuController extends Controller
+{
+    public $layout = 'settings';
+
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['post'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all AdminMenu models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new AdminMenuSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single AdminMenu model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new AdminMenu model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new AdminMenu();
+        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+            return $this->redirect(['view', 'id' => $model->admin_menu_id]);
+        } else {
+            return $this->render('create', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Updates an existing AdminMenu 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->adminmenu_id]);
+        } else {
+            return $this->render('update', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    /**
+     * Deletes an existing AdminMenu 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 AdminMenu model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return AdminMenu the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = AdminMenu::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+
+}
@@ -54,7 +54,7 @@ class LanguageController extends Controller
     {
         if(!empty(Yii::$app->request->get('id'))) {
             $model = $this->findModel(Yii::$app->request->get('id'));
-            $model->active = 1;
+            $model->status = 1;
             $model->save();
             return $this->redirect(['index']);
         } else {
@@ -77,7 +77,7 @@ class LanguageController extends Controller
     public function actionDelete($id)
     {
         $model = $this->findModel($id);
-        $model->active = 0;
+        $model->status = 0;
         $model->save();
         return $this->redirect(['index']);
@@ -152,18 +152,18 @@ class LanguageController extends Controller
     public function actionDeleteAdress($id)
     {
         $model = $this->findModelAdress($id);
-        $children = $model->hasMany(Option::className(), ['parent_id' => 'option_id'])->all();
+        $children = $model->hasMany(Option::className(), ['option_pid' => 'option_id'])->all();
         $langs = array();
         if(!empty($children)) {
             foreach($children as $child) {
-                $langs = OptionLang::findAll(['id' => $child->option_id]);
+                $langs = OptionLang::findAll(['option_language_id' => $child->option_id]);
                 foreach($langs as $lang) {
                     $lang->delete();
                 }
                 $child->delete();
             }
         }
-        $langs = OptionLang::findAll(['id' => $id]);
+        $langs = OptionLang::findAll(['option_language_id' => $id]);
         foreach($langs as $lang) {
             $lang->delete();
         }
@@ -118,4 +118,5 @@ class MenuController extends Controller
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
+
 }
+<?php
+namespace backend\controllers;
+
+use Yii;
+use yii\filters\AccessControl;
+use yii\web\Controller;
+use common\models\LoginForm;
+use yii\filters\VerbFilter;
+use backend\models\Profile;
+use common\models\User;
+use frontend\models\Option;
+use yii\data\ActiveDataProvider;
+use yii\validators\BooleanValidator;
+use yii\validators\StringValidator;
+/**
+ * Site controller
+ */
+class SettingsController extends Controller
+{
+    public $layout = 'settings';
+    /**
+     * @inheritdoc
+     */
+    public function actions()
+    {
+        return [
+            'error' => [
+                'class' => 'yii\web\ErrorAction',
+            ],
+        ];
+    }
+
+    public function actionIndex()
+    {
+    	return $this->render('index');
+    }
+    
+}
@@ -5,26 +5,24 @@ namespace backend\controllers;
 use Yii;
 use backend\models\Termin;
 use backend\models\TerminSearch;
-use yii\filters\AccessControl;
 use yii\web\Controller;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use backend\models\TerminLang;
 use backend\models\TerminStructure;
-use common\models\Language;
-use backend\models\TerminRelation;
+use yii\filters\AccessControl;
 /**
  * TerminController implements the CRUD actions for Termin model.
  */
 class TerminController extends Controller
 {
-    public function behaviors()
+ public function behaviors()
     {
         return [
             'access' => [
                 'class' => AccessControl::className(),
-                'except' => ['login', 'error', 'index', 'create', 'update', 'view', 'form', 'delete'],
+                'except' => ['login', 'error', 'index', 'create', 'update'],
                 'rules' => [
                     [
                         'allow' => true,
@@ -41,20 +39,6 @@ class TerminController extends Controller
             ],
         ];
     }
-    
-    // ==== AJAX ====
-
-    public function actionForm($lang_id, $widget_id)
-    {
-        if (! $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1, 'language_id' => $lang_id])->one()) 
-        {
-            throw new NotFoundHttpException('Language not found');
-        }
-        
-        $article_lang = new TerminLang();
-        
-        return $this->renderAjax('_article_form', ['model' => $model, 'article_lang' => $article_lang, 'widget_id' => $widget_id]);
-    }
     /**
      * Lists all Termin models.
@@ -90,48 +74,23 @@ class TerminController extends Controller
      */
     public function actionCreate()
     {
-        $model = new Termin(); 
-        $model_pid = new TerminStructure(); 
+        $model = new Termin();
+        $model_lang = new TerminLang();
-        // проверяем общие таблицы
         if ($model->load(Yii::$app->request->post())
-            && $model_pid->load(Yii::$app->request->post())
-        ) 
-        {
-            $model_lang = [];
-            
-            foreach (Yii::$app->request->post()['TerminLang'] as $index => $row) 
-            {
-                $model_lang[$index] = new TerminLang();
-            }
-
-            if (TerminLang::loadMultiple($model_lang, Yii::$app->request->post())
-                && TerminLang::validateMultiple($model_lang))
-            {
-                $model->save(); 
-                $model_pid->termin_id = $model->termin_id;
-                $model_pid->save();
-
-                foreach ($model_lang as $post)
-                {
-                    $post->termin_id = $model->termin_id;
-                    $post->save(false);
-                }
-            }
+            && $model_lang->load(Yii::$app->request->post())) 
+        { 
+            $model->save();
+            $model_lang->termin_id = $model->termin_id;
+            $model_lang->save();
             return $this->redirect(['view', 'id' => $model->termin_id]); 
         } 
         else 
-        { 
-            $default_lang = Language::getDefaultLang();
-
-            $LANG = [];
-            $LANG[$default_lang->language_id] = new TerminLang();
-            
+        {
             return $this->render('create', [
                 'model' => $model,
-                'model_lang' => $LANG,
-                'model_pid' => $model_pid,
+                'model_lang' => $model_lang,
             ]);
         }
     }
@@ -145,49 +104,22 @@ class TerminController extends Controller
     public function actionUpdate($id)
     {
         $model = $this->findModel($id);
-        $model_lang = Termin::findOne($id)->getTerminLangs()->indexBy('lang_id')->all();
-        $model_pid = TerminStructure::findOne($id);
-
-        // проверяем общие таблицы
+        $model_lang = TerminLang::findOne($id);
+        $model_pid = TerminStructure::findOne($id)->getRelation('terminPid')->one();
+        
+        //var_dump(Yii::$app->request->post());
+        //var_dump($model_pid->termin->termin_id); die;
+ 
         if ($model->load(Yii::$app->request->post())
+            && $model_lang->load(Yii::$app->request->post())
             && $model_pid->load(Yii::$app->request->post())
         ) 
-        {
-/*
-            // проверяем таблицы lang  
-            $post_lang = Yii::$app->request->post('TerminLang'); 
-            if (! empty ($post_lang))
-            {
-                foreach ($post_lang as &$row)
-                {
-                    $row += new TerminLang();
-                }
-            }
-
-            var_dump($post_lang); 
-
-            die;
-*/
-            // + появились
-            
-            // - удалились
-
-            if (TerminLang::loadMultiple($model_lang, Yii::$app->request->post()) 
-                && TerminLang::validateMultiple($model_lang)) 
-            {
-                foreach ($model_lang as $post) 
-                { 
-                    $post->termin_id = $model->termin_id;
-                    $post->save(false);
-                }
-
-                $model->save();
-                $model_pid->save();
-
-                return $this->redirect(['view', 'id' => $model->termin_id]);
-            }
-
-            return $this->redirect('index');
+        {    
+            $model->save();
+            $model_lang->save();
+            $model_pid->termin_pid = $model_pid->termin->termin_id;
+ 
+            return $this->redirect(['view', 'id' => $model->termin_id]); 
         } 
         else 
         {
+<?php
+
+namespace backend\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "admin_menu".
+ *
+ * @property integer $admin_menu_id
+ * @property integer $admin_menu_pid
+ * @property integer $status
+ * @property integer $hide_min
+ * @property integer $sort
+ * @property string $name
+ * @property string $path
+ * @property string $param
+ *
+ * @property AdminMenu $parent
+ * @property AdminMenu[] $adminMenus
+ * @property AdminMenuAccessGroup[] $adminMenuAccessGroups
+ * @property AdminMenuAccessUser[] $adminMenuAccessUsers
+ */
+class AdminMenu extends \yii\db\ActiveRecord
+{
+
+    public $parentt;
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'admin_menu';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['admin_menu_pid', 'status', 'hide_min', 'sort'], 'integer'],
+            [['name'], 'required'],
+            [['name', 'path', 'param','parentt'], 'string']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'admin_menu_id' => Yii::t('app', 'Admin menu ID'),
+            'admin_menu_pid' => Yii::t('app', 'Admin menu parent ID'),
+            'status' => Yii::t('app', 'Status'),
+            'hide_min' => Yii::t('app', 'Hide Min'),
+            'sort' => Yii::t('app', 'Sort'),
+            'name' => Yii::t('app', 'Name'),
+            'path' => Yii::t('app', 'Path'),
+            'param' => Yii::t('app', 'Params'),
+            'parentt' => Yii::t('app', 'Parent item')
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getParent()
+    {
+        return $this->hasOne(AdminMenu::className(), ['admin_menu_id' => 'admin_menu_pid']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getAdminMenus()
+    {
+        return $this->hasMany(AdminMenu::className(), ['admin_menu_pid' => 'admin_menu_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getAdminMenuAccessGroups()
+    {
+        return $this->hasMany(AdminMenuAccessGroup::className(), ['admin_menu_id' => 'admin_menu_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getAdminMenuAccessUsers()
+    {
+        return $this->hasMany(AdminMenuAccessUser::className(), ['admin_menu_id' => 'admin_menu_id']);
+    }
+
+    public static function buildMenu($withValues = false)
+    {
+        $result = [];
+        $roots = self::find()->where(['admin_menu_pid' => NULL])->with(['adminMenus'])->all();
+        foreach($roots as $root) {
+            if($root->adminMenus) {
+                $result[] = ['label' => Yii::t('app', $root->name), 'id' => $root->admin_menu_id, 'options' => ['class' => 'header']];
+                foreach($root->adminMenus as $submenu) {
+                    if($submenu->adminMenus) {
+                        $items = [];
+                        foreach($submenu->adminMenus as $item) {
+                            $items[] = ['label' => Yii::t('app', $item->name), 'id' => $item->admin_menu_id, 'icon' => 'fa fa-circle-o', 'url' => array_merge([$item->path], \common\models\Tools::parseUrlParams($item->param))];
+                        }
+                        $result[] = ['label' => Yii::t('app', $submenu->name), 'id' => $submenu->admin_menu_id, 'icon' => 'fa fa-circle-o', 'url' => '#', 'items' => $items];
+                        unset($items);
+                    } else {
+                        $result[] = ['label' => Yii::t('app', $submenu->name), 'id' => $submenu->admin_menu_id, 'icon' => 'fa fa-circle-o', 'url' => array_merge([$submenu->path], \common\models\Tools::parseUrlParams($submenu->param))];
+                    }
+                }
+            }
+        }
+        return $result;
+    }
+
+    public static function buildMenuSelect()
+    {
+        $result = [];
+        $roots = self::find()->where(['admin_menu_pid' => NULL])->with(['adminMenus'])->all();
+        foreach($roots as $root) {
+            if($root->adminMenus) {
+                $items = [];
+                foreach($root->adminMenus as $submenu) {
+                    $items[] = ['label' => Yii::t('app', $submenu->name), 'id' => $submenu->admin_menu_id];
+                }
+                $result[] = ['label' => Yii::t('app', $root->name), 'id' => $root->admin_menu_id, 'items' => $items];
+                unset($items);
+            } else {
+                $result[] = ['label' => Yii::t('app', $root->name), 'id' => $root->admin_menu_id];
+            }
+        }
+        return $result;
+    }
+
+    public function beforeSave($insert)
+    {
+        if (parent::beforeSave($insert)) {
+            if(!$this->admin_menu_pid) {
+                $this->admin_menu_pid = NULL;
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
+<?php
+
+namespace backend\models;
+
+use Yii;
+
+/**
+ * This is the model class for table "admin_menu_access_group".
+ *
+ * @property integer $admin_menu_access_group_id
+ * @property integer $admin_menu_id
+ * @property string $group
+ *
+ * @property AdminMenu $menu
+ * @property AuthRule $group0
+ */
+class AdminMenuAccessGroup extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'admin_menu_access_group';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['admin_menu_id'], 'integer'],
+            [['group'], 'string']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'admin_menu_access_group_id' => Yii::t('app', 'Admin Access Group ID'),
+            'admin_menu_id' => Yii::t('app', 'Admin Menu ID'),
+            'group' => Yii::t('app', 'Group'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getMenu()
+    {
+        return $this->hasOne(AdminMenu::className(), ['admin_menu_id' => 'admin_menu_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getGroup0()
+    {
+        return $this->hasOne(AuthRule::className(), ['name' => 'group']);
+    }
+}
+<?php
+
+namespace backend\models;
+
+use common\models\User;
+use Yii;
+
+/**
+ * This is the model class for table "admin_menu_access_user".
+ *
+ * @property integer $admin_menu_id
+ * @property integer $user_id
+ * @property integer $admin_menu_access_user_id
+ *
+ * @property AdminMenu $menu
+ * @property User $user
+ */
+class AdminMenuAccessUser extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'admin_menu_access_user';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['admin_menu_id', 'user_id'], 'integer']
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'admin_menu_id' => Yii::t('app', 'Admin Menu ID'),
+            'user_id' => Yii::t('app', 'User ID'),
+            'admin_menu_access_user_id' => Yii::t('app', 'Admin Menu Access User ID'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getMenu()
+    {
+        return $this->hasOne(AdminMenu::className(), ['admin_menu_id' => 'admin_menu_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getUser()
+    {
+        return $this->hasOne(User::className(), ['id' => 'user_id']);
+    }
+}
+<?php
+
+namespace backend\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use backend\models\AdminMenu;
+
+/**
+ * AdminMenuSearch represents the model behind the search form about `backend\models\AdminMenu`.
+ */
+class AdminMenuSearch extends AdminMenu
+{
+
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['admin_menu_id', 'admin_menu_pid', 'status', 'hide_min', 'sort'], 'integer'],
+            [['name', 'path', 'param','parentt'], '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 = AdminMenu::find();
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+            'pagination' => [
+                'pageSize' => 5
+            ],
+            'sort' => [
+                'attributes' => [
+                    'admin_menu_id',
+                    'name',
+                    'path',
+                    'param',
+                    'status',
+                    'hide_min',
+                    'parentt' => [
+                        'asc' => ['name' => SORT_ASC],
+                        'desc' => ['name' => SORT_DESC],
+                        'default' => SORT_DESC
+                    ]
+                ]
+            ]
+        ]);
+
+        $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([
+            'admin_menu_id' => $this->admin_menu_id,
+            'admin_menu_pid' => $this->admin_menu_pid,
+            'status' => $this->status,
+            'hide_min' => $this->hide_min,
+            'sort' => $this->sort
+        ]);
+
+
+        $query->andFilterWhere(['like', 'name', $this->name])
+            ->andFilterWhere(['like', 'path', $this->path])
+            ->andFilterWhere(['like', 'param', $this->param])
+            ->andFilterWhere(['in', 'admin_menu_pid', $this->find()->select(['admin_menu_id'])->andFilterWhere(['like', 'name', $this->parentt])->column()]);
+
+        return $dataProvider;
+    }
+}
@@ -42,7 +42,7 @@ class Import extends \yii\db\ActiveRecord
         $termin_pid = 8; 
         // $template_id шаблон каьегорий
         $template_id = 3; 
-        $lang_id = 2;
+        $language_id = 2;
         $type = 'H';
         // массив для импортп товаров
@@ -69,7 +69,7 @@ class Import extends \yii\db\ActiveRecord
             // массив для поиска/добавления термина
             $basic = [
                 'type' => $type, 
-                'lang_id' => $lang_id,
+                'language_id' => $language_id,
                 'template_id' => $template_id,
             ];
@@ -19,8 +19,8 @@ class LanguageSearch extends Language
     {
         return [
             [['language_id'], 'integer'],
-            [['lang_code', 'language_name'], 'safe'],
-            [['is_default', 'active'], 'boolean'],
+            [['language_code', 'language_name'], 'safe'],
+            [['is_default', 'status'], 'boolean'],
         ];
     }
@@ -59,12 +59,12 @@ class LanguageSearch extends Language
         $query->andFilterWhere([
             'language_id' => $this->language_id,
             'is_default' => $this->is_default,
-            'active' => $this->active,
+            'status' => $this->status,
         ]);
-        $query->andFilterWhere(['like', 'lang_code', $this->lang_code])
+        $query->andFilterWhere(['like', 'language_code', $this->language_code])
             ->andFilterWhere(['like', 'language_name', $this->language_name])
-            ->andWhere(['active' => '1'])
+            ->andWhere(['status' => '1'])
         	->andWhere(['>', 'language_id', '0']);
         return $dataProvider;
@@ -89,12 +89,12 @@ class LanguageSearch extends Language
         $query->andFilterWhere([
             'language_id' => $this->language_id,
             'is_default' => $this->is_default,
-            'active' => $this->active,
+            'status' => $this->status,
         ]);
-        $query->andFilterWhere(['like', 'lang_code', $this->lang_code])
+        $query->andFilterWhere(['like', 'language_code', $this->language_code])
         ->andFilterWhere(['like', 'language_name', $this->language_name])
-        ->andWhere(['active' => '0']);
+        ->andWhere(['status' => '0']);
         return $dataProvider;
     }
@@ -80,7 +80,7 @@ class Menu extends \yii\db\ActiveRecord
                     AND menu_location.menu_location_name = \''.$location_name.'\'
                 INNER JOIN termin ON termin.termin_id = menu.termin_id
                 INNER JOIN termin_lang ON termin_lang.termin_id = menu.termin_id
-                    AND termin_lang.lang_id = '.Yii::$app->params['lang_id'].'
+                    AND termin_lang.language_id = '.Yii::$app->params['language_id'].'
             ORDER BY menu.level ASC, menu.sortorder ASC
         ')->queryAll();
 /*
@@ -90,8 +90,13 @@ class Menu extends \yii\db\ActiveRecord
              ->join(
                  'INNER JOIN',
                  'termin_lang.termin_id = menu.termin_id',
-                 ['lang_id' => yii::$app->params['lang_id']])
+                 ['language_id' => yii::$app->params['language_id']])
             ->all();
  */
     }    
+
+    public function getTerminLang()
+    {
+        return $this->hasOne(TerminLang::className(), ['termin_id' => 'termin_id']);
+    }
 }
@@ -59,6 +59,6 @@ class MenuLocation extends \yii\db\ActiveRecord
      */
     public function getLangs()
     {
-        return $this->hasMany(Language::className(), ['language_id' => 'lang_id'])->viaTable('menu_location_lang', ['menu_location_id' => 'menu_location_id']);
+        return $this->hasMany(Language::className(), ['language_id' => 'language_id'])->viaTable('menu_location_lang', ['menu_location_id' => 'menu_location_id']);
     }
 }
@@ -9,7 +9,7 @@ use Yii;
  *
  * @property integer $menu_location_id
  * @property string $menu_location_title
- * @property integer $lang_id
+ * @property integer $language_id
  *
  * @property Language $lang
  * @property MenuLocation $menuLocation
@@ -30,8 +30,8 @@ class MenuLocationLang extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['menu_location_id', 'menu_location_title', 'lang_id'], 'required'],
-            [['menu_location_id', 'lang_id'], 'integer'],
+            [['menu_location_id', 'menu_location_title', 'language_id'], 'required'],
+            [['menu_location_id', 'language_id'], 'integer'],
             [['menu_location_title'], 'string', 'max' => 250]
         ];
     }
@@ -44,7 +44,7 @@ class MenuLocationLang extends \yii\db\ActiveRecord
         return [
             'menu_location_id' => Yii::t('app', 'Menu Location ID'),
             'menu_location_title' => Yii::t('app', 'Menu Location Title'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
         ];
     }
@@ -53,7 +53,7 @@ class MenuLocationLang extends \yii\db\ActiveRecord
      */
     public function getLang()
     {
-        return $this->hasOne(Language::className(), ['language_id' => 'lang_id']);
+        return $this->hasOne(Language::className(), ['language_id' => 'language_id']);
     }
     /**
@@ -49,7 +49,8 @@ class MenuSearch extends Menu
         $this->load($params);
-        if (!$this->validate()) {
+        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;
@@ -67,7 +68,7 @@ class MenuSearch extends Menu
         ]);
         $query->andFilterWhere(['like', 'name', $this->name])
-            ->andFilterWhere(['like', 'url', $this->url]);
+              ->andFilterWhere(['like', 'url', $this->url]);
         return $dataProvider;
     }
@@ -9,7 +9,7 @@ use Yii;
  *
  * @property integer $primary
  * @property integer $id
- * @property integer $lang_id
+ * @property integer $language_id
  * @property string $value
  */
 class NewOptionsLang extends \yii\db\ActiveRecord
@@ -32,7 +32,7 @@ class NewOptionsLang extends \yii\db\ActiveRecord
     {
         return [
             [['id', 'value'], 'required'],
-            [['id', 'lang_id'], 'integer'],
+            [['id', 'language_id'], 'integer'],
             [['value'], 'string']
         ];
     }
@@ -45,7 +45,7 @@ class NewOptionsLang extends \yii\db\ActiveRecord
         return [
             'primary' => Yii::t('app', 'Primary'),
             'id' => Yii::t('app', 'ID'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
             'value' => Yii::t('app', 'Value'),
         ];
     }
@@ -18,7 +18,7 @@ class NewOptionsLangSearch extends NewOptionsLang
     public function rules()
     {
         return [
-            [['primary', 'id', 'lang_id'], 'integer'],
+            [['primary', 'id', 'language_id'], 'integer'],
             [['value'], 'safe'],
         ];
     }
@@ -58,7 +58,7 @@ class NewOptionsLangSearch extends NewOptionsLang
         $query->andFilterWhere([
             'primary' => $this->primary,
             'id' => $this->id,
-            'lang_id' => $this->lang_id,
+            'language_id' => $this->language_id,
         ]);
         $query->andFilterWhere(['like', 'value', $this->value]);
@@ -21,7 +21,6 @@ class Termin extends \yii\db\ActiveRecord
 {
     var $termin_title;
     var $termin_pid;
-    var $termin_parent_title;
     /**
      * @inheritdoc
@@ -38,9 +37,9 @@ class Termin extends \yii\db\ActiveRecord
     {
         return [
             [['is_book'], 'integer'],
-            [['termin_pid', 'termin_parent_title'], 'safe'],
+            [['termin_pid'], 'safe'],
             [['termin_title'], 'string', 'max' => 250],
-            [['termin_name','termin_parent_title'], 'string', 'max' => 250]
+            [['termin_name'], 'string', 'max' => 250]
         ];
     }
@@ -52,15 +51,13 @@ class Termin extends \yii\db\ActiveRecord
         return [
             'termin_id' => Yii::t('app', 'termin'),
             'termin_name' => Yii::t('app', 'name').' (SYSTEM NAME)',
-            'termin_title' => Yii::t('app', 'termin'),
-            'termin_parent_title' => Yii::t('app', 'termin').' Parent',
             'is_book' => Yii::t('app', 'book'),
         ];
     }
     /**
      * Выполняет поиск по параметрам
-     * @param array $param принимает [termin_id, lang_id, return_one, return_field, show_all]
+     * @param array $param принимает [termin_id, language_id, return_one, return_field, show_all]
      * @return array one | array all | string значение масива
      */
     public function finInfo (array $params = [])
@@ -68,12 +65,11 @@ class Termin extends \yii\db\ActiveRecord
         Tools::ifNotExist ($params, array (
             'termin_id' => false,
             'termin_pid' => false,
-            'lang_id' => Yii::$app->params['lang_id'],
+            'language_id' => Yii::$app->params['language_id'],
             'return_one' => false,
             'return_field' => false,
             'show_all' => false,
             'to_array' => true,
-            'sql_only' => false,
             'pid_title' => false,
         ));
@@ -96,9 +92,9 @@ class Termin extends \yii\db\ActiveRecord
             'termin.termin_id = termin_lang.termin_id'
         );
-        if ($params['lang_id'])
+        if ($params['language_id'])
         {
-            $WHERE['termin_lang.lang_id'] = $params['lang_id'];
+            $WHERE['termin_lang.language_id'] = $params['language_id'];
         }
         // структура
@@ -138,7 +134,7 @@ class Termin extends \yii\db\ActiveRecord
         {
             $query = $query->asArray();
         }
-
+    
         if ($params['return_one'] || $params['return_field'])
         {
@@ -165,13 +161,16 @@ class Termin extends \yii\db\ActiveRecord
      */
     public function getTerminLangs()
     {
-        return $this->hasOne(TerminLang::className(), ['termin_id' => 'termin_id']);
+        return $this->hasMany(TerminLang::className(), ['termin_id' => 'termin_id']);
     }
-    
-    public function getParent()
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getLangs()
     {
-        return $this->hasOne(Termin::className(),['termin_id'=>'termin_pid'])
-        ->viaTable(TerminStructure::tableName(), ['termin_id'=>'termin_id']);
+        return $this->hasMany(Language::className(), ['language_id' => 'language_id'])
+            ->viaTable('termin_lang', ['termin_id' => 'termin_id']);
     }
     /**
@@ -8,7 +8,7 @@ use Yii;
  * This is the model class for table "termin_lang".
  *
  * @property integer $termin_id
- * @property integer $lang_id
+ * @property integer $language_id
  * @property string $termin_title
  * @property string $termin_alias
  *
@@ -31,8 +31,8 @@ class TerminLang extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['lang_id'], 'required'],
-            [['lang_id'], 'integer'],
+            [['language_id'], 'required'],
+            [['language_id'], 'integer'],
             [['termin_title', 'termin_alias'], 'string', 'max' => 250]
         ];
     }
@@ -44,7 +44,7 @@ class TerminLang extends \yii\db\ActiveRecord
     {
         return [
             'termin_id' => Yii::t('app', 'Termin ID'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
             'termin_title' => Yii::t('app', 'Termin Title'),
             'termin_alias' => Yii::t('app', 'Termin Alias'),
         ];
@@ -55,7 +55,7 @@ class TerminLang extends \yii\db\ActiveRecord
      */
     public function getLang()
     {
-        return $this->hasOne(Language::className(), ['language_id' => 'lang_id']);
+        return $this->hasOne(Language::className(), ['language_id' => 'language_id']);
     }
     /**
+<?php
+
+use backend\models\AdminMenu;
+use common\models\Tools;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\AdminMenu */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="admin-menu-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'name')->textInput() ?>
+
+    <?= $form->field($model, 'status')->checkbox() ?>
+
+    <?= $form->field($model, 'hide_min')->checkbox() ?>
+
+    <?= $form->field($model, 'path')->textInput() ?>
+
+    <?= $form->field($model, 'param')->textInput() ?>
+
+    <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+        <div class="panel panel-default">
+            <div class="panel-heading" role="tab" id="headingOne">
+                <h4 class="panel-title">
+                    <a role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+                        <?= Yii::t('app', 'Parent menu item') ?>
+                    </a>
+                </h4>
+            </div>
+            <div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne">
+                <ul class="list-group checkboxer">
+                    <?php
+                    $roots = AdminMenu::buildMenuSelect();
+                    echo $form->field($model, 'admin_menu_pid', ['options' => ['class' => 'form-group list-group-item level0 checkboxer_container', 'tag' => 'li']])->error(false)->radio(['value' => 0, 'uncheck' => null, 'label' => Yii::t('app', 'root'), 'labelOptions' => ['class' => 'checkboxer_label']]);
+                    foreach($roots as $root) {
+                        echo $form->field($model, 'admin_menu_pid', ['options' => ['class' => 'form-group list-group-item level1 checkboxer_container', 'tag' => 'li']])->error(false)->radio(['value' => $root['id'], 'uncheck' => null, 'label' => Yii::t('app', $root['label']), 'labelOptions' => ['class' => 'checkboxer_label']]);
+                        if($root['items']) {
+                            foreach($root['items'] as $submenu) {
+                                echo $form->field($model, 'admin_menu_pid', ['options' => ['class' => 'form-group list-group-item level2 checkboxer_container', 'tag' => 'li']])->error(false)->radio(['value' => $submenu['id'], 'uncheck' => null, 'label' => Yii::t('app', $submenu['label']), 'labelOptions' => ['class' => 'checkboxer_label']]);
+                            }
+                        }
+                    }
+                    ?>
+                </ul>
+            </div>
+        </div>
+    </div>
+
+    <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') . ' btn-flat']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\AdminMenuSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="admin-menu-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id') ?>
+
+    <?= $form->field($model, 'parent_id') ?>
+
+    <?= $form->field($model, 'active') ?>
+
+    <?= $form->field($model, 'hide_min') ?>
+
+    <?= $form->field($model, 'sort') ?>
+
+    <?php // echo $form->field($model, 'name') ?>
+
+    <?php // echo $form->field($model, 'path') ?>
+
+    <?php // echo $form->field($model, 'params') ?>
+
+    <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 backend\models\AdminMenu */
+
+$this->title = Yii::t('app', 'Create Admin Menu');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Admin Menus'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="admin-menu-create">
+    <div class="box box-primary">
+        <div class="box-body">
+            <?= $this->render('_form', [
+                'model' => $model,
+            ]) ?>
+        </div>
+    </div>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel backend\models\AdminMenuSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = Yii::t('app', 'Admin Menus');
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="admin-menu-index box box-primary">
+
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'showFooter' => true,
+        'layout' => "<div class='box-header with-border admin_grid_action'>
+                        <div class='action_link'>"
+                            .Html::a(Yii::t('app', 'Create Admin Menu'), ['create'], ['class' => 'btn btn-success btn-flat']).
+                        "</div>
+                        <div class='pull-right'>
+                            {pager}
+                        </div>
+                    </div>
+                    <div class='box-body no-padding table-responsive'>
+                        {items}
+                    </div>
+                    <div class='box-footer admin_grid_action'>
+                        <div class='action_link'>"
+                            .Html::a(Yii::t('app', 'Create Admin Menu'), ['create'], ['class' => 'btn btn-success btn-flat']).
+                        "</div>
+                        <div class='pull-right'>
+                            {pager}
+                        </div>
+                    </div>",
+        'columns' => [
+            ['class' => 'yii\grid\ActionColumn'],
+            'admin_menu_id',
+            'name',
+            'path',
+            'param',
+            [
+                'format' => 'raw',
+                'filter' => [
+                    '1'=>'Отображаются',
+                    '0'=>'Скрытые',
+                ],
+                'value' => function($data){
+                    if($data->status){
+                        $status_img = '<i style="color: #008000" class="glyphicon glyphicon-ok"></i>';
+                    } else {
+                        $status_img = '<i style="color: red" class="glyphicon glyphicon-remove"></i>';
+                    }
+                    return $status_img;
+                },
+                'attribute'=>'status',
+            ],
+            [
+                'attribute' =>  'parentt',
+                'content' =>
+                    function($model, $key, $index, $column) {
+                    if($model->parent->admin_menu_id) {
+                        return $model->parent->name;
+                    } else {
+                        return '<i class="small">'.Yii::t('app', 'Корневой элемент').'</i>';
+                    }
+                }
+            ],
+            [
+                'format' => 'raw',
+                'filter' => [
+                    '1'=>'Отображаются',
+                    '0'=>'Скрытые',
+                ],
+                'value' => function($data){
+                    if($data->hide_min){
+                        $status_img = '<i style="color: #008000" class="glyphicon glyphicon-ok"></i>';
+                    } else {
+                        $status_img = '<i style="color: red" class="glyphicon glyphicon-remove"></i>';
+                    }
+                    return $status_img;
+                },
+                'attribute'=>'hide_min',
+            ],
+        ],
+    ]); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\AdminMenu */
+
+$this->title = Yii::t('app', 'Update') . ': ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Admin Menus'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->admin_menu_id]];
+$this->params['breadcrumbs'][] = Yii::t('app', 'Update');
+?>
+<div class="admin-menu-update">
+
+    <?= $this->render('_form', [
+        'model' => $model,
+    ]) ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model backend\models\AdminMenu */
+
+$this->title = Yii::t('app', 'Admin Menus').': '.$model->name;
+$this->params['breadcrumbs'][] = ['label' => Yii::t('app', 'Admin Menus'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+
+<div class="admin-menu-view box box-primary">
+<?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'admin_menu_id',
+            'admin_menu_pid',
+            'status',
+            'hide_min',
+            'sort',
+            'name',
+            'path',
+            'param',
+        ],
+    ]) ?>
+
+    <div class="box-footer with-border">
+        <p>
+            <?= Html::a(Yii::t('app', 'Update'), ['update', 'id' => $model->admin_menu_id], ['class' => 'btn btn-primary btn-flat']) ?>
+            <?= Html::a(Yii::t('app', 'Delete'), ['delete', 'id' => $model->admin_menu_id], [
+                'class' => 'btn btn-danger btn-flat',
+                'data' => [
+                    'confirm' => Yii::t('app', 'Are you sure you want to delete this item?'),
+                    'method' => 'post',
+                ],
+            ]) ?>
+            <?= Html::a(Yii::t('app', 'Back'), ['index'], ['class' => 'btn btn-default btn-flat']) ?>
+        </p>
+    </div>
+    
+</div>
 \ No newline at end of file
@@ -21,7 +21,7 @@ echo GridView::widget([
             'class' => Column::className(),
             'header' => Yii::t('app', 'Name'),
             'content' => function($model, $key, $index, $column) {
-                return $model->getArticleLangs()->where(['lang_id' => Language::getDefaultLang()->language_id])->one()->name;
+                return $model->getArticleLangs()->where(['language_id' => Language::getDefaultLang()->language_id])->one()->name;
             }
         ],
         [
@@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
             <?php if($row->hasErrors()) { ?><div class="help-block"><?php echo $modellang[$id][0]->getFirstError('value');?></div> <?php } ?>
         	<?php
             if($row->translate) {
-                foreach($row->getLangs() as $lang_id => $lang) {
+                foreach($row->getLangs() as $language_id => $lang) {
                 ?>
                 <div class="form-group">
                 	<div class="col-xs-1"><?=$lang['lang_code']?></div>
@@ -28,7 +28,7 @@ echo $this-&gt;render(&#39;layout&#39;);
                 }
             ],
             'language_name',
-            'lang_code',
+            'language_code',
             'is_default:boolean',
             [
                 'class' => 'yii\grid\ActionColumn',
@@ -24,7 +24,7 @@ echo $this-&gt;render(&#39;layout&#39;);
             [
                 'class' => 'yii\grid\Column',
                 'content' => function($model, $key, $index, $column) {
-                    return OptionLang::find()->select('value')->where(['lang_id' => 0, 'id' => $model->option_id])->scalar();
+                    return OptionLang::find()->select('value')->where(['language_id' => 0, 'id' => $model->option_id])->scalar();
                 },
                 'header' => Yii::t('app', 'adress_name')
             ],
@@ -23,6 +23,19 @@ $username = Yii::$app-&gt;user-&gt;identity-&gt;firstname.&#39; &#39;.Yii::$app-&gt;user-&gt;identity-&gt;
             <ul class="nav navbar-nav">
+                <!-- search form -->
+                <li class="header-search">
+                    <form action="#" method="get" class="sidebar-form">
+                        <div class="input-group">
+                            <input type="text" name="q" class="form-control" placeholder="Search..."/>
+                        <span class="input-group-btn">
+                          <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i>
+                          </button>
+                        </span>
+                        </div>
+                    </form>
+                </li>
+                <!-- /.search form -->
                 <!-- Messages: style can be found in dropdown.less-->
                 <li class="dropdown messages-menu">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
@@ -14,79 +14,15 @@
             </div>
         </div>
-        <!-- search form -->
-        <form action="#" method="get" class="sidebar-form">
-            <div class="input-group">
-                <input type="text" name="q" class="form-control" placeholder="Search..."/>
-              <span class="input-group-btn">
-                <button type='submit' name='search' id='search-btn' class="btn btn-flat"><i class="fa fa-search"></i>
-                </button>
-              </span>
-            </div>
-        </form>
-        <!-- /.search form -->
-
-        <?= dmstr\widgets\Menu::widget(
-            [
-                'options' => ['class' => 'sidebar-menu'],
-                'items' => [
-                    ['label' => 'Термины', 'icon' => 'fa fa-file-code-o', 'url' => ['/termin/']],
-                    //['label' => Yii::t('app', 'Pages'), 'icon' => 'fa fa-file-code-o', 'url' => ['/page/']],
-                    //['label' => 'Каталог', 'icon' => 'fa fa-file-code-o', 'url' => ['/catalog/']],
-                    ['label' => 'Меню', 'icon' => 'fa fa-file-code-o', 'url' => ['/menu/']],
-        			['label' => 'Заявки', 'icon' => 'fa fa-file-code-o', 'url' => ['/site/requests/']],
-                    ['label' => 'Gii', 'icon' => 'fa fa-file-code-o', 'url' => ['/gii']],
-                    ['label' => 'Debug', 'icon' => 'fa fa-dashboard', 'url' => ['/debug']],
-                    ['label' => 'Login', 'url' => ['site/login'], 'visible' => Yii::$app->user->isGuest],
-                    ['label' => 'Пользователи', 'icon' => 'fa fa-file-code-o', 'url' => ['/user/']],
-                    [
-                        'label' => Yii::t('app', 'Blog'),
-                        'icon' => 'fa fa-share',
-                        'url' => '#',
-                        'items' => [
-                            ['label' => Yii::t('app', 'Static pages'), 'icon' => 'fa fa-file-code-o', 'url' => ['blog/articles', 'category_id' => '63'],],
-                            ['label' => Yii::t('app', 'Categories'), 'icon' => 'fa fa-dashboard', 'url' => ['blog/categories'],],
-                            ['label' => Yii::t('app', 'Articles'), 'icon' => 'fa fa-dashboard', 'url' => ['blog/articles'],],
-                        ],
-                    ],
-                    [
-                        'label' => 'Роли',
-                        'icon' => 'fa fa-share',
-                        'url' => '#',
-                        'items' => [
-                            ['label' => 'Управление ролями', 'icon' => 'fa fa-file-code-o', 'url' => ['/permit/access/role'],],
-                            ['label' => 'Управление правами доступа', 'icon' => 'fa fa-dashboard', 'url' => ['/permit/access/permission'],],
-                        ],
-                    ],
-                    [
-                        'label' => 'Same tools',
-                        'icon' => 'fa fa-share',
-                        'url' => '#',
-                        'items' => [
-                            ['label' => 'Gii', 'icon' => 'fa fa-file-code-o', 'url' => ['/gii'],],
-                            ['label' => 'Debug', 'icon' => 'fa fa-dashboard', 'url' => ['/debug'],],
-                            [
-                                'label' => 'Level One',
-                                'icon' => 'fa fa-circle-o',
-                                'url' => '#',
-                                'items' => [
-                                    ['label' => 'Level Two', 'icon' => 'fa fa-circle-o', 'url' => '#',],
-                                    [
-                                        'label' => 'Level Two',
-                                        'icon' => 'fa fa-circle-o',
-                                        'url' => '#',
-                                        'items' => [
-                                            ['label' => 'Level Three', 'icon' => 'fa fa-circle-o', 'url' => '#',],
-                                            ['label' => 'Level Three', 'icon' => 'fa fa-circle-o', 'url' => '#',],
-                                        ],
-                                    ],
-                                ],
-                            ],
-                        ],
-                    ],
-                ],
-            ]
-        ) ?>
+        <?= dmstr\widgets\Menu::widget([
+            'options' => ['class' => 'sidebar-menu'],
+            'items' => array_merge(
+                \backend\models\AdminMenu::buildMenu(),
+                [
+                    ['label' => Yii::t('app', 'Settings'), 'url' => ['/settings/index'], 'icon' => 'fa fa-gear']
+                ]
+            ),
+        ]) ?>
     </section>
+<?php
+
+use dmstr\widgets\Menu;
+use yii\widgets\Breadcrumbs;
+use yii\helpers\Html;
+
+/* @var $content string */
+$this->beginContent('@app/views/layouts/main.php');
+?>
+    <div class="row">
+        <div class="col-md-3">
+            <div class="box box-solid">
+                <div class="box-header with-border">
+                    <h3 class="box-title"><?=Yii::t('app', 'Settings categories')?></h3>
+                    <div class="box-tools">
+                        <button type="button" class="btn btn-box-tool" data-widget="collapse">
+                            <i class="fa fa-minus"></i>
+                        </button>
+                    </div>
+                </div>
+                <div class="box-body no-padding">
+                    <?php
+                    echo Menu::widget([
+                        'options' => [
+                            'class' => 'nav nav-pills nav-stacked'
+                        ],
+                        'items' => [
+                            ['label' => Yii::t('app', 'Admin Menus'), 'url' => ['/admin-menu/index'], 'icon' => 'fa fa-navicon'],
+                            ['label' => Yii::t('app', 'Next menu item'), 'url' => ['#'], 'icon' => 'fa fa-arrow-circle-o-right'],
+                        ],
+                    ]);
+                    ?>
+                </div>
+            </div>
+        </div>
+        <div class="col-md-9">
+            <?= $content ?>
+        </div>
+    </div>
+<?php $this->endContent() ?>
 \ No newline at end of file
@@ -28,8 +28,9 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
 /*
             [
                 'attribute' => Yii::t('app', 'termin'),
-                'value' => function ($model) {
-                    return empty($model->termin_id) ? '-' : $model->termin_lang->termin_title;
+                'value' => function ($model) 
+                { 
+                    return empty ($model->termin_id) ? '-' : $model->terminLang->termin_title;
                 },
             ],
             */
@@ -14,7 +14,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'id')->textInput() ?>
-    <?= $form->field($model, 'lang_id')->textInput() ?>
+    <?= $form->field($model, 'language_id')->textInput() ?>
     <?= $form->field($model, 'value')->textarea(['rows' => 6]) ?>
@@ -19,7 +19,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'id') ?>
-    <?= $form->field($model, 'lang_id') ?>
+    <?= $form->field($model, 'language_id') ?>
     <?= $form->field($model, 'value') ?>
@@ -27,7 +27,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'primary',
             'id',
-            'lang_id',
+            'language_id',
             'value:ntext',
             ['class' => 'yii\grid\ActionColumn'],
@@ -30,7 +30,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
         'attributes' => [
             'primary',
             'id',
-            'lang_id',
+            'language_id',
             'value:ntext',
         ],
     ]) ?>
@@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
             <?php if($row->hasErrors()) { ?><div class="help-block"><?php echo $modellang[$id][0]->getFirstError('value');?></div> <?php } ?>
         	<?php
             if($row->translate) {
-                foreach($row->getLangs() as $lang_id => $lang) {
+                foreach($row->getLangs() as $language_id => $lang) {
                 ?>
                 <div class="form-group">
                 	<div class="col-xs-1"><?=$lang['lang_code']?></div>
+<?php
+
+/* @var $this yii\web\View */
+
+use backend\models\AdminMenu;
+use dmstr\widgets\Menu;
+use yii\helpers\Url;
+
+$this->title = Yii::t('app', 'Settings');
+$this->params['breadcrumbs'][] = $this->title;
+?>
@@ -2,6 +2,9 @@
 /* @var $this yii\web\View */
+use backend\models\AdminMenu;
+use yii\helpers\Url;
+
 $this->title = 'My Yii Application';
 ?>
 <div class="site-index">
@@ -5,34 +5,21 @@ use yii\widgets\ActiveForm;
 use backend\models\Termin;
 use kartik\select2\Select2;
 use yii\helpers\ArrayHelper;
-use common\widgets\Multilang;
-use yii\helpers\Url;
 /* @var $this yii\web\View */
 /* @var $model backend\models\Termin */
 /* @var $form yii\widgets\ActiveForm */
-echo '<div class="termin-form">';
+?>
-$form = ActiveForm::begin();
+<div class="termin-form">
-    // ================
-    // ==== COMMON ====
-    // ================
-
-   echo $form->field($model_pid, 'termin_pid')->widget(
-        Select2::classname(), 
+    <?php $form = ActiveForm::begin(); ?>
+ 
+	<?= $form->field($model_pid->termin, 'termin_pid')->widget(Select2::classname(), 
         [
-            'data' => ArrayHelper::map(
-                [
-                    [
-                        'termin_id' => 0,
-                        'termin_title' => 'NONE',
-                    ]
-                ] +
-                (new Termin)->finInfo([  
+            'data' => ArrayHelper::map((new Termin)->finInfo([  
                     'show_all' => true, 
-                    'to_array' => true,
             	]),
 	           'termin_id',
 	           'termin_title'
@@ -41,53 +28,23 @@ $form = ActiveForm::begin();
             'pluginOptions' => [
                 'allowClear' => true
             ],
-        ]
-    ); 
+        ]); 
+    ?>
-    echo $form->field($model, 'termin_name')->textInput(['maxlength' => true]);
-    
-    // ==============
-    // ==== LANG ====
-    // ==============
-
-    $multilang = Multilang::begin(['ajaxpath' => Url::to(['termin/form']), 'form' => $form, 'data_langs' => $model_lang]);
-
-        $first = 1;
-        
-        foreach ($model_lang as $index => $data) 
-        {
-            echo '
-            <div role="" class="tab-pane '.($first ? 'active main-tab' : '') .'" id="'.$multilang->id.'-'.$index.'">
-
-                '.$form->field($model_lang[$index], '['.$index.']lang_id')->label(false)->hiddenInput(['value' => $index]).'
-                        
-                '.$form->field($model_lang[$index], '['.$index.']termin_title')->textInput().'
-                        
-                '.$form->field($model_lang[$index], '['.$index.']termin_alias')->textInput().'
+    <?= $form->field($model, 'termin_name')->textInput(['maxlength' => true]) ?> 
+  
+	<?= $form->field($model_lang, 'termin_title')->textInput() ?>
+ 
+	<?= $form->field($model_lang, 'termin_alias')->textInput() ?>
+ 
+ 	<?= Html::activeHiddenInput ($model_lang, 'language_id', [
+ 	    'value' => ($model_lang->language_id != 0 ? $model_lang->language_id : Yii::$app->params['language_id']),
+ 	]) ?>
-            </div>';
-
-            $first = 0;
-        }
-
-    $multilang->end();
-/*
- 	echo Html::activeHiddenInput ($model_lang, 'lang_id', [
- 	    'value' => ($model_lang->lang_id != 0 ? $model_lang->lang_id : Yii::$app->params['lang_id']),
- 	]);
-*/	
- 	// ==== BUTTON ====
-
- 	echo '
     <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>';
-
-ActiveForm::end();
+        <?= Html::submitButton($model->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
-echo '</div>';
+    <?php ActiveForm::end(); ?>
-echo '
-<script>
-    var confirm_message = "'.\Yii::t('app', 'Remove image?').'"
-</script>';
+</div>
@@ -89,3 +89,47 @@ a.desc:after {
     padding: 10px 20px;
     margin: 0 0 15px 0;
 }
+.header-search {
+    width: 200px;
+}
+.skin-blue .sidebar-form {
+    margin: 5px !important;
+}
+.checkboxer .list-group-item {
+    padding: 0;
+}
+.checkboxer .list-group-item:hover {
+    background: #ddd;
+}
+.checkboxer .list-group-item.active, .checkboxer .list-group-item.active:hover {
+    background: #00a65a;
+}
+.checkboxer .list-group-item.active label, .checkboxer .list-group-item.active:hover label {
+    color: white;
+}
+.checkboxer .list-group-item.level0 {
+    padding-left: 15px;
+}
+.checkboxer .list-group-item.level1 {
+    padding-left: 45px;
+}
+.checkboxer .list-group-item.level2 {
+    padding-left: 75px;
+}
+.checkboxer .checkboxer_label {
+    padding: 10px 0;
+    display: block;
+}
+.checkboxer .checkboxer_label input[type=radio] {
+    position: absolute;
+    clip: rect(0,0,0,0);
+}
+.action_link {
+    float: left;
+}
+.admin_grid_action {
+    padding: 0 20px;
+}
+.admin_grid_action .pagination {
+    margin: 0;
+}
@@ -12,6 +12,11 @@ function readURL(input) {
 	}
 	return urls;
 }
+function checkboxerInit() {
+    $.each($('.checkboxer input[type=radio]:checked'), function(index, value) {
+        $(value).trigger('change');
+    });
+}
 $(function() {
     var counter = 0;
     $(document).on('click', '.add_row', function() {
@@ -58,12 +63,36 @@ $(function() {
             $(value).find('li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>');
         }
     });
-    $(document).on('click', '.dropdown-menu.f32 li a[data-lang]', function() {
+    $(document).on('click', '.dropdown-menu.f32:not(.old) li a[data-lang]', function() {
         var lang = $(this).data('lang');
         var flag = $(this).find('span').first().clone();
         var el = $(this);
         var id = $(this).attr('href').substr(1);
-        $.get(form[id], { lang_id: lang, widget_id: id }, function(data) {
+        var path = form[id].handler;
+        var view = form[id].view;
+        var model = form[id].model;
+        $.get(path, { language_id: lang, widget_id: id, ajaxView: view, model: model }, function(data) {
+            $('#'+id+'-tabs li').removeClass('active');
+            $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
+            $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
+            $('#tab-content-'+id).append($(data).find('.ajax-loaded').first());
+            $('body').append($(data).filter('script'));
+            $(el).parent().remove();
+            if(!$('#lang-'+id+' li').length) {
+                $('#'+id+'Lang').addClass('disabled');
+            }
+            if($('#'+id+'-tabs li').length > 1) {
+                $('#'+id+'-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
+            }
+        });
+    });
+    $(document).on('click', '.dropdown-menu.f32.old li a[data-lang]', function(e) {
+        e.preventDefault();
+        var lang = $(this).data('lang');
+        var flag = $(this).find('span').first().clone();
+        var el = $(this);
+        var id = $(this).attr('href').substr(1);
+        $.get(form[id], { language_id: lang, widget_id: id }, function(data) {
             $('#'+id+'-tabs li').removeClass('active');
             $('#'+id+'-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#'+id+'-'+lang+'" aria-controls="'+id+'-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
             $('#tab-content-'+id+' .tab-pane.active').removeClass('active');
@@ -93,4 +122,12 @@ $(function() {
             $('#'+id+'-tabs>li').first().find('a').tab('show');
         }
     });
+    $(document).on('change', '.checkboxer .checkboxer_label input[type=radio]', function() {
+        $(this).parents('.checkboxer').find('.checkboxer_container').removeClass('active');
+        $(this).parents('.checkboxer_container').addClass('active');
+    });
+    $.each($('.f32'), function(i, val) {
+        $(val).find('a[role=tab]').first().trigger('click');
+    });
+    checkboxerInit();
 });
 \ No newline at end of file
@@ -3,6 +3,7 @@
 namespace common\components;
 use Yii;
+use yii\base\InvalidConfigException;
 use yii\web\Request;
 use common\models\Language;
 use common\models\Page;
@@ -29,10 +30,10 @@ class LangRequest extends Request
 	    	Language::setCurrent($lang_url);
-            if ($lang_url !== null && $lang_url === Language::getCurrent()->lang_code 
-                && strpos($this->_lang_url, Language::getCurrent()->lang_code) === 1)
+            if ($lang_url !== null && $lang_url === Language::getCurrent()->language_code
+                && strpos($this->_lang_url, Language::getCurrent()->language_code) === 1)
             {
-                $this->_lang_url = substr ($this->_lang_url, strlen (Language::getCurrent()->lang_code) + 1);
+                $this->_lang_url = substr ($this->_lang_url, strlen (Language::getCurrent()->language_code) + 1);
             }
         }
@@ -9,16 +9,16 @@ class LangUrlManager extends UrlManager
 {
     public function createUrl ($params)
     {
-        if (isset ($params['lang_id']))
+        if (isset ($params['language_id']))
         {
             //Если указан идентификатор языка, то делаем попытку найти язык в БД,
             //иначе работаем с языком по умолчанию 
-            if (($lang_code = Language::findOne($params['lang_id'])) === null)
+            if (($lang_code = Language::findOne($params['language_id'])) === null)
             {
                 $lang_code = Language::getDefaultLang();
             }
-            unset ($params['lang_id']);
+            unset ($params['language_id']);
         } 
         else 
@@ -8,6 +8,9 @@ return [
                 'userClass' => 'common\models\User'
             ]
         ],
+        'blog' => [
+            'class' => 'common\modules\blog\Module',
+        ],
     ],
     'components' => [
         'cache' => [
@@ -23,21 +23,21 @@ class Catalog extends Model
                 termin_lang.termin_title 
             FROM termin_structure  
                 INNER JOIN termin_lang ON termin_lang.termin_id = termin_structure.termin_id
-                    AND termin_lang.lang_id = '.Yii::$app->params['lang_id'].' 
+                    AND termin_lang.language_id = '.Yii::$app->params['language_id'].' 
             ORDER BY termin_structure.termin_id ASC, termin_structure.termin_pid ASC
         ')->queryAll();
     }
     /**
      * Выполняет поиск по параметрам
-     * @param array $param принимает [catalog_id, lang_id, return_one, return_field, show_all]
+     * @param array $param принимает [catalog_id, language_id, return_one, return_field, show_all]
      * @return array one | array all | string значение масива
      */
     public function finInfo (array $params = [])
     {
         Tools::ifNotExist ($params, array (
             'catalog_id' => false,
-            'lang_id' => false,
+            'language_id' => false,
             'return_one' => false,
             'return_field' => false,
             'show_all' => false,
@@ -57,9 +57,9 @@ class Catalog extends Model
             $WHERE['catalog.catalog_id'] = $params['catalog_id'];
         }
-        if ($params['lang_id'])
+        if ($params['language_id'])
         {
-            $WHERE['catalog_i18n.lang_id'] = $params['lang_id'];
+            $WHERE['catalog_i18n.language_id'] = $params['language_id'];
         }
         if (! empty ($WHERE))
@@ -144,7 +144,7 @@ class Catalog extends Model
      */
     public function getRelationCatalogLangPlus()
     {
-        return $this->getRelationCatalogLang()->where(['lang_id' => yii::$app->params['lang_id']]);
+        return $this->getRelationCatalogLang()->where(['language_id' => yii::$app->params['language_id']]);
     }
     /**
@@ -8,7 +8,11 @@ use Yii;
  * This is the model class for table "language".
  *
  * @property integer $language_id
- * @property string $lang_code
+ * @property string $language_code
+ * @property string $is_default
+ * @property string $language_name
+ * @property string $status
+ * @property string $country_code
  */
 class Language extends \yii\db\ActiveRecord
 {
@@ -32,8 +36,8 @@ class Language extends \yii\db\ActiveRecord
         $language = self::getLangByUrl($lang_code);
         self::$current = ($language === null) ? self::getDefaultLang() : $language;
         // задаем
-        Yii::$app->language = self::$current->lang_code;
-        Yii::$app->params['lang_id'] = self::$current->language_id;
+        Yii::$app->language = self::$current->language_code;
+        Yii::$app->params['language_id'] = self::$current->language_id;
     }
     //Получения объекта языка по умолчанию
@@ -48,7 +52,7 @@ class Language extends \yii\db\ActiveRecord
         if ($lang_code === null) {
             return null;
         } else {
-            $language = Language::find()->where('lang_code = :what', [':what' => $lang_code])->one();
+            $language = Language::find()->where('language_code = :what', [':what' => $lang_code])->one();
             return $language === null ? null : $language;
         }
     }
@@ -67,8 +71,8 @@ class Language extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['lang_code'], 'required'],
-            [['lang_code'], 'string', 'max' => 4]
+            [['language_code', 'language_name', 'country_code'], 'required'],
+            [['language_code', 'country_code'], 'string', 'max' => 4]
         ];
     }
@@ -79,13 +83,17 @@ class Language extends \yii\db\ActiveRecord
     {
         return [
             'language_id' => Yii::t('app/Lang', 'Language ID'),
-            'lang_code' => Yii::t('app/Lang', 'Lang Code'),
+            'language_code' => Yii::t('app/Lang', 'Lang Code'),
+            'is_default' => Yii::t('app/Lang', 'Default lang'),
+            'language_name' => Yii::t('app/Lang', 'Language Name'),
+            'status' => Yii::t('app/Lang', 'Language Status'),
+            'country_code' => Yii::t('app/Lang', 'Country Code'),
         ];
     }
     public static function getActiveLanguages()
     {
-        return Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1])->orderBy('is_default DESC')->indexBy('language_id')->all();
+        return Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1])->orderBy('is_default DESC')->indexBy('language_id')->all();
     }
 }
@@ -12,8 +12,9 @@ use yii\web\UploadedFile;
 /**
  * This is the model class for table "media".
  *
- * @property integer $id
+ * @property integer $media_id
  * @property string $hash
+ * @property string $extension
  *
  * @property ArticleCategoryMedia[] $articleCategoryMedia
  * @property ArticleMedia[] $articleMedia
@@ -39,8 +40,8 @@ class Media extends ActiveRecord
     public function rules()
     {
         return [
-            [['id'], 'integer'],
-            [['hash'], 'string'],
+            [['media_id'], 'integer'],
+            [['hash', 'extension'], 'string'],
             [['imageFile'], 'file', 'extensions' => 'png, gif, jpeg, jpg', 'skipOnEmpty' => true],
         ];
     }
@@ -51,8 +52,9 @@ class Media extends ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('app', 'ID'),
+            'media_id' => Yii::t('app', 'ID'),
             'hash' => Yii::t('app', 'Hash'),
+            'extension' => Yii::t('app', 'Extension'),
         ];
     }
@@ -61,7 +63,7 @@ class Media extends ActiveRecord
      */
     public function getArticleCategoryMedia()
     {
-        return $this->hasMany(ArticleCategoryMedia::className(), ['media_id' => 'id']);
+        return $this->hasMany(ArticleCategoryMedia::className(), ['media_id' => 'media_id']);
     }
     /**
@@ -69,12 +71,12 @@ class Media extends ActiveRecord
      */
     public function getArticleMedia()
     {
-        return $this->hasMany(ArticleMedia::className(), ['media_id' => 'id']);
+        return $this->hasMany(ArticleMedia::className(), ['media_id' => 'media_id']);
     }
     public function getArticle()
     {
-        return $this->hasMany(Article::className(), ['id' => 'article_id'])->via('articleMedia');
+        return $this->hasMany(Article::className(), ['article_id' => 'article_id'])->via('articleMedia');
     }
     public function upload()
@@ -98,4 +98,19 @@ class Tools
         return $url;
     }
+
+    static function parseUrlParams($params)
+    {
+        $params = preg_split('/,\s*/', $params, -1, PREG_SPLIT_NO_EMPTY);
+        $result = [];
+        if($params) {
+            foreach($params as $param) {
+                $param = preg_split('/\s*=\s*/', $param);
+                if(!empty($param[0]) && !empty($param[1])) {
+                    $result[$param[0]] = $param[1];
+                }
+            }
+        }
+        return $result;
+    }
 }
 \ No newline at end of file
@@ -7,6 +7,7 @@ use common\modules\blog\models\ArticleCategoryLang;
 use common\modules\blog\models\ArticleCategoryMedia;
 use common\modules\blog\models\ArticleLang;
 use common\modules\blog\models\ArticleMedia;
+use yii\base\InvalidParamException;
 use yii\web\Controller;
 use yii\web\ForbiddenHttpException;
 use yii\web\NotFoundHttpException;
@@ -26,9 +27,9 @@ class AjaxController extends Controller
         return true;
     }
-    public function actionCategoryForm($lang_id, $widget_id)
+    public function actionCategoryForm($language_id, $widget_id)
     {
-        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1, 'language_id' => $lang_id])->one();
+        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $language_id])->one();
         if(!$model) {
             throw new NotFoundHttpException('Language not found');
         }
@@ -36,9 +37,9 @@ class AjaxController extends Controller
         return $this->renderAjax('_category_form', ['model' => $model, 'category_lang' => $category_lang, 'widget_id' => $widget_id]);
     }
-    public function actionArticleForm($lang_id, $widget_id)
+    public function actionArticleForm($language_id, $widget_id)
     {
-        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1, 'language_id' => $lang_id])->one();
+        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $language_id])->one();
         if(!$model) {
             throw new NotFoundHttpException('Language not found');
         }
@@ -46,6 +47,32 @@ class AjaxController extends Controller
         return $this->renderAjax('_article_form', ['model' => $model, 'article_lang' => $article_lang, 'widget_id' => $widget_id]);
     }
+    public function actionArticleMediaForm($language_id, $widget_id, $type)
+    {
+        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $language_id])->one();
+        if(!$model) {
+            throw new NotFoundHttpException('Language not found');
+        }
+        if(!in_array($type, ['full', 'preview'])) {
+            throw new InvalidParamException('Type must only be full/preview');
+        }
+        $article_lang = new ArticleMedia();
+        return $this->renderAjax('_article_media_form', ['model' => $model, 'article_lang' => $article_lang, 'widget_id' => $widget_id, 'type' => $type]);
+    }
+
+    public function actionArticleCategoryMediaForm($language_id, $widget_id, $type)
+    {
+        $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['status' => 1, 'language_id' => $language_id])->one();
+        if(!$model) {
+            throw new NotFoundHttpException('Language not found');
+        }
+        if(!in_array($type, ['full', 'preview'])) {
+            throw new InvalidParamException('Type must only be full/preview');
+        }
+        $article_lang = new ArticleCategoryMedia();
+        return $this->renderAjax('_article_media_form', ['model' => $model, 'article_lang' => $article_lang, 'widget_id' => $widget_id, 'type' => $type]);
+    }
+
     public function actionRemoveImage()
     {
         $post = \Yii::$app->request->post();
@@ -63,6 +90,23 @@ class AjaxController extends Controller
         }
     }
+    public function actionRemoveCategoryImage()
+    {
+        $post = \Yii::$app->request->post();
+        if(!empty($post['category_media_id'])) {
+            $category_media = ArticleCategoryMedia::findOne($post['category_media_id']);
+            if($post['remove_media']) {
+                $media = $category_media->media->delete();
+            }
+            if(!empty($category_media)) {
+                $category_media->delete();
+            }
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public function actionRemoveImageCategory()
     {
         $post = \Yii::$app->request->post();
@@ -79,4 +123,10 @@ class AjaxController extends Controller
             return false;
         }
     }
+
+    public function actionMultilangForm($model, $ajaxView, $widget_id, $language_id = NULL)
+    {
+        $model = new $model(['language_id' => $language_id]);
+        return $this->renderAjax($ajaxView, ['model' => $model, 'widget_id' => $widget_id]);
+    }
 }
@@ -28,28 +28,31 @@ class ArticleController extends Controller
     {
         $article_langs = array();
         $article = new Article();
+        $default_lang = Language::getDefaultLang();
         $images = array();
-        $images['full'] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_FULL]);
-        $images['preview'] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_PREVIEW]);
-        $images['additional'] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_ADDITIONAL]);
+        $images[$default_lang->language_id]['full'] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_FULL]);
+        $images[$default_lang->language_id]['preview'] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_PREVIEW]);
+        $images[0]['additional'] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_ADDITIONAL]);
         $article->loadDefaultValues();
         $langs = Language::getActiveLanguages();
-        $default_lang = Language::getDefaultLang();
         $isValid = false;
         if(!empty(\Yii::$app->request->post())) {
             $isValid = true;
             $article->load(\Yii::$app->request->post());
-            $article->author = \Yii::$app->user->getId();
+            $article->user_id = \Yii::$app->user->getId();
             $isValid = $article->validate();
-            foreach($images as $index => $value) {
-                $images[$index]->type = $index;
-                if($index == 'additional') {
-                    $images[$index]->imageFile = UploadedFile::getInstances($images[$index], "[{$index}]imageFile");
-                } else {
-                    $images[$index]->imageFile = UploadedFile::getInstance($images[$index], "[{$index}]imageFile");
+            foreach(\Yii::$app->request->post()['ArticleMedia'] as $lang => $value) {
+                foreach($value as $type => $fields) {
+                    $images[$lang][$type] = new ArticleMedia(['scenario' => $type]);
+                    $images[$lang][$type]->type = $type;
+                    $images[$lang][$type]->language_id = $lang;
+                    $images[$lang][$type]->imageFile = UploadedFile::getInstance($images[$lang][$type], "[{$lang}][{$type}]imageFile");
+                    $isValid = $images[$lang][$type]->validate(['imageFile']) && $isValid;
                 }
-                $isValid = $images[$index]->validate(['imageFile']) && $isValid;
             }
+            $images[0]['additional']->language_id = 0;
+            $images[0]['additional']->type = 'additional';
+            $images[0]['additional']->imageFile = UploadedFile::getInstances($images[0]['additional'], "[0][additional]imageFile");
             if(empty(\Yii::$app->request->post()['ArticleLang'])) {
                 $article_langs[$default_lang->language_id] = new ArticleLang();
                 $isValid  = ArticleLang::validateMultiple($article_langs) && $isValid;
@@ -69,18 +72,30 @@ class ArticleController extends Controller
             if(!empty($article_categories)) {
                 foreach($article_categories as $article_category) {
                     $articletocategory[$article_category] = new ArticleToCategory();
-                    $articletocategory[$article_category]->category_id = $article_category;
+                    $articletocategory[$article_category]->article_category_id = $article_category;
                     $articletocategory[$article_category]->link('article', $article);
                 }
             }
             $first = 1;
-            foreach($images as $index => $image) {
-                $images[$index]->upload($article->id);
+            foreach($images as $lang => $value) {
+                foreach($value as $type => $fields) {
+                    $images[$lang][$type]->upload($article->article_id);
+                    if($first && $type != 'additional') {
+                        $media_clone = clone $images[$lang][$type];
+                        $media_clone->setIsNewRecord(true);
+                        unset($media_clone->article_media_id);
+                        $media_clone->language_id = 0;
+                        $media_clone->upload($article->article_id);
+                        unset($media_clone);
+                        $first = 0;
+                    }
+                }
             }
+            $first = 1;
             foreach($article_langs as $article_lang) {
                 if($first) {
                     $article_lang_clone = clone $article_lang;
-                    $article_lang_clone->lang_id = 0;
+                    $article_lang_clone->language_id = 0;
                     $article_lang_clone->link('article', $article);
                     unset($article_lang_clone);
                 }
@@ -102,49 +117,52 @@ class ArticleController extends Controller
     public function actionUpdate($id)
     {
         $article = Article::findOne($id);
-        $images = $article->getArticleMedia()->indexBy('type')->all();
-        if(!array_key_exists('full', $images)) {
-            $images['full'] = new ArticleMedia();
-        }
-        if(!array_key_exists('preview', $images)) {
-            $images['preview'] = new ArticleMedia();
-        }
-        foreach($images as $index => $image) {
-            $images[$index]->scenario = $index;
+        $imagestack = $article->getArticleMedia()->all();
+        $images = [];
+        $images[0]['additional'][0] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_ADDITIONAL]);
+        $images[0]['additional'][0]->type = 'additional';
+        $images[0]['additional'][0]->language_id = 0;
+        foreach($imagestack as $image) {
+            if(in_array($image->type, ['full', 'preview'])) {
+                $images[$image->language_id][$image->type] = $image;
+                $images[$image->language_id][$image->type]->scenario = $image->type;
+            } else {
+                $images[$image->language_id][$image->type][$image->article_media_id] = $image;
+                $images[$image->language_id][$image->type][$image->article_media_id]->scenario = $image->type;
+            }
         }
-        $images['additional'] = array(
-            0 => new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_ADDITIONAL])
-        );
-        $images['additional'] = array_merge($images['additional'], $article->getArticleMedia()->andWhere(['type' => 'additional'])->indexBy('id')->all());
-        foreach($images['additional'] as $index => $image) {
-            $images['additional'][$index]->scenario = 'additional';
+        foreach($images as $lang => $value) {
+            $images[$lang]['additional'][0] = new ArticleMedia(['scenario' => ArticleMedia::SCENARIO_ADDITIONAL]);
         }
-        $article_langs = $article->getArticleLangs()->where(['>=', 'lang_id', '1'])->indexBy('lang_id')->all();
+        $article_langs = $article->getArticleLangs()->where(['>=', 'language_id', '1'])->indexBy('language_id')->all();
         $langs = Language::getActiveLanguages();
         $default_lang = Language::getDefaultLang();
         $isValid = false;
         if(!empty(\Yii::$app->request->post())) {
             $isValid = true;
             $article->load(\Yii::$app->request->post());
-            ArticleToCategory::deleteAll(['article_id' => $article->id]);
+            ArticleToCategory::deleteAll(['article_id' => $article->article_id]);
             $article_categories = \Yii::$app->request->post('Article')['articleCategoriesArray'];
             if(!empty($article_categories)) {
                 foreach($article_categories as $article_category) {
                     $articletocategory[$article_category] = new ArticleToCategory();
-                    $articletocategory[$article_category]->category_id = $article_category;
+                    $articletocategory[$article_category]->article_category_id = $article_category;
                     $articletocategory[$article_category]->link('article', $article);
                 }
             }
             $isValid = $article->validate();
-            foreach($images as $index => $value) {
-                if($index == 'additional') {
-                    $images[$index][0]->type = $index;
-                    $images[$index][0]->imageFile = UploadedFile::getInstances($images[$index][0], "[{$index}]imageFile");
-                    $isValid = $images[$index][0]->validate(['imageFile']) && $isValid;
-                } else {
-                    $images[$index]->type = $index;
-                    $images[$index]->imageFile = UploadedFile::getInstance($images[$index], "[{$index}]imageFile");
-                    $isValid = $images[$index]->validate(['imageFile']) && $isValid;
+            $images[0]['additional'][0]->type = 'additional';
+            $images[0]['additional'][0]->language_id = 0;
+            $images[0]['additional'][0]->imageFile = UploadedFile::getInstances($images[0]['additional'][0], "[0][additional]imageFile");
+            $isValid = $images[0]['additional'][0]->validate(['imageFile']) && $isValid;
+            foreach(\Yii::$app->request->post()['ArticleMedia'] as $lang => $value) {
+                foreach($value as $type => $fields) {
+                    if(!in_array($type, ['full', 'preview'])) continue;
+                    $images[$lang][$type] = new ArticleMedia(['scenario' => $type]);
+                    $images[$lang][$type]->language_id = $lang;
+                    $images[$lang][$type]->type = $type;
+                    $images[$lang][$type]->imageFile = UploadedFile::getInstance($images[$lang][$type], "[{$lang}][{$type}]imageFile");
+                    $isValid = $images[$lang][$type]->validate(['imageFile']) && $isValid;
                 }
             }
             if(empty(\Yii::$app->request->post()['ArticleLang'])) {
@@ -153,7 +171,7 @@ class ArticleController extends Controller
                 foreach(\Yii::$app->request->post()['ArticleLang'] as $index => $article_lang) {
                     if (!array_key_exists($index, $article_langs)) {
                         $article_langs[$index] = new ArticleLang();
-                        $article_langs[$index]->article_id = $article->id;
+                        $article_langs[$index]->article_id = $article->article_id;
                     }
                 }
                 ArticleLang::loadMultiple($article_langs, \Yii::$app->request->post());
@@ -162,12 +180,14 @@ class ArticleController extends Controller
         }
         if($isValid) {
             $article->save(false);
-            foreach($images as $index => $image) {
-                if($index == 'additional') {
-                    $images[$index][0]->upload($article->id);
-                } else {
-                    if(!empty($images[$index]->imageFile)) {
-                        $images[$index]->replace($article->id, true);
+            foreach($images as $lang => $value) {
+                foreach($value as $type => $fields) {
+                    if($type == 'additional') {
+                        $images[$lang][$type][0]->upload($article->id);
+                    } else {
+                        if(!empty($images[$lang][$type]->imageFile)) {
+                            $images[$lang][$type]->replace($article->article_id);
+                        }
                     }
                 }
             }
@@ -42,27 +42,30 @@ class CategoryController extends Controller
     {
         $category_langs = array();
         $category = new ArticleCategory();
+        $default_lang = Language::getDefaultLang();
         $images = array();
-        $images['full'] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_FULL]);
-        $images['preview'] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_PREVIEW]);
-        $images['additional'] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_ADDITIONAL]);
+        $images[$default_lang->language_id]['full'] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_FULL]);
+        $images[$default_lang->language_id]['preview'] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_PREVIEW]);
+        $images[0]['additional'] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_ADDITIONAL]);
         $category->loadDefaultValues();
         $langs = Language::getActiveLanguages();
-        $default_lang = Language::getDefaultLang();
         $isValid = false;
-        foreach($images as $index => $value) {
-            $images[$index]->type = $index;
-            if($index == 'additional') {
-                $images[$index]->imageFile = UploadedFile::getInstances($images[$index], "[{$index}]imageFile");
-            } else {
-                $images[$index]->imageFile = UploadedFile::getInstance($images[$index], "[{$index}]imageFile");
-            }
-            $isValid = $images[$index]->validate(['imageFile']) && $isValid;
-        }
         if(!empty(\Yii::$app->request->post())) {
             $isValid = true;
             $category->load(\Yii::$app->request->post());
             $isValid = $category->validate();
+            foreach(\Yii::$app->request->post()['ArticleCategoryMedia'] as $lang => $value) {
+                foreach($value as $type => $fields) {
+                    $images[$lang][$type] = new ArticleCategoryMedia(['scenario' => $type]);
+                    $images[$lang][$type]->type = $type;
+                    $images[$lang][$type]->language_id = $lang;
+                    $images[$lang][$type]->imageFile = UploadedFile::getInstance($images[$lang][$type], "[{$lang}][{$type}]imageFile");
+                    $isValid = $images[$lang][$type]->validate(['imageFile']) && $isValid;
+                }
+            }
+            $images[0]['additional']->language_id = 0;
+            $images[0]['additional']->type = 'additional';
+            $images[0]['additional']->imageFile = UploadedFile::getInstances($images[0]['additional'], "[0][additional]imageFile");
             if(empty(\Yii::$app->request->post()['ArticleCategoryLang'])) {
                 $category_langs[$default_lang->language_id] = new ArticleCategoryLang();
                 $isValid  = ArticleCategoryLang::validateMultiple($category_langs) && $isValid;
@@ -79,13 +82,25 @@ class CategoryController extends Controller
         if($isValid) {
             $category->save(false);
             $first = 1;
-            foreach($images as $index => $image) {
-                $images[$index]->upload($category->id);
+            foreach($images as $lang => $value) {
+                foreach($value as $type => $fields) {
+                    $images[$lang][$type]->upload($category->article_category_id);
+                    if($first && $type != 'additional') {
+                        $media_clone = clone $images[$lang][$type];
+                        $media_clone->setIsNewRecord(true);
+                        unset($media_clone->article_category_media_id);
+                        $media_clone->language_id = 0;
+                        $media_clone->upload($category->article_category_id);
+                        unset($media_clone);
+                        $first = 0;
+                    }
+                }
             }
+            $first = 1;
             foreach($category_langs as $category_lang) {
                 if($first) {
                     $category_lang_clone = clone $category_lang;
-                    $category_lang_clone->lang_id = 0;
+                    $category_lang_clone->language_id = 0;
                     $category_lang_clone->link('category', $category);
                     unset($category_lang_clone);
                 }
@@ -107,24 +122,24 @@ class CategoryController extends Controller
     public function actionUpdate($id)
     {
         $category = ArticleCategory::findOne($id);
-        $images = $category->getArticleCategoryMedia()->indexBy('type')->all();
-        if(!array_key_exists('full', $images)) {
-            $images['full'] = new ArticleCategoryMedia();
-        }
-        if(!array_key_exists('preview', $images)) {
-            $images['preview'] = new ArticleCategoryMedia();
-        }
-        foreach($images as $index => $image) {
-            $images[$index]->scenario = $index;
+        $imagestack = $category->getArticleCategoryMedia()->all();
+        $images = [];
+        $images[0]['additional'][0] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_ADDITIONAL]);
+        $images[0]['additional'][0]->type = 'additional';
+        $images[0]['additional'][0]->language_id = 0;
+        foreach($imagestack as $image) {
+            if(in_array($image->type, ['full', 'preview'])) {
+                $images[$image->language_id][$image->type] = $image;
+                $images[$image->language_id][$image->type]->scenario = $image->type;
+            } else {
+                $images[$image->language_id][$image->type][$image->article_category_media_id] = $image;
+                $images[$image->language_id][$image->type][$image->article_category_media_id]->scenario = $image->type;
+            }
         }
-        $images['additional'] = array(
-            0 => new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_ADDITIONAL])
-        );
-        $images['additional'] = array_merge($images['additional'], $category->getArticleCategoryMedia()->andWhere(['type' => 'additional'])->indexBy('id')->all());
-        foreach($images['additional'] as $index => $image) {
-            $images['additional'][$index]->scenario = 'additional';
+        foreach($images as $lang => $value) {
+            $images[$lang]['additional'][0] = new ArticleCategoryMedia(['scenario' => ArticleCategoryMedia::SCENARIO_ADDITIONAL]);
         }
-        $category_langs = $category->getArticleCategoryLangs()->where(['>=', 'lang_id', '1'])->indexBy('lang_id')->all();
+        $category_langs = $category->getArticleCategoryLangs()->where(['>=', 'language_id', '1'])->indexBy('language_id')->all();
         $langs = Language::getActiveLanguages();
         $default_lang = Language::getDefaultLang();
         $isValid = false;
@@ -132,15 +147,18 @@ class CategoryController extends Controller
             $isValid = true;
             $category->load(\Yii::$app->request->post());
             $isValid = $category->validate();
-            foreach($images as $index => $value) {
-                if($index == 'additional') {
-                    $images[$index][0]->type = $index;
-                    $images[$index][0]->imageFile = UploadedFile::getInstances($images[$index][0], "[{$index}]imageFile");
-                    $isValid = $images[$index][0]->validate(['imageFile']) && $isValid;
-                } else {
-                    $images[$index]->type = $index;
-                    $images[$index]->imageFile = UploadedFile::getInstance($images[$index], "[{$index}]imageFile");
-                    $isValid = $images[$index]->validate(['imageFile']) && $isValid;
+            $images[0]['additional'][0]->type = 'additional';
+            $images[0]['additional'][0]->language_id = 0;
+            $images[0]['additional'][0]->imageFile = UploadedFile::getInstances($images[0]['additional'][0], "[0][additional]imageFile");
+            $isValid = $images[0]['additional'][0]->validate(['imageFile']) && $isValid;
+            foreach(\Yii::$app->request->post()['ArticleCategoryMedia'] as $lang => $value) {
+                foreach($value as $type => $fields) {
+                    if(!in_array($type, ['full', 'preview'])) continue;
+                    $images[$lang][$type] = new ArticleCategoryMedia(['scenario' => $type]);
+                    $images[$lang][$type]->language_id = $lang;
+                    $images[$lang][$type]->type = $type;
+                    $images[$lang][$type]->imageFile = UploadedFile::getInstance($images[$lang][$type], "[{$lang}][{$type}]imageFile");
+                    $isValid = $images[$lang][$type]->validate(['imageFile']) && $isValid;
                 }
             }
             if(empty(\Yii::$app->request->post()['ArticleCategoryLang'])) {
@@ -149,7 +167,7 @@ class CategoryController extends Controller
                 foreach(\Yii::$app->request->post()['ArticleCategoryLang'] as $index => $category_lang) {
                     if(!array_key_exists($index, $category_langs)) {
                         $category_langs[$index] = new ArticleCategoryLang();
-                        $category_langs[$index]->category_id = $category->id;
+                        $category_langs[$index]->article_category_id = $category->article_category_id;
                     }
                 }
                 ArticleCategoryLang::loadMultiple($category_langs, \Yii::$app->request->post());
@@ -158,12 +176,14 @@ class CategoryController extends Controller
         }
         if($isValid) {
             $category->save(false);
-            foreach($images as $index => $image) {
-                if($index == 'additional') {
-                    $images[$index][0]->upload($category->id);
-                } else {
-                    if(!empty($images[$index]->imageFile)) {
-                        $images[$index]->replace($category->id, true);
+            foreach($images as $lang => $value) {
+                foreach($value as $type => $fields) {
+                    if($type == 'additional') {
+                        $images[$lang][$type][0]->upload($category->article_category_id);
+                    } else {
+                        if(!empty($images[$lang][$type]->imageFile)) {
+                            $images[$lang][$type]->replace($category->article_category_id);
+                        }
                     }
                 }
             }
@@ -11,21 +11,21 @@ use yii\db\Query;
 /**
  * This is the model class for table "article".
  *
- * @property integer $id
+ * @property integer $article_id
  * @property integer $sort
- * @property string $create_at
- * @property string $update_at
+ * @property string $date_add
+ * @property string $date_update
  * @property string $code
- * @property integer $author
- * @property string $tags
- * @property integer $parent_id
- * @property integer $active
- * @property integer $comments
- * @property integer $voting
+ * @property integer $user_id
+ * @property string $tag
+ * @property integer $article_pid
+ * @property integer $status
+ * @property integer $comment
+ * @property integer $vote
  *
  * @property Article $parent
  * @property Article[] $articles
- * @property User $author0
+ * @property User $user
  * @property ArticleLang[] $articleLangs
  * @property ArticleMedia[] $articleMedia
  * @property ArticleToCategory[] $articleToCategories
@@ -58,10 +58,10 @@ class Article extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['sort', 'parent_id', 'active', 'comments', 'voting'], 'integer'],
-            [['create_at', 'update_at'], 'safe'],
+            [['sort', 'article_pid', 'status', 'comment', 'vote'], 'integer'],
+            [['date_add', 'date_update'], 'safe'],
             [['code'], 'required'],
-            [['code', 'tags'], 'string']
+            [['code', 'tag'], 'string']
         ];
     }
@@ -71,17 +71,17 @@ class Article extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('app', 'ID'),
+            'article_id' => Yii::t('app', 'ID'),
             'sort' => Yii::t('app', 'Sort'),
-            'create_at' => Yii::t('app', 'Create At'),
-            'update_at' => Yii::t('app', 'Update At'),
+            'date_add' => Yii::t('app', 'Create At'),
+            'date_update' => Yii::t('app', 'Update At'),
             'code' => Yii::t('app', 'Code'),
-            'author' => Yii::t('app', 'Author'),
-            'tags' => Yii::t('app', 'Tags'),
-            'parent_id' => Yii::t('app', 'Parent ID'),
-            'active' => Yii::t('app', 'Active'),
-            'comments' => Yii::t('app', 'Comments'),
-            'voting' => Yii::t('app', 'Voting'),
+            'user_id' => Yii::t('app', 'Author'),
+            'tag' => Yii::t('app', 'Tags'),
+            'article_pid' => Yii::t('app', 'Parent ID'),
+            'status' => Yii::t('app', 'Active'),
+            'comment' => Yii::t('app', 'Comments'),
+            'vote' => Yii::t('app', 'Voting'),
         ];
     }
@@ -90,7 +90,7 @@ class Article extends \yii\db\ActiveRecord
      */
     public function getParent()
     {
-        return $this->hasOne(Article::className(), ['id' => 'parent_id']);
+        return $this->hasOne(Article::className(), ['article_id' => 'article_pid']);
     }
     /**
@@ -98,15 +98,15 @@ class Article extends \yii\db\ActiveRecord
      */
     public function getArticles()
     {
-        return $this->hasMany(Article::className(), ['parent_id' => 'id']);
+        return $this->hasMany(Article::className(), ['article_pid' => 'article_id']);
     }
     /**
      * @return \yii\db\ActiveQuery
      */
-    public function getAuthor0()
+    public function getUser()
     {
-        return $this->hasOne(User::className(), ['id' => 'author']);
+        return $this->hasOne(User::className(), ['id' => 'user_id']);
     }
     /**
@@ -114,7 +114,7 @@ class Article extends \yii\db\ActiveRecord
      */
     public function getArticleLangs()
     {
-        return $this->hasMany(ArticleLang::className(), ['article_id' => 'id']);
+        return $this->hasMany(ArticleLang::className(), ['article_id' => 'article_id']);
     }
     /**
@@ -122,40 +122,40 @@ class Article extends \yii\db\ActiveRecord
      */
     public function getArticleMedia()
     {
-        return $this->hasMany(ArticleMedia::className(), ['article_id' => 'id']);
+        return $this->hasMany(ArticleMedia::className(), ['article_id' => 'article_id']);
     }
     public function getMedia()
     {
-        return $this->hasMany(Media::className(), ['id' => 'media_id'])->via('articleMedia');
+        return $this->hasMany(Media::className(), ['article_id' => 'media_id'])->via('articleMedia');
     }
     /**
      * @return \yii\db\ActiveQuery
      */
     public function getArticleToCategories()
     {
-        return $this->hasMany(ArticleToCategory::className(), ['article_id' => 'id']);
+        return $this->hasMany(ArticleToCategory::className(), ['article_id' => 'article_id']);
     }
     public function getArticleCategories()
     {
-        return $this->hasMany(ArticleCategory::className(), ['id' => 'category_id'])->viaTable('article_to_category', ['article_id' => 'id']);
+        return $this->hasMany(ArticleCategory::className(), ['article_category_id' => 'article_category_id'])->viaTable('article_to_category', ['article_id' => 'article_category_id']);
     }
     public static function findArticleDropdown($id)
     {
         $query = new Query();
-        return $query->select(['l.name', 'a.id'])
+        return $query->select(['l.name', 'a.article_id'])
             ->from(['article a'])
-            ->leftJoin(['article_lang l'], 'a.id = l.article_id')
-            ->where(['l.lang_id' => 0, 'a.active' => 1])
-            ->andWhere(['not', ['a.id' => $id]])
-            ->indexBy('a.id')
+            ->leftJoin(['article_lang l'], 'a.article_id = l.article_id')
+            ->where(['l.language_id' => 0, 'a.status' => 1])
+            ->andWhere(['not', ['a.article_id' => $id]])
+            ->indexBy('article_id')
             ->column();
     }
     public function getArticleCategoriesArray()
     {
-        return $this->getArticleToCategories()->select('category_id')->column();
+        return $this->getArticleToCategories()->select('article_category_id')->column();
     }
 }
@@ -11,14 +11,14 @@ use yii\db\Query;
 /**
  * This is the model class for table "article_category".
  *
- * @property integer $id
- * @property integer $active
+ * @property integer $article_category_id
+ * @property integer $status
  * @property integer $sort
  * @property string $code
- * @property string $created_at
- * @property string $updated_at
- * @property string $tags
- * @property integer $parent_id
+ * @property string $date_add
+ * @property string $date_update
+ * @property string $tag
+ * @property integer $artucle_category_pid
  *
  * @property Article[] $articles
  * @property ArticleCategory $parent
@@ -53,11 +53,11 @@ class ArticleCategory extends ActiveRecord
     public function rules()
     {
         return [
-            [['active', 'sort', 'parent_id'], 'integer'],
+            [['status', 'sort', 'article_category_pid'], 'integer'],
             [['code'], 'required'],
-            [['code', 'tags'], 'string'],
-            [['created_at', 'updated_at'], 'safe'],
-            [['active'], 'boolean'],
+            [['code', 'tag'], 'string'],
+            [['date_add', 'date_update'], 'safe'],
+            [['status'], 'boolean'],
         ];
     }
@@ -67,14 +67,14 @@ class ArticleCategory extends ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('app', 'ID'),
-            'active' => Yii::t('app', 'Active'),
+            'article_category_id' => Yii::t('app', 'ID'),
+            'status' => Yii::t('app', 'Active'),
             'sort' => Yii::t('app', 'Sort'),
             'code' => Yii::t('app', 'Code'),
-            'created_at' => Yii::t('app', 'Created At'),
-            'updated_at' => Yii::t('app', 'Updated At'),
-            'tags' => Yii::t('app', 'Tags'),
-            'parent_id' => Yii::t('app', 'Parent ID'),
+            'date_add' => Yii::t('app', 'Created At'),
+            'date_update' => Yii::t('app', 'Updated At'),
+            'tag' => Yii::t('app', 'Tags'),
+            'article_category_pid' => Yii::t('app', 'Parent ID'),
         ];
     }
@@ -83,7 +83,7 @@ class ArticleCategory extends ActiveRecord
      */
     public function getArticles()
     {
-        return $this->hasMany(Article::className(), ['category_id' => 'id']);
+        return $this->hasMany(Article::className(), ['article_id' => 'article_id'])->viaTable('article_to_category', ['article_category_id' => 'article_category_id']) ;
     }
     /**
@@ -91,7 +91,7 @@ class ArticleCategory extends ActiveRecord
      */
     public function getParent()
     {
-        return $this->hasOne(ArticleCategory::className(), ['id' => 'parent_id']);
+        return $this->hasOne(ArticleCategory::className(), ['article_category_id' => 'article_category_pid']);
     }
     /**
@@ -99,7 +99,7 @@ class ArticleCategory extends ActiveRecord
      */
     public function getArticleCategories()
     {
-        return $this->hasMany(ArticleCategory::className(), ['parent_id' => 'id']);
+        return $this->hasMany(ArticleCategory::className(), ['article_category_pid' => 'article_category_id']);
     }
     /**
@@ -107,7 +107,7 @@ class ArticleCategory extends ActiveRecord
      */
     public function getArticleCategoryLangs()
     {
-        return $this->hasMany(ArticleCategoryLang::className(), ['category_id' => 'id']);
+        return $this->hasMany(ArticleCategoryLang::className(), ['article_category_id' => 'article_category_id']);
     }
     /**
@@ -115,18 +115,18 @@ class ArticleCategory extends ActiveRecord
      */
     public function getArticleCategoryMedia()
     {
-        return $this->hasMany(ArticleCategoryMedia::className(), ['category_id' => 'id']);
+        return $this->hasMany(ArticleCategoryMedia::className(), ['article_category_id' => 'article_category_id']);
     }
     public static function findArticleCategoryDropdown($id)
     {
         $query = new Query();
-        return $query->select(['l.name', 'c.id'])
+        return $query->select(['l.name', 'c.article_category_id'])
                         ->from(['article_category c'])
-                        ->leftJoin(['article_category_lang l'], 'c.id = l.category_id')
-                        ->where(['l.lang_id' => 0, 'c.active' => 1])
-                        ->andWhere(['not', ['c.id' => $id]])
-                        ->indexBy('id')
+                        ->leftJoin(['article_category_lang l'], 'c.article_category_id = l.article_category_id')
+                        ->where(['l.language_id' => 0, 'c.status' => 1])
+                        ->andWhere(['not', ['c.article_category_id' => $id]])
+                        ->indexBy('article_category_id')
                         ->column();
     }
@@ -8,18 +8,18 @@ use Yii;
 /**
  * This is the model class for table "article_category_lang".
  *
- * @property integer $id
- * @property integer $lang_id
- * @property integer $category_id
+ * @property integer $article_category_language_id
+ * @property integer $language_id
+ * @property integer $article_category_id
  * @property string $text
  * @property string $preview
  * @property string $seo_url
  * @property string $name
  * @property string $meta_title
  * @property string $meta_descr
- * @property string $meta_keywords
+ * @property string $meta_keyword
  * @property string $h1_tag
- * @property string $tags
+ * @property string $tag
  *
  * @property ArticleCategory $category
  * @property Language $lang
@@ -51,9 +51,9 @@ class ArticleCategoryLang extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['lang_id', 'category_id'], 'integer'],
+            [['language_id', 'article_category_id'], 'integer'],
             [['text', 'name'], 'required'],
-            [['text', 'preview', 'seo_url', 'name', 'meta_title', 'meta_descr', 'meta_keywords', 'h1_tag', 'tags'], 'string'],
+            [['text', 'preview', 'seo_url', 'name', 'meta_title', 'meta_descr', 'meta_keyword', 'h1_tag', 'tag'], 'string'],
             ['seo_url', function($attribute, $params) {
                 $pattern = "/^[a-zA-Z\d_-]+$/";
                 if(!preg_match($pattern, $this->$attribute)) {
@@ -69,18 +69,18 @@ class ArticleCategoryLang extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('app', 'ID'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
-            'category_id' => Yii::t('app', 'Category ID'),
+            'article_category_language_id' => Yii::t('app', 'ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
+            'article_category_id' => Yii::t('app', 'Category ID'),
             'text' => Yii::t('app', 'Text'),
             'preview' => Yii::t('app', 'Preview'),
             'seo_url' => Yii::t('app', 'Seo Url'),
             'name' => Yii::t('app', 'Name'),
             'meta_title' => Yii::t('app', 'Meta Title'),
             'meta_descr' => Yii::t('app', 'Meta Descr'),
-            'meta_keywords' => Yii::t('app', 'Meta Keywords'),
+            'meta_keyword' => Yii::t('app', 'Meta Keywords'),
             'h1_tag' => Yii::t('app', 'H1 Tag'),
-            'tags' => Yii::t('app', 'Tags'),
+            'tag' => Yii::t('app', 'Tags'),
         ];
     }
@@ -89,7 +89,7 @@ class ArticleCategoryLang extends \yii\db\ActiveRecord
      */
     public function getCategory()
     {
-        return $this->hasOne(ArticleCategory::className(), ['id' => 'category_id']);
+        return $this->hasOne(ArticleCategory::className(), ['article_category_id' => 'article_category_id']);
     }
     /**
@@ -97,6 +97,6 @@ class ArticleCategoryLang extends \yii\db\ActiveRecord
      */
     public function getLang()
     {
-        return $this->hasOne(Language::className(), ['language_id' => 'lang_id']);
+        return $this->hasOne(Language::className(), ['language_id' => 'language_id']);
     }
 }
@@ -8,16 +8,18 @@ use Yii;
 /**
  * This is the model class for table "article_category_media".
  *
- * @property integer $id
- * @property integer $category_id
+ * @property integer $article_category_media_id
+ * @property integer $article_category_id
  * @property integer $media_id
  * @property string $media_alt
  * @property string $media_title
  * @property string $media_caption
  * @property string $type
+ * @property string $language_id
  *
  * @property ArticleCategory $category
  * @property Media $media
+ * @property Language $lang
  */
 class ArticleCategoryMedia extends \yii\db\ActiveRecord
 {
@@ -36,9 +38,9 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord
     public function scenarios()
     {
         $scenarios = parent::scenarios();
-        $scenarios[self::SCENARIO_FULL] = ['id', 'category_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile'];
-        $scenarios[self::SCENARIO_PREVIEW] = ['id', 'category_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile'];
-        $scenarios[self::SCENARIO_ADDITIONAL] = ['id', 'category_id', 'media_id', 'type', 'imageFile'];
+        $scenarios[self::SCENARIO_FULL] = ['article_category_media_id', 'article_category_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile'];
+        $scenarios[self::SCENARIO_PREVIEW] = ['article_category_media_id', 'article_category_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile'];
+        $scenarios[self::SCENARIO_ADDITIONAL] = ['article_category_media_id', 'article_category_id', 'media_id', 'type', 'imageFile'];
         return $scenarios;
     }
@@ -48,8 +50,8 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['category_id', 'media_id'], 'required'],
-            [['category_id', 'media_id'], 'integer'],
+            [['article_category_id', 'media_id'], 'required'],
+            [['article_category_id', 'media_id'], 'integer'],
             [['media_alt', 'media_title', 'media_caption'], 'string'],
             [['type'], 'string', 'max' => 10],
             [['imageFile'], 'file', 'extensions' => 'png, gif, jpg, jpeg', 'skipOnEmpty' => true, 'on' => self::SCENARIO_FULL],
@@ -64,14 +66,15 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('app', 'ID'),
-            'category_id' => Yii::t('app', 'Category ID'),
+            'article_category_media_id' => Yii::t('app', 'ID'),
+            'article_category_id' => Yii::t('app', 'Category ID'),
             'media_id' => Yii::t('app', 'Media ID'),
             'media_alt' => Yii::t('app', 'Media Alt'),
             'media_title' => Yii::t('app', 'Media Title'),
             'media_caption' => Yii::t('app', 'Media Caption'),
             'type' => Yii::t('app', 'Type'),
             'imageFile' => Yii::t('app', 'Image File'),
+            'language_id' => Yii::t('app', 'Language ID'),
         ];
     }
@@ -80,7 +83,7 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord
      */
     public function getCategory()
     {
-        return $this->hasOne(ArticleCategory::className(), ['id' => 'category_id']);
+        return $this->hasOne(ArticleCategory::className(), ['article_category_id' => 'article_category_id']);
     }
     /**
@@ -88,12 +91,12 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord
      */
     public function getMedia()
     {
-        return $this->hasOne(Media::className(), ['id' => 'media_id']);
+        return $this->hasOne(Media::className(), ['media_id' => 'media_id']);
     }
     public function upload($category_id)
     {
-        $this->category_id = $category_id;
+        $this->article_category_id = $category_id;
         if(is_array($this->imageFile)) {
             $ok = true;
             foreach($this->imageFile as $image) {
@@ -101,7 +104,7 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord
                 $media = new Media();
                 $media->imageFile = $image;
                 $media->upload();
-                $media_category->media_id = $media->id;
+                $media_category->media_id = $media->media_id;
                 $ok = $media_category->save() && $ok;
                 unset($media_category);
             }
@@ -110,19 +113,19 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord
             $media = new Media();
             $media->imageFile = $this->imageFile;
             $media->upload();
-            $this->media_id = $media->id;
+            $this->media_id = $media->media_id;
             return $this->save();
         }
     }
     public function replace($category_id, $removeMedia = false)
     {
-        $this->category_id = $category_id;
+        $this->article_category_id = $category_id;
         if($removeMedia) {
-            $category_media = ArticleCategoryMedia::find()->select('media_id')->where(['category_id' => $this->category_id, 'type' => $this->type])->column();
+            $category_media = ArticleCategoryMedia::find()->select('media_id')->where(['article_category_id' => $this->article_category_id, 'type' => $this->type])->column();
             $media = array();
             foreach($category_media as $media_id) {
-                $media[] = Media::findOne(['id' => $media_id]);
+                $media[] = Media::findOne(['media_id' => $media_id]);
             }
             $media = array_unique($media);
             foreach($media as $one_media) {
@@ -140,17 +143,17 @@ class ArticleCategoryMedia extends \yii\db\ActiveRecord
                 $media = new Media();
                 $media->imageFile = $image;
                 $media->upload();
-                $media_category->media_id = $media->id;
+                $media_category->media_id = $media->media_id;
                 $ok = $media_category->save() && $ok;
                 unset($media_category);
             }
             return $ok;
         } elseif(!empty($this->imageFile)) {
-            ArticleCategoryMedia::deleteAll(['category_id' => $this->category_id, 'type' => $this->type]);
+            ArticleCategoryMedia::deleteAll(['category_id' => $this->article_category_id, 'type' => $this->type]);
             $media = new Media();
             $media->imageFile = $this->imageFile;
             $media->upload();
-            $this->media_id = $media->id;
+            $this->media_id = $media->media_id;
             $this->setIsNewRecord(true);
             return $this->save();
         }
@@ -8,8 +8,8 @@ use common\models\Language;
 /**
  * This is the model class for table "article_lang".
  *
- * @property integer $id
- * @property integer $lang_id
+ * @property integer $article_language_id
+ * @property integer $language_id
  * @property integer $article_id
  * @property string $text
  * @property string $seo_url
@@ -17,9 +17,9 @@ use common\models\Language;
  * @property string $preview
  * @property string $meta_title
  * @property string $meta_descr
- * @property string $meta_keywords
+ * @property string $meta_keyword
  * @property string $h1_tag
- * @property string $tags
+ * @property string $tag
  *
  * @property Article $article
  * @property Language $lang
@@ -40,9 +40,9 @@ class ArticleLang extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['lang_id', 'text', 'name'], 'required'],
-            [['lang_id', 'article_id'], 'integer'],
-            [['text', 'seo_url', 'name', 'preview', 'meta_title', 'meta_descr', 'meta_keywords', 'h1_tag', 'tags'], 'string']
+            [['language_id', 'text', 'name'], 'required'],
+            [['language_id', 'article_id'], 'integer'],
+            [['text', 'seo_url', 'name', 'preview', 'meta_title', 'meta_descr', 'meta_keyword', 'h1_tag', 'tag'], 'string']
         ];
     }
@@ -52,8 +52,8 @@ class ArticleLang extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('app', 'ID'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'article_language_id' => Yii::t('app', 'ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
             'article_id' => Yii::t('app', 'Article ID'),
             'text' => Yii::t('app', 'Text'),
             'seo_url' => Yii::t('app', 'Seo Url'),
@@ -61,9 +61,9 @@ class ArticleLang extends \yii\db\ActiveRecord
             'preview' => Yii::t('app', 'Preview'),
             'meta_title' => Yii::t('app', 'Meta Title'),
             'meta_descr' => Yii::t('app', 'Meta Descr'),
-            'meta_keywords' => Yii::t('app', 'Meta Keywords'),
+            'meta_keyword' => Yii::t('app', 'Meta Keywords'),
             'h1_tag' => Yii::t('app', 'H1 Tag'),
-            'tags' => Yii::t('app', 'Tags'),
+            'tag' => Yii::t('app', 'Tags'),
         ];
     }
@@ -72,7 +72,7 @@ class ArticleLang extends \yii\db\ActiveRecord
      */
     public function getArticle()
     {
-        return $this->hasOne(Article::className(), ['id' => 'article_id']);
+        return $this->hasOne(Article::className(), ['article_id' => 'article_id']);
     }
     /**
@@ -80,6 +80,6 @@ class ArticleLang extends \yii\db\ActiveRecord
      */
     public function getLang()
     {
-        return $this->hasOne(Language::className(), ['language_id' => 'lang_id']);
+        return $this->hasOne(Language::className(), ['language_id' => 'language_id']);
     }
 }
@@ -9,13 +9,14 @@ use yii\web\UploadedFile;
 /**
  * This is the model class for table "article_media".
  *
- * @property integer $id
+ * @property integer $article_media_id
  * @property integer $article_id
  * @property integer $media_id
  * @property string $type
  * @property string $media_alt
  * @property string $media_title
  * @property string $media_caption
+ * @property integer $language_id
  *
  * @property Article $article
  * @property Media $media
@@ -37,9 +38,9 @@ class ArticleMedia extends \yii\db\ActiveRecord
     public function scenarios()
     {
         $scenarios = parent::scenarios();
-        $scenarios[self::SCENARIO_FULL] = ['id', 'article_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile'];
-        $scenarios[self::SCENARIO_PREVIEW] = ['id', 'article_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile'];
-        $scenarios[self::SCENARIO_ADDITIONAL] = ['id', 'article_id', 'media_id', 'type', 'imageFile'];
+        $scenarios[self::SCENARIO_FULL] = ['article_media_id', 'article_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile', 'language_id'];
+        $scenarios[self::SCENARIO_PREVIEW] = ['article_media_id', 'article_id', 'media_id', 'type', 'media_alt', 'media_title', 'media_caption', 'imageFile', 'language_id'];
+        $scenarios[self::SCENARIO_ADDITIONAL] = ['article_media_id', 'article_id', 'media_id', 'type', 'imageFile', 'language_id'];
         return $scenarios;
     }
@@ -50,7 +51,7 @@ class ArticleMedia extends \yii\db\ActiveRecord
     {
         return [
             [['article_id', 'media_id'], 'required'],
-            [['article_id', 'media_id'], 'integer'],
+            [['article_id', 'media_id', 'language_id'], 'integer'],
             [['media_alt', 'media_title', 'media_caption'], 'string'],
             [['type'], 'string', 'max' => 10],
             [['imageFile'], 'file', 'extensions' => 'png, gif, jpg, jpeg', 'skipOnEmpty' => true, 'on' => self::SCENARIO_FULL],
@@ -65,7 +66,7 @@ class ArticleMedia extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('app', 'ID'),
+            'article_media_id' => Yii::t('app', 'ID'),
             'article_id' => Yii::t('app', 'Article ID'),
             'media_id' => Yii::t('app', 'Media ID'),
             'type' => Yii::t('app', 'Type'),
@@ -81,7 +82,7 @@ class ArticleMedia extends \yii\db\ActiveRecord
      */
     public function getArticle()
     {
-        return $this->hasOne(Article::className(), ['id' => 'article_id']);
+        return $this->hasOne(Article::className(), ['article_id' => 'article_id']);
     }
     /**
@@ -89,7 +90,7 @@ class ArticleMedia extends \yii\db\ActiveRecord
      */
     public function getMedia()
     {
-        return $this->hasOne(Media::className(), ['id' => 'media_id']);
+        return $this->hasOne(Media::className(), ['media_id' => 'media_id']);
     }
     public function upload($article_id)
@@ -102,7 +103,7 @@ class ArticleMedia extends \yii\db\ActiveRecord
                 $media = new Media();
                 $media->imageFile = $image;
                 $media->upload();
-                $media_article->media_id = $media->id;
+                $media_article->media_id = $media->media_id;
                 $ok = $media_article->save() && $ok;
                 unset($media_article);
             }
@@ -111,7 +112,7 @@ class ArticleMedia extends \yii\db\ActiveRecord
             $media = new Media();
             $media->imageFile = $this->imageFile;
             $media->upload();
-            $this->media_id = $media->id;
+            $this->media_id = $media->media_id;
             return $this->save();
         }
     }
@@ -119,11 +120,11 @@ class ArticleMedia extends \yii\db\ActiveRecord
     public function replace($article_id, $removeMedia = false)
     {
         $this->article_id = $article_id;
-        if($removeMedia) {
-            $article_media = ArticleMedia::find()->select('media_id')->where(['article_id' => $this->article_id, 'type' => $this->type])->column();
+        if($removeMedia && !$this->getIsNewRecord()) {
+            $article_media = ArticleMedia::find()->select('media_id')->where(['article_id' => $this->article_id, 'type' => $this->type, 'language_id' => $this->language_id])->column();
             $media = array();
             foreach($article_media as $media_id) {
-                $media[] = Media::findOne(['id' => $media_id]);
+                $media[] = Media::findOne(['media_id' => $media_id]);
             }
             $media = array_unique($media);
             foreach($media as $one_media) {
@@ -141,17 +142,17 @@ class ArticleMedia extends \yii\db\ActiveRecord
                 $media = new Media();
                 $media->imageFile = $image;
                 $media->upload();
-                $media_article->media_id = $media->id;
+                $media_article->media_id = $media->media_id;
                 $ok = $media_article->save() && $ok;
                 unset($media_article);
             }
             return $ok;
         } elseif(!empty($this->imageFile)) {
-            ArticleMedia::deleteAll(['article_id' => $this->article_id, 'type' => $this->type]);
+            ArticleMedia::deleteAll(['article_id' => $this->article_id, 'type' => $this->type, 'language_id' => $this->language_id]);
             $media = new Media();
             $media->imageFile = $this->imageFile;
             $media->upload();
-            $this->media_id = $media->id;
+            $this->media_id = $media->media_id;
             $this->setIsNewRecord(true);
             return $this->save();
         }
@@ -8,7 +8,7 @@ use Yii;
  * This is the model class for table "article_to_category".
  *
  * @property integer $article_id
- * @property integer $category_id
+ * @property integer $article_category_id
  *
  * @property Article $article
  * @property ArticleCategory $category
@@ -29,7 +29,7 @@ class ArticleToCategory extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['article_id', 'category_id'], 'integer']
+            [['article_id', 'article_category_id'], 'integer']
         ];
     }
@@ -40,7 +40,7 @@ class ArticleToCategory extends \yii\db\ActiveRecord
     {
         return [
             'article_id' => Yii::t('app', 'Article ID'),
-            'category_id' => Yii::t('app', 'Category ID'),
+            'article_category_id' => Yii::t('app', 'Category ID'),
         ];
     }
@@ -49,7 +49,7 @@ class ArticleToCategory extends \yii\db\ActiveRecord
      */
     public function getArticle()
     {
-        return $this->hasOne(Article::className(), ['id' => 'article_id']);
+        return $this->hasOne(Article::className(), ['article_id' => 'article_id']);
     }
     /**
@@ -57,6 +57,6 @@ class ArticleToCategory extends \yii\db\ActiveRecord
      */
     public function getCategory()
     {
-        return $this->hasOne(ArticleCategory::className(), ['id' => 'category_id']);
+        return $this->hasOne(ArticleCategory::className(), ['article_category_id' => 'article_category_id']);
     }
 }
@@ -3,31 +3,36 @@
 use yii\bootstrap\ActiveField;
 use mihaildev\ckeditor\CKEditor;
-$form = \yii\bootstrap\ActiveForm::begin();
+if(empty($form)) {
+    $new_form = true;
+    $form = \yii\bootstrap\ActiveForm::begin();
+}
 ?>
 <div role="" class="tab-pane active ajax-loaded" id="<?=$widget_id?>-<?=$model->language_id?>">
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]lang_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]language_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?>
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]text", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]text", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?>
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]preview", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]preview", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?>
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]seo_url"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]seo_url"]))->textInput() ?>
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]name"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]name"]))->textInput() ?>
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]meta_title"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]meta_title"]))->textInput() ?>
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]meta_descr"]))->textarea() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]meta_descr"]))->textarea() ?>
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]meta_keywords"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]meta_keyword"]))->textInput() ?>
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]h1_tag"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]h1_tag"]))->textInput() ?>
-    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id]tags"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $model, 'attribute' => "[$model->language_id]tag"]))->textInput() ?>
 </div>
 <?php
-$form->end();
+    if($new_form) {
+        $form->end();
+    }
 ?>
+<?php
+
+use yii\bootstrap\ActiveField;
+use mihaildev\ckeditor\CKEditor;
+
+$form = \yii\bootstrap\ActiveForm::begin();
+?>
+<div role="" class="tab-pane active ajax-loaded" id="<?=$widget_id?>-<?=$model->language_id?>">
+
+    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id][$type]language_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?>
+
+    <?= (new ActiveField(['model' => $article_lang, 'attribute' => "[$model->language_id][$type]imageFile"]))->fileInput(['class' => 'image_inputs_field']) ?>
+
+</div>
+<?php
+$form->end();
+?>
@@ -7,7 +7,7 @@ $form = \yii\bootstrap\ActiveForm::begin();
 ?>
 <div role="" class="tab-pane active ajax-loaded" id="<?=$widget_id?>-<?=$model->language_id?>">
-    <?= (new ActiveField(['model' => $category_lang, 'attribute' => "[$model->language_id]lang_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?>
+    <?= (new ActiveField(['model' => $category_lang, 'attribute' => "[$model->language_id]language_id"]))->label(false)->hiddenInput(['value' => $model->language_id]) ?>
     <?= (new ActiveField(['model' => $category_lang, 'attribute' => "[$model->language_id]text", 'form' => $form]))->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ]]); ?>
@@ -21,11 +21,11 @@ $form = \yii\bootstrap\ActiveForm::begin();
     <?= (new ActiveField(['model' => $category_lang, 'attribute' => "[$model->language_id]meta_descr"]))->textarea() ?>
-    <?= (new ActiveField(['model' => $category_lang, 'attribute' => "[$model->language_id]meta_keywords"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $category_lang, 'attribute' => "[$model->language_id]meta_keyword"]))->textInput() ?>
     <?= (new ActiveField(['model' => $category_lang, 'attribute' => "[$model->language_id]h1_tag"]))->textInput() ?>
-    <?= (new ActiveField(['model' => $category_lang, 'attribute' => "[$model->language_id]tags"]))->textInput() ?>
+    <?= (new ActiveField(['model' => $category_lang, 'attribute' => "[$model->language_id]tag"]))->textInput() ?>
 </div>
 <?php
 <?php
 use common\modules\blog\models\ArticleCategory;
+use common\modules\blog\models\ArticleMedia;
 use common\widgets\Multilang;
-use yii\bootstrap\ActiveForm;
+    use common\widgets\Multilanguage;
+    use yii\bootstrap\ActiveForm;
 use common\modules\blog\models\Article;
 use yii\bootstrap\Html;
 use mihaildev\ckeditor\CKEditor;
@@ -18,70 +20,108 @@ $uploaddir = \Yii::getAlias(&#39;@saveImageDir&#39;);
         <?= $form->field($article, 'code')->hint(Yii::t('app', 'Insensitive latin non-space'))->textInput() ?>
-        <?= $form->field($article, 'tags')->hint(Yii::t('app', 'Comma-separated'))->textInput() ?>
+        <?= $form->field($article, 'tag')->hint(Yii::t('app', 'Comma-separated'))->textInput() ?>
         <?= $form->field($article, 'sort')->input('number') ?>
-        <?= $form->field($article, 'parent_id')
-                    ->dropDownList(Article::findArticleDropdown($article->id), ['prompt' => Yii::t('app', 'Select parent')]) ?>
+        <?= $form->field($article, 'article_pid')
+                    ->dropDownList(Article::findArticleDropdown($article->article_id), ['prompt' => Yii::t('app', 'Select parent')]) ?>
         <?= $form->field($article, 'articleCategoriesArray')
                     ->dropDownList(ArticleCategory::findArticleCategoryDropdown(NULL), ['multiple' => 'multiple'])->label(\Yii::t('app', 'Article Categories Array')); ?>
-        <?= $form->field($article, 'active')->checkbox() ?>
+        <?= $form->field($article, 'status')->checkbox() ?>
         <ul class="nav nav-tabs" id="image-tabs" role="tablist">
-            <?php
-            $first = 1;
-            foreach($images as $index => $image) {
-                ?>
-                <li role="image_inputs" class="<?php if($first) { echo 'active'; }?>" data-type="<?=$index?>"><a href="#image-<?=$index?>" aria-controls="image-<?=$index?>" role="tab" data-toggle="tab"><span><?= \Yii::t('app', $index)?></span></a></li>
-                <?php
-                $first = 0;
-            }
-            ?>
+            <li role="image_inputs" class="active" data-type="full"><a href="#image-full" aria-controls="image-full" role="tab" data-toggle="tab"><span><?= \Yii::t('app', 'full')?></span></a></li>
+            <li role="image_inputs" class="" data-type="preview"><a href="#image-preview" aria-controls="image-preview" role="tab" data-toggle="tab"><span><?= \Yii::t('app', 'preview')?></span></a></li>
+            <li role="image_inputs" class="" data-type="additional"><a href="#image-additional" aria-controls="image-additional" role="tab" data-toggle="tab"><span><?= \Yii::t('app', 'additional')?></span></a></li>
         </ul>
         <div class="tab-content image-tab-content">
-            <?php
-            $first = 1;
-            foreach($images as $index => $image) {
+            <div role="" class="tab-pane active main-tab" id="image-full">
+                <?php
+                $imagelang = Multilang::begin([
+                    'ajaxpath' => Url::to(['/blog/ajax/article-media-form?type=full']),
+                    'form' => $form,
+                    'data_langs' => $article->getIsNewRecord()?$images:ArticleMedia::find()->where(['article_id' => $article->article_id, 'type' => 'full'])->indexBy('language_id')->all()
+                ]);
+                $first = 1;
+                foreach($images as $lang => $value) {
+                    if(!array_key_exists('full', $value)) continue;
+                    ?>
+                    <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="<?=$imagelang->id?>-<?=$lang?>">
+                        <?php
+                        echo $form->field($images[$lang]['full'], "[{$lang}][full]language_id")->label(false)->hiddenInput(['value' => $lang]);
+                        echo $form->field($images[$lang]['full'], "[{$lang}][full]imageFile")->fileInput(['class' => 'image_inputs_field']);
+                        if(!empty($images[$lang]['full']->article_media_id)) {
+                            echo "<img src='/images/upload/{$images[$lang]['full']->media->hash}/original.{$images[$lang]['full']->media->extension}' width='100' class='image_inputs_prev'>";
+                        }
+                        ?>
+                    </div>
+                <?php
+                    $first = 0;
+                }
+                $imagelang->end();
                 ?>
-                <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="image-<?=$index?>">
-                    <?php if($index == 'additional') {
-                        echo $form->field(is_array($image)?$images[$index][0]:$images[$index], "[{$index}]imageFile[]")->fileInput(['multiple' => 'multiple', 'class' => 'image_inputs_field']);
-                        if(is_array($image) && count($image) > 1) {
-                            foreach($image as $oneindex => $oneimage) {
-                                if($oneindex) {
-                                    ?>
-                                    <div class="additional_image_container">
-                                        <img src='/images/upload/<?= $oneimage->media->hash ?>/original.<?= $oneimage->media->extension ?>' width='100'>
-                                        <a
-                                            href="<?= Url::to(['ajax/remove-image']) ?>"
-                                            class="remove_image glyphicon glyphicon-remove-circle"
-                                            data-params='<?= Json::encode(['article_media_id' => $oneimage->id, 'remove_media' => true]) ?>',
-                                        ></a>
-                                    </div>
-                                    <?php
-                                }
-                            }
+            </div>
+            <div role="" class="tab-pane" id="image-preview">
+                <?php
+                $imagelang = Multilang::begin([
+                    'ajaxpath' => Url::to(['/blog/ajax/article-media-form?type=preview']),
+                    'form' => $form,
+                    'data_langs' => $article->getIsNewRecord()?$images:ArticleMedia::find()->where(['article_id' => $article->article_id, 'type' => 'preview'])->indexBy('language_id')->all()
+                ]);
+                $first = 1;
+                foreach($images as $lang => $value) {
+                    if(!array_key_exists('preview', $value)) continue;
+                    ?>
+                    <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="<?=$imagelang->id?>-<?=$lang?>">
+                        <?php
+                        echo $form->field($images[$lang]['preview'], "[{$lang}][preview]language_id")->label(false)->hiddenInput(['value' => $lang]);
+                        echo $form->field($images[$lang]['preview'], "[{$lang}][preview]imageFile")->fileInput(['class' => 'image_inputs_field']);
+                        if(!empty($images[$lang]['preview']->article_media_id)) {
+                            echo "<img src='/images/upload/{$images[$lang]['preview']->media->hash}/original.{$images[$lang]['preview']->media->extension}' width='100' class='image_inputs_prev'>";
                         }
-                    } else {
-                        echo $form->field($images[$index], "[{$index}]imageFile")->fileInput(['class' => 'image_inputs_field']);
-                        if(!empty($image->id)) {
-                            echo "<img src='/images/upload/{$image->media->hash}/original.{$image->media->extension}' width='100' class='image_inputs_prev'>";
+                        ?>
+                    </div>
+                    <?php
+                    $first = 0;
+                }
+                $imagelang->end();
+                ?>
+            </div>
+            <div role="" class="tab-pane" id="image-additional">
+                <?php
+                echo $form->field(is_array($images[0]['additional'])?$images[0]['additional'][0]:$images[0]['additional'], "[0][additional]imageFile[]")->fileInput(['multiple' => 'multiple', 'class' => 'image_inputs_field']);
+                if(is_array($images[0]['additional']) && count($images[0]['additional']) > 1) {
+                    foreach($images[0]['additional'] as $onefield => $oneimage) {
+                        if($onefield) {
+                            ?>
+                            <div class="additional_image_container">
+                                <img src='/images/upload/<?= $oneimage->media->hash ?>/original.<?= $oneimage->media->extension ?>' width='100'>
+                                <a
+                                    href="<?= Url::to(['ajax/remove-image']) ?>"
+                                    class="remove_image glyphicon glyphicon-remove-circle"
+                                    data-params='<?= Json::encode(['article_media_id' => $oneimage->article_media_id, 'remove_media' => true]) ?>',
+                                ></a>
+                            </div>
+                            <?php
                         }
                     }
-                    ?>
-                </div>
-                <?php
-                $first = 0;
-            }
-            ?>
+                }
+                ?>
+            </div>
         </div>
         <hr>
         <?php
+            echo Multilanguage::widget([
+                'data' => $article_langs,
+                'form' => $form,
+                'ajaxView' => '@common/modules/blog/views/ajax/_article_form',
+            ]);
+            /*
         $multilang = Multilang::begin(['ajaxpath' => Url::to(['/blog/ajax/article-form']), 'form' => $form, 'data_langs' => $article_langs]);
         ?>
             <?php
@@ -90,7 +130,7 @@ $uploaddir = \Yii::getAlias(&#39;@saveImageDir&#39;);
                 ?>
                 <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="<?=$multilang->id?>-<?=$index?>">
-                    <?= $form->field($article_langs[$index], "[$index]lang_id")->label(false)->hiddenInput(['value' => $index]) ?>
+                    <?= $form->field($article_langs[$index], "[$index]language_id")->label(false)->hiddenInput(['value' => $index]) ?>
                     <?= $form->field($article_langs[$index], "[$index]text")->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ], ]); ?>
@@ -117,6 +157,7 @@ $uploaddir = \Yii::getAlias(&#39;@saveImageDir&#39;);
             ?>
         <?php
         $multilang->end();
+            */
         ?>
         <div class="form-group">
@@ -8,12 +8,12 @@ use common\models\Language;
 echo GridView::widget([
     'dataProvider' => $dataProvider,
     'columns' => [
-        'id',
+        'article_id',
         'code',
-        'create_at',
+        'date_add',
         [
             'value' => function($data) {
-                return $data->author0->firstname.' '.$data->author0->lastname;
+                return $data->user->firstname.' '.$data->user->lastname;
             },
             'header' => Yii::t('app', 'Author')
         ],
@@ -21,7 +21,7 @@ echo GridView::widget([
             'class' => Column::className(),
             'header' => Yii::t('app', 'Name'),
             'content' => function($model, $key, $index, $column) {
-                return $model->getArticleLangs()->where(['lang_id' => Language::getDefaultLang()->language_id])->one()->name;
+                return $model->getArticleLangs()->where(['language_id' => Language::getDefaultLang()->language_id])->one()->name;
             }
         ],
         [
 <?php
+use common\modules\blog\models\ArticleCategoryMedia;
 use common\widgets\Multilang;
 use yii\bootstrap\ActiveForm;
 use common\modules\blog\models\ArticleCategory;
@@ -16,62 +17,94 @@ $uploaddir = \Yii::getAlias(&#39;@saveImageDir&#39;);
         <?= $form->field($category, 'code')->hint(Yii::t('app', 'Insensitive latin non-space'))->textInput() ?>
-        <?= $form->field($category, 'tags')->hint(Yii::t('app', 'Comma-separated'))->textInput() ?>
+        <?= $form->field($category, 'tag')->hint(Yii::t('app', 'Comma-separated'))->textInput() ?>
         <?= $form->field($category, 'sort')->input('number') ?>
-        <?= $form->field($category, 'parent_id')
-                    ->dropDownList(ArticleCategory::findArticleCategoryDropdown($category->id), ['prompt' => Yii::t('app', 'Select parent')]) ?>
+        <?= $form->field($category, 'article_category_pid')
+                    ->dropDownList(ArticleCategory::findArticleCategoryDropdown($category->article_category_id), ['prompt' => Yii::t('app', 'Select parent')]) ?>
-        <?= $form->field($category, 'active')->checkbox() ?>
+        <?= $form->field($category, 'status')->checkbox() ?>
         <ul class="nav nav-tabs" id="image-tabs" role="tablist">
-            <?php
-            $first = 1;
-            foreach($images as $index => $image) {
-                ?>
-                <li role="image_inputs" class="<?php if($first) { echo 'active'; }?>" data-type="<?=$index?>"><a href="#image-<?=$index?>" aria-controls="image-<?=$index?>" role="tab" data-toggle="tab"><span><?= \Yii::t('app', $index)?></span></a></li>
-                <?php
-                $first = 0;
-            }
-            ?>
+            <li role="image_inputs" class="active" data-type="full"><a href="#image-full" aria-controls="image-full" role="tab" data-toggle="tab"><span><?= \Yii::t('app', 'full')?></span></a></li>
+            <li role="image_inputs" class="" data-type="preview"><a href="#image-preview" aria-controls="image-preview" role="tab" data-toggle="tab"><span><?= \Yii::t('app', 'preview')?></span></a></li>
+            <li role="image_inputs" class="" data-type="additional"><a href="#image-additional" aria-controls="image-additional" role="tab" data-toggle="tab"><span><?= \Yii::t('app', 'additional')?></span></a></li>
         </ul>
         <div class="tab-content image-tab-content">
-            <?php
-            $first = 1;
-            foreach($images as $index => $image) {
+            <div role="" class="tab-pane active main-tab" id="image-full">
+                <?php
+                $imagelang = Multilang::begin([
+                    'ajaxpath' => Url::to(['/blog/ajax/article-category-media-form?type=full']),
+                    'form' => $form,
+                    'data_langs' => $category->getIsNewRecord()?$images:ArticleCategoryMedia::find()->where(['article_category_id' => $category->article_category_id, 'type' => 'full'])->indexBy('language_id')->all()
+                ]);
+                $first = 1;
+                foreach($images as $lang => $value) {
+                    if(!array_key_exists('full', $value)) continue;
+                    ?>
+                    <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="<?=$imagelang->id?>-<?=$lang?>">
+                        <?php
+                        echo $form->field($images[$lang]['full'], "[{$lang}][full]language_id")->label(false)->hiddenInput(['value' => $lang]);
+                        echo $form->field($images[$lang]['full'], "[{$lang}][full]imageFile")->fileInput(['class' => 'image_inputs_field']);
+                        if(!empty($images[$lang]['full']->article_category_media_id)) {
+                            echo "<img src='/images/upload/{$images[$lang]['full']->media->hash}/original.{$images[$lang]['full']->media->extension}' width='100' class='image_inputs_prev'>";
+                        }
+                        ?>
+                    </div>
+                    <?php
+                    $first = 0;
+                }
+                $imagelang->end();
                 ?>
-                <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="image-<?=$index?>">
-                    <?php if($index == 'additional') {
-                        echo $form->field(is_array($image)?$images[$index][0]:$images[$index], "[{$index}]imageFile[]")->fileInput(['multiple' => 'multiple', 'class' => 'image_inputs_field']);
-                        if(is_array($image) && count($image) > 1) {
-                            foreach($image as $oneindex => $oneimage) {
-                                if($oneindex) {
-                                    ?>
-                                    <div class="additional_image_container">
-                                        <img src='/images/upload/<?= $oneimage->media->hash ?>/original.<?= $oneimage->media->extension ?>' width='100'>
-                                        <a
-                                            href="<?= Url::to(['ajax/remove-image-category']) ?>"
-                                            class="remove_image glyphicon glyphicon-remove-circle"
-                                            data-params='<?= Json::encode(['category_media_id' => $oneimage->id, 'remove_media' => true]) ?>',
-                                        ></a>
-                                    </div>
-                                    <?php
-                                }
-                            }
+            </div>
+            <div role="" class="tab-pane" id="image-preview">
+                <?php
+                $imagelang = Multilang::begin([
+                    'ajaxpath' => Url::to(['/blog/ajax/article-category-media-form?type=preview']),
+                    'form' => $form,
+                    'data_langs' => $category->getIsNewRecord()?$images:ArticleCategoryMedia::find()->where(['article_category_id' => $category->article_category_id, 'type' => 'preview'])->indexBy('language_id')->all()
+                ]);
+                $first = 1;
+                foreach($images as $lang => $value) {
+                    if(!array_key_exists('preview', $value)) continue;
+                    ?>
+                    <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="<?=$imagelang->id?>-<?=$lang?>">
+                        <?php
+                        echo $form->field($images[$lang]['preview'], "[{$lang}][preview]language_id")->label(false)->hiddenInput(['value' => $lang]);
+                        echo $form->field($images[$lang]['preview'], "[{$lang}][preview]imageFile")->fileInput(['class' => 'image_inputs_field']);
+                        if(!empty($images[$lang]['preview']->article_category_media_id)) {
+                            echo "<img src='/images/upload/{$images[$lang]['preview']->media->hash}/original.{$images[$lang]['preview']->media->extension}' width='100' class='image_inputs_prev'>";
                         }
-                    } else {
-                        echo $form->field($images[$index], "[{$index}]imageFile")->fileInput(['class' => 'image_inputs_field']);
-                        if(!empty($image->id)) {
-                            echo "<img src='/images/upload/{$image->media->hash}/original.{$image->media->extension}' width='100' class='image_inputs_prev'>";
+                        ?>
+                    </div>
+                    <?php
+                    $first = 0;
+                }
+                $imagelang->end();
+                ?>
+            </div>
+            <div role="" class="tab-pane" id="image-additional">
+                <?php
+                echo $form->field(is_array($images[0]['additional'])?$images[0]['additional'][0]:$images[0]['additional'], "[0][additional]imageFile[]")->fileInput(['multiple' => 'multiple', 'class' => 'image_inputs_field']);
+                if(is_array($images[0]['additional']) && count($images[0]['additional']) > 1) {
+                    foreach($images[0]['additional'] as $onefield => $oneimage) {
+                        if($onefield) {
+                            ?>
+                            <div class="additional_image_container">
+                                <img src='/images/upload/<?= $oneimage->media->hash ?>/original.<?= $oneimage->media->extension ?>' width='100'>
+                                <a
+                                    href="<?= Url::to(['ajax/remove-image']) ?>"
+                                    class="remove_image glyphicon glyphicon-remove-circle"
+                                    data-params='<?= Json::encode(['article_category_media_id' => $oneimage->article_category_media_id, 'remove_media' => true]) ?>',
+                                ></a>
+                            </div>
+                            <?php
                         }
                     }
-                    ?>
-                </div>
-                <?php
-                $first = 0;
-            }
-            ?>
+                }
+                ?>
+            </div>
         </div>
         <hr>
@@ -84,7 +117,7 @@ $uploaddir = \Yii::getAlias(&#39;@saveImageDir&#39;);
             foreach($category_langs as $index => $category_lang) {
                 ?>
                 <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="lang-<?=$index?>">
-                    <?= $form->field($category_langs[$index], "[$index]lang_id")->label(false)->hiddenInput(['value' => $index]) ?>
+                    <?= $form->field($category_langs[$index], "[$index]language_id")->label(false)->hiddenInput(['value' => $index]) ?>
                     <?= $form->field($category_langs[$index], "[$index]text")->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ], ]); ?>
@@ -98,11 +131,11 @@ $uploaddir = \Yii::getAlias(&#39;@saveImageDir&#39;);
                     <?= $form->field($category_langs[$index], "[$index]meta_descr")->textarea(); ?>
-                    <?= $form->field($category_langs[$index], "[$index]meta_keywords")->textInput() ?>
+                    <?= $form->field($category_langs[$index], "[$index]meta_keyword")->textInput() ?>
                     <?= $form->field($category_langs[$index], "[$index]h1_tag")->textInput() ?>
-                    <?= $form->field($category_langs[$index], "[$index]tags")->textInput() ?>
+                    <?= $form->field($category_langs[$index], "[$index]tag")->textInput() ?>
                 </div>
             <?php
@@ -7,15 +7,15 @@ use common\models\Language;
 echo GridView::widget([
     'dataProvider' => $dataProvider,
     'columns' => [
-        'id',
+        'article_category_id',
         'code',
-        'created_at',
-        'updated_at',
+        'date_add',
+        'date_update',
         [
             'class' => Column::className(),
             'header' => Yii::t('app', 'Name'),
             'content' => function($model, $key, $index, $column) {
-                return $model->getArticleCategoryLangs()->where(['lang_id' => Language::getDefaultLang()->language_id])->one()->name;
+                return $model->getArticleCategoryLangs()->where(['language_id' => Language::getDefaultLang()->language_id])->one()->name;
             }
         ],
         [
 <?php
+
+use yii\behaviors\BlameableBehavior;
+use yii\web\Application;
+
+$behavior = new BlameableBehavior();
+var_dump($behavior->value);
 \ No newline at end of file
@@ -58,9 +58,23 @@ return [
     'Category update' => 'Редактирование категории',
     'Article create' => 'Создание статьи',
     'Update category' => 'Редактирование категории',
-    'Select parent' => 'Выберать родителя',
+    'Select parent' => 'Выбрать родителя',
     'Blog' => 'Блог',
     'Static pages' => 'Статические страницы',
+    'Create Admin Menu' => 'Создать элемент меню',
+    'Admin Menus' => 'Административное меню',
+    'Hide Min' => 'Спрятать в свернутом',
+    'Path' => 'Путь',
+    'Params' => 'Параметры',
+    'Parent item' => 'Родительский элемент',
+    'Active Menu' => 'Активный',
+    'Not Active Menu' => 'Неактивный',
+    'Show Menu Min' => 'Отобразить',
+    'Hide Menu Min' => 'Спрятать',
+    'Update' => 'Редактировать',
+    'Delete' => 'Удалить',
+    'Settings categories' => 'Разделы настроек',
+    'Back' => 'Назад',
     // Вова
     'page' => 'Страница',
@@ -72,7 +86,7 @@ return [
     'meta_description' => 'Meta Description',
     'text' => 'Текст',
     'page_alias' => 'alias',
-    'lang_id' => 'ID языка',
+    'language_id' => 'ID языка',
     'common' => 'Общее',
     'lang' => 'Языковые переменные',
     'termin' => 'Термин',
@@ -14,7 +14,7 @@ return [
     'meta_description' => 'Meta Description',
     'text' => 'Текст',
     'page_alias' => 'alias',
-    'lang_id' => 'ID мови',
+    'language_id' => 'ID мови',
     'common' => 'Загальне',
     'lang' => 'Мовні змінні',
     'termin' => 'Термін',
+<?php
+namespace common\widgets;
+use common\models\Language;
+use common\modules\blog\controllers\AjaxController;
+use yii\base\InvalidParamException;
+use yii\base\Widget;
+use yii\bootstrap\ActiveForm;
+
+class Multilanguage extends Widget
+{
+    public $id;
+
+    public $model_name;
+
+    public $table_name;
+
+    public $langs;
+
+    public $default_lang;
+
+    public $data;
+
+    public $handler = '/blog/ajax/multilang-form';
+
+    public $form;
+
+    public $ajaxView;
+
+    public function init()
+    {
+        parent::init();
+        $this->default_lang = Language::getDefaultLang();
+        if(empty($this->langs)) {
+            $this->langs = Language::getActiveLanguages();
+        }
+        if(empty($this->form)) {
+            throw new InvalidParamException('Form must be set');
+        }
+        if(empty($this->ajaxView)) {
+            throw new InvalidParamException('Ajaxview must be set');
+        }
+        if(empty($this->data) || !is_array($this->data)) {
+            throw new InvalidParamException('Data must be set and be array');
+        } else {
+            $first = 1;
+            foreach ($this->data as $lang => $item) {
+                if ($first) {
+                    $this->model_name = $item->className();
+                    $this->table_name = $item->tableName();
+                    $first = 0;
+                } else {
+                    if($item->className() !== $this->model_name || $item->tableName() !== $this->table_name) {
+                        throw new InvalidParamException('Every data element must have the same class and table');
+                    }
+                }
+            }
+        }
+    }
+
+    public function run()
+    {
+        echo $this->render('multilanguage-begin', [
+            'id' => $this->id,
+            'model_name' => $this->model_name,
+            'table_name' => $this->table_name,
+            'data' => $this->data,
+            'langs' => $this->langs,
+            'handler' => $this->handler,
+            'default_lang' => $this->default_lang,
+            'ajaxView' => $this->ajaxView,
+        ]);
+        foreach($this->data as $lang => $item) {
+            $item->language_id = $lang;
+            echo $this->render($this->ajaxView, ['model' => $item, 'form' => $this->form, 'widget_id' => $this->id]);
+        }
+        echo $this->render('multilanguage-end', [
+            'id' => $this->id,
+            'model_name' => $this->model_name,
+            'table_name' => $this->table_name,
+            'data' => $this->data,
+            'langs' => $this->langs,
+            'handler' => $this->handler,
+            'default_lang' => $this->default_lang,
+            'ajaxView' => $this->ajaxView,
+        ]);
+    }
+}
 \ No newline at end of file
@@ -6,7 +6,7 @@ use yii\helpers\Url;
         <?= Yii::t('app', 'Add language') ?>
         <span class="caret"></span>
     </button>
-    <ul class="dropdown-menu f32" id="lang-<?=$id?>" aria-labelledby="<?=$id?>Menu">
+    <ul class="dropdown-menu f32 old" id="lang-<?=$id?>" aria-labelledby="<?=$id?>Menu">
         <?php foreach($langs as $index => $lang) {
             if(in_array($index, array_keys($data_langs))) continue;
             ?>
@@ -18,6 +18,7 @@ use yii\helpers\Url;
     <?php
     $first = 1;
     foreach($data_langs as $index => $data_lang) {
+        if(!$index) continue;
         ?>
         <li role="lang_inputs" class="<?php if($first) { echo 'active'; }?>" data-lang="<?=$index?>"><a href="#<?=$id?>-<?=$index?>" aria-controls="<?=$id?>-<?=$index?>" role="tab" data-toggle="tab"><span class="flag <?=$langs[$index]->country_code?>"></span></a></li>
         <?php
+<?php
+use yii\helpers\Url;
+?>
+<div class="dropdown pull-right">
+    <button class="btn btn-default dropdown-toggle" type="button" id="<?=$id?>Lang" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+        <?= Yii::t('app', 'Add language') ?>
+        <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu f32" id="lang-<?=$id?>" aria-labelledby="<?=$id?>Menu">
+        <?php foreach($langs as $index => $lang) {
+            if(in_array($index, array_keys($data))) continue;
+            ?>
+            <li><a href="#<?=$id?>" data-lang="<?=$lang->language_id?>"><span class="flag <?=$lang->country_code?>"></span></a></li>
+        <?php } ?>
+    </ul>
+</div>
+<ul class="nav nav-tabs f32" id="<?=$id?>-tabs" role="tablist">
+    <?php
+    foreach($data as $index => $data_lang) {
+        if(!$index) continue;
+        ?>
+        <li role="lang_inputs" data-lang="<?=$index?>"><a href="#<?=$id?>-<?=$index?>" aria-controls="<?=$id?>-<?=$index?>" role="tab" data-toggle="tab"><span class="flag <?=$langs[$index]->country_code?>"></span></a></li>
+        <?php
+    }
+    ?>
+</ul>
+<div class="tab-content lang-tab-content" id="tab-content-<?=$id?>">
+
+<?php
+use yii\helpers\Url;
+?>
+</div>
+<script>
+    if(typeof form === 'undefined') {
+        var form = [];
+    }
+    form['<?=$id?>'] = {handler:'<?=$handler?>', view:'<?=$ajaxView?>', model: '<?=str_replace("\\", "\\\\", $model_name)?>'};
+</script>
 \ No newline at end of file
@@ -16,9 +16,7 @@ return [
     'bootstrap' => ['log'],
     'controllerNamespace' => 'frontend\controllers',
     'modules' => [
-        'blog' => [
-            'class' => 'common\modules\blog\Module',
-        ],
+
     ],
     'components' => [ 
         //'PageController'=>[
@@ -68,7 +68,7 @@ class OptionValuesController extends Controller
             foreach($post['OptionValues']['option_value_text'] as $lang => $value) {
                 $models[$lang] = new OptionValues();
                 $models[$lang]->load(Yii::$app->request->post());
-                $models[$lang]->option_lang_id = $lang;
+                $models[$lang]->option_language_id = $lang;
                 $models[$lang]->option_value_text = $value;
                 if($first && $id) {
                     $models[$lang]->option_value_parent = $id;
@@ -36,7 +36,7 @@ class SiteController extends Controller
         return [
             'access' => [
                 'class' => AccessControl::className(),
-                'only' => ['logout', 'signup'],
+                'only' => ['logout', 'signup', 'index'],
                 'rules' => [
                     [
                         'actions' => ['signup'],
@@ -48,6 +48,11 @@ class SiteController extends Controller
                         'allow' => true,
                         'roles' => ['@'],
                     ],
+                    [
+                        'actions' => ['index'],
+                        'allow' => true,
+                        'roles' => ['@'],
+                    ]
                 ],
             ],
             'verbs' => [
@@ -298,10 +303,10 @@ class SiteController extends Controller
                     $option_values[$key] = new OptionValues();
                     $option_values[$key]['option_value_id'] = $options_to_values[$key]->getAttribute('option_value_id');
                     $option_values[$key]['option_value_text'] = $val['option_value'];
-                    if($options_to_values[$key]->option->getAttribute('option_translatable') == 0 || empty($val['option_lang_id'])) {
-                        $option_values[$key]['option_lang_id'] = 0;
+                    if($options_to_values[$key]->option->getAttribute('option_translatable') == 0 || empty($val['option_language_id'])) {
+                        $option_values[$key]['option_language_id'] = 0;
                     } else {
-                        $option_values[$key]['option_lang_id'] = $val['option_lang_id'];
+                        $option_values[$key]['option_language_id'] = $val['option_language_id'];
                     }
                     if(!$option_values[$key]->save()) {  
                         $options_to_values[$key]->delete();
@@ -61,6 +61,6 @@ class Language extends \yii\db\ActiveRecord
      */
     public function getOptionValues()
     {
-        return $this->hasMany(OptionValues::className(), ['option_lang_id' => 'language_id']);
+        return $this->hasMany(OptionValues::className(), ['option_language_id' => 'language_id']);
     }
 }
@@ -9,7 +9,7 @@ use Yii;
  *
  * @property integer $language_id
  * @property string $lang_title
- * @property integer $lang_id
+ * @property integer $language_id
  *
  * @property Language $language
  */
@@ -43,7 +43,7 @@ class LanguageLang extends \yii\db\ActiveRecord
         return [
             'language_id' => Yii::t('app', 'Language ID'),
             'lang_title' => Yii::t('app', 'Lang Title'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
         ];
     }
@@ -31,7 +31,7 @@ class Option extends \yii\db\ActiveRecord
     {
         return [
             [['model', 'model_id', 'name', 'template'], 'required'],
-            [['model_id', 'parent_id'], 'integer'],
+            [['model_id', 'option_pid'], 'integer'],
             [['model', 'name', 'template'], 'string', 'max' => 200]
         ];
     }
@@ -47,29 +47,30 @@ class Option extends \yii\db\ActiveRecord
             'model_id' => Yii::t('app', 'Model ID'),
             'name' => Yii::t('app', 'Name'),
             'template' => Yii::t('app', 'Template'),
-            'parent_id' => Yii::t('app', 'Parent ID'),
-            'created_at' => Yii::t('app', 'Date created'),
+            'option_pid' => Yii::t('app', 'Parent ID'),
+            'date_add' => Yii::t('app', 'Date created'),
+            'translate' => Yii::t('app', 'Translatable'),
         ];
     }
     public function getLangs() {
-        return (new Language())->find()->where(['>', 'language_id', 0])->andWhere(['active' => 1])->asArray()->all();
+        return (new Language())->find()->where(['>', 'language_id', 0])->andWhere(['status' => 1])->asArray()->all();
     }
     public static function change($id, $post, $modeldb, $model_id) {
         $models[$id] = Option::findOne($id);
         $modellang[$id] = array();
-        $langs = OptionLang::findAll(['id' => $id]);
+        $langs = OptionLang::findAll(['option_language_id' => $id]);
         foreach($langs as $lang) {
-            $modellang[$id][$lang->lang_id] = $lang;
+            $modellang[$id][$lang->language_id] = $lang;
         }
-        $children = (new Option())->find()->where(['parent_id' => $id])->all();
+        $children = (new Option())->find()->where(['option_pid' => $id])->all();
         foreach($children as $child) {
             $models[$child->option_id] = $child;
             $modellang[$child->option_id] = array();
-            $langs = OptionLang::findAll(['id' =>$child->option_id]);
+            $langs = OptionLang::findAll(['option_id' =>$child->option_id]);
             foreach($langs as $lang) {
-                $modellang[$child->option_id][$lang->lang_id] = $lang;
+                $modellang[$child->option_id][$lang->language_id] = $lang;
             }
         }
         $ok = 1;
@@ -77,7 +78,7 @@ class Option extends \yii\db\ActiveRecord
             foreach($post['Option'] as $key => $option) {
                 if(in_array($key, array('model', 'model_id'))) { continue; }
                 if(empty($option['value'][$models[$key]->name]) && !empty($option['lang'])) {
-                    foreach($option['lang'] as $lang_id => $lang) {
+                    foreach($option['lang'] as $language_id => $lang) {
                         if(!empty($lang)) {
                             $option['value'][$models[$key]->name] = $lang;
                             break;
@@ -91,16 +92,16 @@ class Option extends \yii\db\ActiveRecord
                     $modellang[$key][0]->addError('value', 'Value must be set');
                 }
                 if(!empty($option['lang'])) {
-                    foreach($option['lang'] as $lang_id => $lang) {
-                        if(empty($modellang[$key][$lang_id])) {
-                            $modellang[$key][$lang_id] = new OptionLang();
-                            $modellang[$key][$lang_id]->id = $models[$key]->option_id;
-                            $modellang[$key][$lang_id]->lang_id = $lang_id;
-                            $modellang[$key][$lang_id]->value = $lang;
+                    foreach($option['lang'] as $language_id => $lang) {
+                        if(empty($modellang[$key][$language_id])) {
+                            $modellang[$key][$language_id] = new OptionLang();
+                            $modellang[$key][$language_id]->option_id = $models[$key]->option_id;
+                            $modellang[$key][$language_id]->language_id = $language_id;
+                            $modellang[$key][$language_id]->value = $lang;
                         } else {
-                            $modellang[$key][$lang_id]->value = $lang;
+                            $modellang[$key][$language_id]->value = $lang;
                         }
-                        if(!$modellang[$key][$lang_id]->save()) {
+                        if(!$modellang[$key][$language_id]->save()) {
                             $ok = 0;
                         }
                     }
@@ -146,7 +147,7 @@ class Option extends \yii\db\ActiveRecord
                     $models[$index][$key]->translate = $option[$key]['translate']?1:0;
                     $models[$index][$key]->name = $key;
                     if(!$first) {
-                        $models[$index][$key]->parent_id = $parentid;
+                        $models[$index][$key]->option_pid = $parentid;
                     }
                     $modelslang[$index][$key][0] = new OptionLang();
                     if(!empty($option['lang'][$key])) {
@@ -161,16 +162,16 @@ class Option extends \yii\db\ActiveRecord
                         if($first) {
                             $parentid = $models[$index][$key]->option_id;
                         }
-                        $modelslang[$index][$key][0]->id = $models[$index][$key]->option_id;
-                        $modelslang[$index][$key][0]->lang_id = 0;
+                        $modelslang[$index][$key][0]->option_id = $models[$index][$key]->option_id;
+                        $modelslang[$index][$key][0]->language_id = 0;
                         $modelslang[$index][$key][0]->value = $value;
                         if($modelslang[$index][$key][0]->save()) {
                             if(!empty($option['lang'][$key])) {
                                 foreach($option['lang'][$key] as $code => $lang) {
                                     if(!empty($lang)) {
                                         $modelslang[$index][$key][$code] = new OptionLang();
-                                        $modelslang[$index][$key][$code]->id = $models[$index][$key]->option_id;
-                                        $modelslang[$index][$key][$code]->lang_id = $code;
+                                        $modelslang[$index][$key][$code]->option_id = $models[$index][$key]->option_id;
+                                        $modelslang[$index][$key][$code]->language_id = $code;
                                         $modelslang[$index][$key][$code]->value = $lang;
                                         if(!$modelslang[$index][$key][$code]->save()) {
                                             $ok = 0;
@@ -187,8 +188,8 @@ class Option extends \yii\db\ActiveRecord
                             foreach($option['lang'][$key] as $code => $lang) {
                                 if(!empty($lang)) {
                                     $modelslang[$index][$key][$code] = new OptionLang();
-                                    $modelslang[$index][$key][$code]->id = $models[$index][$key]->option_id;
-                                    $modelslang[$index][$key][$code]->lang_id = $code;
+                                    $modelslang[$index][$key][$code]->option_id = $models[$index][$key]->option_id;
+                                    $modelslang[$index][$key][$code]->language_id = $code;
                                     $modelslang[$index][$key][$code]->value = $lang;
                                 }
                             }
@@ -205,12 +206,12 @@ class Option extends \yii\db\ActiveRecord
             		$newflag->model_id = $model_id;
             		$newflag->name = 'is_new';
             		$newflag->template = 'checkbox';
-            		$newflag->parent_id = $parentid;
+            		$newflag->option_pid = $parentid;
             		$newflag->translate = 0;
             		if($newflag->save()) {
             			$newflaglang = new OptionLang();
-            			$newflaglang->id = $newflag->option_id;
-            			$newflaglang->lang_id = 0;
+            			$newflaglang->option_id = $newflag->option_id;
+            			$newflaglang->language_id = 0;
             			$newflaglang->value = '1';
             			if(!$newflaglang->save()) {
             				$newflag->delete();
@@ -242,19 +243,19 @@ class Option extends \yii\db\ActiveRecord
     }
     public function getOptions() {
-    	return $this->hasMany(Option::className(), ['parent_id' => 'option_id'])->indexBy('name');
+    	return $this->hasMany(Option::className(), ['option_pid' => 'option_id'])->indexBy('name');
     }
     public function getOption() {
-    	return $this->hasOne(Option::className(), ['option_id' => 'parent_id']);
+    	return $this->hasOne(Option::className(), ['option_id' => 'option_pid']);
     }
     public function getOptionLangs() {
-    	return $this->hasMany(OptionLang::className(), ['id' => 'option_id']);
+    	return $this->hasMany(OptionLang::className(), ['option_id' => 'option_id']);
     }
     public function getOptionDefaultLang($array = false) {
-    	$query = $this->getOptionLangs()->where(['lang_id' => 0]);
+    	$query = $this->getOptionLangs()->where(['language_id' => 0]);
     	if($array) {
     		$query->asArray();
     	}
@@ -8,7 +8,7 @@ use Yii;
  * This is the model class for table "option_lang".
  *
  * @property integer $id
- * @property integer $lang_id
+ * @property integer $language_id
  * @property string $value
  */
 class OptionLang extends \yii\db\ActiveRecord
@@ -27,8 +27,8 @@ class OptionLang extends \yii\db\ActiveRecord
     public function rules()
     {
         return [
-            [['id', 'lang_id'], 'required'],
-            [['id', 'lang_id'], 'integer'],
+            [['option_id', 'language_id'], 'required'],
+            [['option_id', 'language_id'], 'integer'],
             [['value'], 'string']
         ];
     }
@@ -39,8 +39,8 @@ class OptionLang extends \yii\db\ActiveRecord
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('app', 'ID'),
-            'lang_id' => Yii::t('app', 'Lang ID'),
+            'option_id' => Yii::t('app', 'ID'),
+            'language_id' => Yii::t('app', 'Lang ID'),
             'value' => Yii::t('app', 'Value'),
         ];
     }
@@ -18,7 +18,7 @@ class OptionLangSearch extends OptionLang
     public function rules()
     {
         return [
-            [['primary', 'id', 'lang_id'], 'integer'],
+            [['option_language_id', 'option_id', 'language_id'], 'integer'],
             [['value'], 'safe'],
         ];
     }
@@ -56,9 +56,9 @@ class OptionLangSearch extends OptionLang
         }
         $query->andFilterWhere([
-            'primary' => $this->primary,
-            'id' => $this->id,
-            'lang_id' => $this->lang_id,
+            'option_language_id' => $this->option_language_id,
+            'option_id' => $this->option_id,
+            'language_id' => $this->language_id,
         ]);
         $query->andFilterWhere(['like', 'value', $this->value]);
@@ -18,7 +18,7 @@ class OptionSearch extends Option
     public function rules()
     {
         return [
-            [['option_id', 'model_id', 'parent_id'], 'integer'],
+            [['option_id', 'model_id', 'option_pid'], 'integer'],
             [['model', 'name', 'template'], 'safe'],
         ];
     }
@@ -60,12 +60,12 @@ class OptionSearch extends Option
             return $dataProvider;
         }
-        $query->andWhere(['parent_id' => null]);
+        $query->andWhere(['option_pid' => null]);
         $query->andFilterWhere([
             'option_id' => $this->option_id,
             'model_id' => $this->model_id,
-            'parent_id' => $this->parent_id,
+            'option_pid' => $this->option_pid,
         ]);
         $query->andFilterWhere(['like', 'model', $this->model])
@@ -10,7 +10,7 @@ use Yii;
  * @property integer $option_value_id
  * @property string $option_key
  * @property string $option_value_text
- * @property integer $option_lang_id
+ * @property integer $option_language_id
  * @property integer $option_value_parent
  * @property integer $option_user
  *
@@ -33,7 +33,7 @@ class OptionValues extends \yii\db\ActiveRecord
     {
         return [
             [['option_key', 'option_value_text'], 'required'],
-            [['option_lang_id', 'option_value_parent', 'option_user'], 'integer'],
+            [['option_language_id', 'option_value_parent', 'option_user'], 'integer'],
             [['option_key'], 'string', 'max' => 200]
         ];
     }
@@ -47,7 +47,7 @@ class OptionValues extends \yii\db\ActiveRecord
             'option_value_id' => Yii::t('app', 'Option Value ID'),
             'option_key' => Yii::t('app', 'Option Key'),
             'option_value_text' => Yii::t('app', 'Option Value Text'),
-            'option_lang_id' => Yii::t('app', 'Option Lang ID'),
+            'option_language_id' => Yii::t('app', 'Option Lang ID'),
             'option_value_parent' => Yii::t('app', 'Option Value Parent'),
             'option_user' => Yii::t('app', 'Option User'),
         ];
@@ -58,7 +58,7 @@ class OptionValues extends \yii\db\ActiveRecord
      */
     public function getOptionLang()
     {
-        return $this->hasOne(Language::className(), ['language_id' => 'option_lang_id']);
+        return $this->hasOne(Language::className(), ['language_id' => 'option_language_id']);
     }
     public function getLanguages() {
         return (new LanguageLang())->find()->orderBy('language_id ASC')->asArray()->all();
@@ -18,7 +18,7 @@ class OptionValuesSearch extends OptionValues
     public function rules()
     {
         return [
-            [['option_value_id', 'option_lang_id', 'option_value_parent', 'option_user'], 'integer'],
+            [['option_value_id', 'option_language_id', 'option_value_parent', 'option_user'], 'integer'],
             [['option_key', 'option_value_text'], 'safe'],
         ];
     }
@@ -57,7 +57,7 @@ class OptionValuesSearch extends OptionValues
         $query->andFilterWhere([
             'option_value_id' => $this->option_value_id,
-            'option_lang_id' => $this->option_lang_id,
+            'option_language_id' => $this->option_language_id,
             'option_value_parent' => $this->option_value_parent,
             'option_user' => $this->option_user,
         ]);
@@ -17,7 +17,7 @@ use yii\widgets\ActiveForm;
 	<div class="optionvalues-option_value_text-active">
 	<?= $form->field($model, 'option_value_text', ['enableClientValidation' => false])->label($model->getAttributeLabel('option_key').' | <span class="glyphicon glyphicon-globe add-langs"></span>')->textInput() ?>
-    <?= $form->field($model, 'option_lang_id')->dropDownList($model->getDropDownArray()) ?>
+    <?= $form->field($model, 'option_language_id')->dropDownList($model->getDropDownArray()) ?>
     </div>
     <?= $form->field($model, 'option_value_parent')->dropDownList($model->getUserOptionsArray()) ?>
@@ -46,7 +46,7 @@ use yii\widgets\ActiveForm;
 		$(document).on('click', '.add-langs', function() {
 			var group = $(this).parent().attr('for');
 			$(this).parent().parent().appendTo('.reserved_inputs');
-			$('.field-optionvalues-option_lang_id').appendTo('.reserved_inputs');
+			$('.field-optionvalues-option_language_id').appendTo('.reserved_inputs');
 			$('.'+group+'-lang').appendTo('.'+group+'-active');
 		});
 		$(document).on('click', '.remove-langs', function() {
@@ -54,7 +54,7 @@ use yii\widgets\ActiveForm;
 			$(this).parent().parent().appendTo('.reserved_inputs');
 			console.log('field-'+group);
 			$('.reserved_inputs .field-'+group).appendTo('.'+group+'-active');
-			$('.field-optionvalues-option_lang_id').appendTo('.'+group+'-active');
+			$('.field-optionvalues-option_language_id').appendTo('.'+group+'-active');
 		});
 	});
 </script>
 \ No newline at end of file
@@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
     <?= $form->field($model, 'option_value_text') ?>
-    <?= $form->field($model, 'option_lang_id') ?>
+    <?= $form->field($model, 'option_language_id') ?>
     <?= $form->field($model, 'option_value_parent') ?>
@@ -28,7 +28,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'option_value_id',
             'option_key',
             'option_value_text:ntext',
-            'option_lang_id',
+            'option_language_id',
             'option_value_parent',
             // 'option_user',
@@ -31,7 +31,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] = $this-&gt;title;
             'option_value_id',
             'option_key',
             'option_value_text:ntext',
-            'option_lang_id',
+            'option_language_id',
             'option_value_parent',
             'option_user',
         ],
@@ -21,7 +21,7 @@ use yii\widgets\ActiveForm;
             <?php if($row->hasErrors()) { ?><div class="help-block"><?php echo $modellang[$id][0]->getFirstError('value');?></div> <?php } ?>
         	<?php
             if($row->translate) {
-                foreach($row->getLangs() as $lang_id => $lang) {
+                foreach($row->getLangs() as $language_id => $lang) {
                 ?>
                 <div class="form-group">
                 	<div class="col-xs-1"><?=$lang['lang_code']?></div>