#955

backend/config/main.php

@@ -14,6 +14,7 @@ return [
 	'language' => 'ru-RU',
 	'defaultRoute' => '/main/main-admin/index',
     'modules' => [
+		'languages' => ['class' => 'common\modules\languages\Module'],
 		'content' => ['class' => 'common\modules\content\Module'],
 		'faq' => ['class' => 'common\modules\faq\Module'],
 		'reviews' => ['class' => 'common\modules\reviews\Module'],

common/components/BaseController.php

@@ -51,7 +51,6 @@ abstract class BaseController extends Controller
 
     public function beforeAction($action)
     {
-
         /*if(substr($currentUrl, -1) == '/' && $currentUrl!="/") {
         	$urlWithoutSlash = substr($currentUrl, 0, -1);
         	return $this->redirect($urlWithoutSlash,true,301);
@@ -282,16 +281,6 @@ abstract class BaseController extends Controller
     }
 
 
-    protected function performAjaxValidation($model)
-    {
-        if (isset($_POST['ajax']))
-        {
-            echo CActiveForm::validate($model);
-            Yii::$app->end();
-        }
-    }
-
-
     /**
      * Возвращает модель по атрибуту и удовлетворяющую скоупам,
      * или выбрасывает 404

common/components/LangRequest.php

+<?php
+namespace common\components;
+
+use Yii;
+use yii\web\Request;
+use common\modules\languages\models\Languages;
+
+class LangRequest extends Request
+{
+    private $_lang_url;
+
+    public function getLangUrl()
+    {
+        if ($this->_lang_url === null) 
+        {
+	        $this->_lang_url = $this->getUrl();
+	        
+	    	$url_list = explode('/', $this->_lang_url);
+
+	    	$lang_url = isset($url_list[1]) ? $url_list[1] : null;
+
+	    	Languages::setCurrent($lang_url);
+
+            if( $lang_url !== null && $lang_url === Languages::getCurrent()->url && 
+                strpos($this->_lang_url, Languages::getCurrent()->url) === 1 )
+            {
+                $this->_lang_url = substr($this->_lang_url, strlen(Languages::getCurrent()->url) + 1);
+            }
+        }
+
+        return $this->_lang_url;
+    }
+
+    protected function resolvePathInfo()
+    {
+        $pathInfo = $this->getLangUrl();
+
+        if (($pos = strpos($pathInfo, '?')) !== false) 
+        {
+            $pathInfo = substr($pathInfo, 0, $pos);
+        }
+
+        $pathInfo = urldecode($pathInfo);
+
+        // try to encode in UTF8 if not so
+        // http://w3.org/International/questions/qa-forms-utf-8.html
+        if (!preg_match('%^(?:
+            [\x09\x0A\x0D\x20-\x7E]              # ASCII
+            | [\xC2-\xDF][\x80-\xBF]             # non-overlong 2-byte
+            | \xE0[\xA0-\xBF][\x80-\xBF]         # excluding overlongs
+            | [\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}  # straight 3-byte
+            | \xED[\x80-\x9F][\x80-\xBF]         # excluding surrogates
+            | \xF0[\x90-\xBF][\x80-\xBF]{2}      # planes 1-3
+            | [\xF1-\xF3][\x80-\xBF]{3}          # planes 4-15
+            | \xF4[\x80-\x8F][\x80-\xBF]{2}      # plane 16
+            )*$%xs', $pathInfo)
+        ) 
+        {
+            $pathInfo = utf8_encode($pathInfo);
+        }
+
+        $scriptUrl = $this->getScriptUrl();
+        $baseUrl = $this->getBaseUrl();
+
+        if (strpos($pathInfo, $scriptUrl) === 0) 
+        {
+            $pathInfo = substr($pathInfo, strlen($scriptUrl));
+        } 
+        elseif ($baseUrl === '' || strpos($pathInfo, $baseUrl) === 0) 
+        {
+            $pathInfo = substr($pathInfo, strlen($baseUrl));
+        } 
+        elseif (isset($_SERVER['PHP_SELF']) && strpos($_SERVER['PHP_SELF'], $scriptUrl) === 0) 
+        {
+            $pathInfo = substr($_SERVER['PHP_SELF'], strlen($scriptUrl));
+        } 
+        else 
+        {
+            throw new InvalidConfigException('Unable to determine the path info of the current request.');
+        }
+
+        if ($pathInfo[0] === '/') 
+        {
+            $pathInfo = substr($pathInfo, 1);
+        }
+
+        return (string) $pathInfo;
+    }
+}
\ No newline at end of file

common/components/UrlManager.php

 <?php
 namespace common\components;
+
+use common\modules\languages\models\Languages;
+
 class UrlManager extends \yii\web\UrlManager {
 
     public function parseRequest($request){
@@ -7,11 +10,44 @@ class UrlManager extends \yii\web\UrlManager {
         $rules = [];
         foreach($pages as $page) {
             //$rules[$page->url] = \yii\helpers\Url::toRoute(['/content/page/view','id' => $page->id]);
-            $rules['<page:('.$page->url.')>'] = \yii\helpers\Url::toRoute(['/content/page/view']);
+            $rules['<page:('.$page->url.')>'] = 'content/page/view';
         }
         $this->addRules($rules, false);
         //die(print_r($request->getPathInfo()));
         return parent::parseRequest($request);
     }
 
+    public function createUrl($params)
+    {
+        if(isset($params['lang_id']))
+        {
+            //Если указан идентификатор языка, то делаем попытку найти язык в БД,
+            //иначе работаем с языком по умолчанию
+            $lang = Languages::findOne($params['lang_id']);
+            if($lang === null)
+            {
+                $lang = Languages::getDefaultLang();
+            }
+
+            unset($params['lang_id']);
+        } 
+        else 
+        {
+            //Если не указан параметр языка, то работаем с текущим языком
+            $lang = Languages::getCurrent();
+        }
+        
+        //Получаем сформированный URL(без префикса идентификатора языка)
+        $url = parent::createUrl($params);
+        
+        //Добавляем к URL префикс - буквенный идентификатор языка
+        if($url == '/')
+        {
+            return '/' . $lang->url;
+        }
+        else
+        {
+            return '/' . $lang->url . $url;
+        }
+    }
 }

common/components/activeRecordBehaviors/MetaTagBehavior.php

@@ -7,9 +7,6 @@ use \common\models\MetaTags;
 
 class MetaTagBehavior extends Behavior
 {
-
-    public $language = 'ru';
-
     public function events()
     {
         return [
@@ -21,13 +18,15 @@ class MetaTagBehavior extends Behavior
 
     public function Save($event)
     {
-        $attributes = \Yii::$app->request->post('MetaTags');
-        if ($attributes)
+        $meta = \Yii::$app->request->post('MetaTags');
+        if ($meta)
+        {
+            foreach ($meta as $lang_id => $attributes) 
             {
                 $meta_tag = MetaTags::find()->where([
                     'object_id' => $this->owner->id,
                     'model_id'  => get_class($this->owner),
-                'language' => $this->language,
+                    'lang_id' => $lang_id,
                 ])->one();
 
                 if (!$meta_tag)
@@ -37,48 +36,44 @@ class MetaTagBehavior extends Behavior
 
                 $attributes['object_id'] = $this->owner->id;
                 $attributes['model_id']  = get_class($this->owner);
-            $attributes['language'] = $this->language;
+                $attributes['lang_id'] = $lang_id;
 
                 $meta_tag->setAttributes( $attributes );
                 if(!$meta_tag->save()) die(print_r($meta_tag->errors));
             }
+        }
 
         return true;
     }
 
     public function Insert($event)
     {
-        $attributes = \Yii::$app->request->post('MetaTags');
-        if ($attributes )
+        $meta = \Yii::$app->request->post('MetaTags');
+        if ($meta)
+        {
+            foreach ($meta as $lang_id => $attributes) 
             {
                 $meta_tag = new MetaTags;
 
                 $attributes['object_id'] = $this->owner->id;
                 $attributes['model_id']  = get_class($this->owner);
-            $attributes['language'] = 'ru';
+                $attributes['lang_id'] = $lang_id;
 
-                $meta_tag->setAttributes( $attributes );
+                $meta_tag->setAttributes($attributes);
                 $meta_tag->save(false);
             }
+        }
 
         return true;
     }
 
     public function Delete($event)
     {
-
-        $model = MetaTags::find()
-            ->where([
+        MetaTags::deleteAll([
             'object_id' => $this->owner->id,
             'model_id'  => get_class($this->owner)
-            ])->one();
-         if(!empty($model)) $model->delete();
+        ]);
 
         return true;
     }
-
-
-
-
-
 }

common/models/MetaTags.php

@@ -37,12 +37,11 @@ class MetaTags extends \common\components\ActiveRecordModel
     public function rules()
     {
         return [
-            [['object_id', 'model_id', 'language'], 'required'],
-            [['object_id', 'created_at', 'updated_at'], 'integer'],
+            [['object_id', 'model_id', 'lang_id'], 'required'],
+            [['object_id', 'created_at', 'updated_at', 'lang_id'], 'integer'],
             [['model_id'], 'string', 'max' => 50],
-            [['language'], 'string', 'max' => 5],
             [['title', 'keywords', 'description'], 'string', 'max' => 300],
-            [['object_id', 'model_id'], 'unique', 'targetAttribute' => ['object_id', 'model_id'], 'message' => 'The combination of ID объекта and Модель has already been taken.']
+            [['object_id', 'model_id', 'lang_id'], 'unique', 'targetAttribute' => ['object_id', 'model_id', 'lang_id'], 'message' => 'The combination of ID объекта and Модель has already been taken.']
         ];
     }
 
@@ -55,10 +54,10 @@ class MetaTags extends \common\components\ActiveRecordModel
             'id' => Yii::t('content', 'ID'),
             'object_id' => Yii::t('content', 'ID объекта'),
             'model_id' => Yii::t('content', 'Модель'),
-            'language' => Yii::t('content', 'Язык'),
-            'title' => /*Yii::t('content', 'Заголовок')*/'Title',
-            'keywords' => /*Yii::t('content', 'Ключевые слова')*/'Keywords',
-            'description' => /*Yii::t('content', 'Описание')*/ 'Description',
+            'lang_id' => Yii::t('content', 'Язык'),
+            'title' => 'Title',
+            'keywords' => 'Keywords',
+            'description' => 'Description',
             'created_at' => Yii::t('content', 'Создано'),
             'updated_at' => Yii::t('content', 'Отредактирован'),
         ];

common/modules/content/components/CoContentLangBehavior.php

+<?php
+namespace common\modules\content\components;
+
+use Yii;
+use yii\base\Behavior;
+use yii\db\ActiveRecord;
+use common\modules\content\models\CoContentLang;
+
+class CoContentLangBehavior extends Behavior
+{
+    public function events()
+    {
+        return [
+            ActiveRecord::EVENT_AFTER_UPDATE => 'Save',
+            ActiveRecord::EVENT_AFTER_INSERT => 'Insert',
+            ActiveRecord::EVENT_AFTER_DELETE => 'Delete',
+        ];
+    }
+
+    public function Save($event)
+    {
+        $langs = Yii::$app->request->post('CoContentLang');
+        if ($langs)
+        {
+            foreach ($langs as $lang_id => $attributes) 
+            {
+                $lang = CoContentLang::find()->where([
+                    'content_id' => $this->owner->id,
+                    'lang_id' => $lang_id,
+                ])->one();
+
+                if (!$lang)
+                {
+                    $lang = new CoContentLang;
+                }
+
+                $attributes['content_id'] = $this->owner->id;
+                $attributes['lang_id'] = $lang_id;
+
+                $lang->setAttributes( $attributes );
+                if(!$lang->save()) die(print_r($lang->errors));
+            }
+        }
+
+        return true;
+    }
+
+    public function Insert($event)
+    {
+        $langs = Yii::$app->request->post('CoContentLang');
+        if ($langs)
+        {
+            foreach ($langs as $lang_id => $attributes) 
+            {
+                $meta_tag = new CoContentLang;
+
+                $attributes['content_id'] = $this->owner->id;
+                $attributes['lang_id'] = $lang_id;
+
+                $meta_tag->setAttributes($attributes);
+                $meta_tag->save(false);
+            }
+        }
+
+        return true;
+    }
+
+    public function Delete($event)
+    {
+        CoContentLang::deleteAll([
+            'content_id' => $this->owner->id
+        ]);
+
+        return true;
+    }
+}

common/modules/content/controllers/ContentAdminController.php

@@ -2,17 +2,20 @@
 
 namespace common\modules\content\controllers;
 
-use common\models\MetaTags;
 use Yii;
-use common\modules\content\models\CoContent;
-use common\modules\content\models\CoContentData;
-use common\modules\content\models\SearchCoContent;
-use common\modules\content\models\SearchCoContentData;
 use common\components\AdminController;
 use yii\web\NotFoundHttpException;
 use yii\filters\VerbFilter;
 use yii\web\UploadedFile;
 
+use common\modules\content\models\CoContent;
+use common\modules\content\models\CoContentLang;
+use common\modules\languages\models\Languages;
+use common\modules\content\models\SearchCoContent;
+use common\modules\content\models\SearchCoContentData;
+use common\models\MetaTags;
+
+
 /**
  * ContentAdminController implements the CRUD actions for CoContent model.
  */
@@ -25,9 +28,6 @@ class ContentAdminController extends AdminController
 			'Update' 		  => 'Редактирование контента',
 			'Delete' 		  => 'Удаление контента',
 			'View'	 		  => 'Просмотр контента',
-			'Createcontent'	  => 'Добавление данных контента',
-			'Updatecontent'   => 'Редактирование данных контента',
-			'Deletecontent'   => 'Удаление данных контента',
             'Copypage'        => '',
 		];
 	}
@@ -87,15 +87,9 @@ class ContentAdminController extends AdminController
      */
     public function actionView($id)
     {
-        $searchModel = new SearchCoContentData();
-        $dataProvider = $searchModel->search(['content_id'=>$id]);
-
         return $this->render('view', [
-            'searchModel' => $searchModel,
-            'dataProvider' => $dataProvider,
 			'model' => $this->findModel($id),
         ]);
-
     }
 
     /**
@@ -105,12 +99,63 @@ class ContentAdminController extends AdminController
      */
     public function actionCreate()
     {
-        return $this->actionUpdate();
+        $model = new CoContent;
+        $langs = [];
+        $meta = [];
+
+        foreach (Languages::find()->all() as $lang) 
+        {
+            $lng = new CoContentLang;
+            $lng->lang_id = $lang->id;
+            $langs[$lang->id] = $lng;
+
+            $mt = new \common\models\MetaTags;
+            $mt->lang_id = $lang->id;
+            $meta[$lang->id] = $mt;
         }        
         
-	public function actionCreatecontent($content_id)
+        Yii::$app->controller->page_title = 'Добавить страницу';
+    
+        Yii::$app->controller->breadcrumbs = [
+            ['Управление контентом' => \yii\helpers\Url::toRoute('manage')],
+            'Добавить страницу',
+        ];
+
+        if (Yii::$app->request->isPost) 
         {
-        return $this->actionUpdatecontent($content_id);
+            $transaction = Yii::$app->db->beginTransaction();
+
+            try 
+            {
+                $model->attributes = Yii::$app->request->post('CoContent');
+                $model->image = UploadedFile::getInstance($model, 'image');
+
+                if($model->validate())
+                {
+                    if($model->image)
+                    {
+                        $model->upload();
+                        $model->image = null;
+                    }
+                        
+                    $model->save();
+
+                    $transaction->commit();
+                    return $this->redirect(['manage']);
+                }
+            } 
+            catch (\Exception $e) 
+            {
+                $transaction->rollBack();
+                throw $e;
+            }
+        } 
+
+        return $this->render('create', [
+            'model' => $model,
+            'meta' => $meta,
+            'langs' => $langs
+        ]);
     }
 
     /**
@@ -119,36 +164,52 @@ class ContentAdminController extends AdminController
      * @param integer $id
      * @return mixed
      */
-    public function actionUpdate($id = null)
+    public function actionUpdate($id)
     {
-        if(empty($id)) {
-			$model = new CoContent();
+		$model = $this->findModel($id);
+        $langs = [];
+        $meta = [];
 
-            $meta = new \common\models\MetaTags;
-            $meta->language = 'ru';
+        foreach (Languages::find()->all() as $lang) 
+        {
+            $mt = $model->getMetaTags($lang->id)->one();
 
-			\yii::$app->controller->page_title = 'Добавить страницу';
+            if(!$mt)
+            {
+                $mt = new \common\models\MetaTags;
+                $mt->lang_id = $lang->id;
+            }      
 
-			\yii::$app->controller->breadcrumbs = [
-					['Управление контентом' => \yii\helpers\Url::toRoute('manage')],
-					'Добавить страницу',
-				];
+            $meta[$lang->id] = $mt;
+
+            $lng = $model->getContent($lang->id)->one();
+
+            if(!$lng)
+            {
+                $lng = new CoContentLang;
+                $lng->lang_id = $lang->id;
             }
-		else {
-			$model = $this->findModel($id);
-			$meta = $model->metaTags;
-			\yii::$app->controller->page_title = 'Редактировать страницу';
             
-			\yii::$app->controller->breadcrumbs = [
+            $langs[$lang->id] = $lng;
+        }
+
+		Yii::$app->controller->page_title = 'Редактировать страницу';
+	
+		Yii::$app->controller->breadcrumbs = [
 			['Управление контентом' => \yii\helpers\Url::toRoute('manage')],
 			$model->name,
 		];
-		}
 
-        $model->load(Yii::$app->request->post());
+        if (Yii::$app->request->isPost) 
+        {
+            $transaction = Yii::$app->db->beginTransaction();
+
+            try 
+            {
+                $model->attributes = Yii::$app->request->post('CoContent');
                 $model->image = UploadedFile::getInstance($model, 'image');
 
-        if (Yii::$app->request->isPost && $model->validate()) 
+                if($model->validate())
                 {
                     if($model->image)
                     {
@@ -163,50 +224,23 @@ class ContentAdminController extends AdminController
                         
                     $model->save();
 
+                    $transaction->commit();
                     return $this->redirect(['manage']);
                 }
-
-        $form = new \common\components\BaseForm('/common/modules/content/forms/ContentForm', $model);
-		return $this->render('update', [
-            'model' => $model,
-            'meta' => $meta,
-			'form' => $form->out,
-        ]);
             } 
-	
-	public function actionUpdatecontent($content_id, $id = null)
+            catch (\Exception $e) 
             {
-        if(empty($id)) {
-			$model = new CoContentData();
-			$model->content_id = $content_id;
-			\yii::$app->controller->page_title = 'Добавить данные контента';
-		
-			\yii::$app->controller->breadcrumbs = [
-					['Управление данными контента' => \yii\helpers\Url::toRoute(['view', 'id'=>$content_id])],
-					'Добавить данные контента',
-				];
+                $transaction->rollBack();
+                throw $e;
             }
-		else {
-			$model = $this->findModelData($id);
-
-			\yii::$app->controller->page_title = 'Редактировать данные контента <small>' . $model->title . '</small>';
-		
-			\yii::$app->controller->breadcrumbs = [
-					['Управление данными контента' => \yii\helpers\Url::toRoute('manage')],
-					'Редактировать данные контента ' . $model->title,
-				];
         }
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->content_id]);
-        } else {
-            $form = new \common\components\BaseForm('/common/modules/content/forms/ContentDataForm', $model);
-			return $this->render('updatecontent', [
+		return $this->render('update', [
             'model' => $model,
-				'form' => $form->out,
+            'meta' => $meta,
+            'langs' => $langs,
         ]);
     }
-    }
 
     /**
      * Deletes an existing CoContent model.
@@ -236,13 +270,4 @@ class ContentAdminController extends AdminController
             throw new NotFoundHttpException('The requested page does not exist.');
         }
     }
-	
-	protected function findModelData($id)
-    {
-        if (($model = CoContentData::findOne($id)) !== null) {
-            return $model;
-        } else {
-            throw new NotFoundHttpException('The requested page does not exist.');
-        }
-    }
 }

common/modules/content/forms/ContentDataForm.php

-<?php
-
-use yii\helpers\ArrayHelper;
-
-return [
-    'activeForm'=>[
-        'id' => 'controller-form',
-    ],
-    'elements'       => [
-		'content_id' => [
-			'type'  => 'dropdownlist',
-            'items' => ArrayHelper::map(\common\modules\content\models\CoContent::find()->all(), 'id', 'name'),
-			'class' => 'form-control',
-		],
-		'title'				=> ['type' => 'text', 'class' => 'form-control'],
-		'short_description'	=> ['type' => 'textarea', 'class' => 'form-control'],
-		'description'		=> ['type' => 'textarea', 'class' => 'form-control'],
-    ],
-    'buttons' => [
-        'submit' => ['type' => 'submit', 'value' => 'Cохранить']
-    ]
-];
-
-

common/modules/content/models/CoBlocks.php

@@ -37,7 +37,7 @@ class CoBlocks extends \common\components\ActiveRecordModel
         return [
             [['title', 'name', 'text'], 'required'],
             [['text'], 'string'],
-            [['date_create', 'category_id'], 'safe'],
+            [['category_id'], 'safe'],
             [['lang'], 'string', 'max' => 2],
             [['module'], 'string', 'max' => 100],
             [['title'], 'string', 'max' => 250],
@@ -58,11 +58,17 @@ class CoBlocks extends \common\components\ActiveRecordModel
             'title' => Yii::t('content', 'Заголовок'),
             'name' => Yii::t('content', 'Наименование виджета'),
             'text' => Yii::t('content', 'Текст'),
-            'date_create' => Yii::t('content', 'Добавлено'),
             'category_id' => 'Категория',
         ];
     }
 
+    public function getContent($lang_id = null)
+    {
+        $lang_id = ($lang_id === null)? Languages::getCurrent()->id: $lang_id;
+
+        return $this->hasOne(CoBlocksLang::className(), ['block_id' => 'id'])->where('lang_id = :lang_id', [':lang_id' => $lang_id]);
+    }
+
     /**
      * @block string name block
      * @return HTML string
@@ -74,7 +80,7 @@ class CoBlocks extends \common\components\ActiveRecordModel
 
     public static function printStaticBlock($block, $addPath = false)
     {
-        return \yii::$app->getView()->render( '@app/views/layouts/block/' . $block . '.php');
+        return Yii::$app->getView()->render( '@app/views/layouts/block/' . $block . '.php');
     }
 
     public function afterFind() {

common/modules/content/models/CoContentData.php → common/modules/content/models/CoBlocksLang.php

@@ -5,30 +5,26 @@ namespace common\modules\content\models;
 use Yii;
 
 /**
- * This is the model class for table "co_content_data".
+ * This is the model class for table "co_blocks_lang".
  *
  * @property integer $id
- * @property integer $content_id
+ * @property integer $block_id
+ * @property integer $lang_id
+ * @property string $name
  * @property string $title
- * @property string $short_description
- * @property string $description
- * @property integer $created_at
- * @property integer $updated_at
+ * @property string $text
  *
- * @property CoContent $content
+ * @property CoBlocks $block
+ * @property Languages $lang
  */
-class CoContentData extends \common\components\ActiveRecordModel
+class CoBlocksLang extends \common\components\ActiveRecordModel
 {
     /**
      * @inheritdoc
      */
     public static function tableName()
     {
-        return 'co_content_data';
-    }
-	
-	public function name() {
-		return 'Содержание контента';
+        return 'co_blocks_lang';
     }
 
     /**
@@ -37,10 +33,13 @@ class CoContentData extends \common\components\ActiveRecordModel
     public function rules()
     {
         return [
-            [['content_id', 'created_at', 'updated_at'], 'integer'],
-            [['description'], 'string'],
+            [['block_id', 'lang_id', 'name', 'title'], 'required'],
+            [['block_id', 'lang_id'], 'integer'],
+            [['text'], 'string'],
+            [['name'], 'string', 'max' => 50],
             [['title'], 'string', 'max' => 250],
-            [['short_description'], 'string', 'max' => 255]
+            [['block_id'], 'exist', 'skipOnError' => true, 'targetClass' => CoBlocks::className(), 'targetAttribute' => ['block_id' => 'id']],
+            [['lang_id'], 'exist', 'skipOnError' => true, 'targetClass' => Languages::className(), 'targetAttribute' => ['lang_id' => 'id']],
         ];
     }
 
@@ -50,21 +49,28 @@ class CoContentData extends \common\components\ActiveRecordModel
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('content', 'ID'),
-            'content_id' => Yii::t('content', 'Content ID'),
-            'title' => Yii::t('content', 'Title'),
-            'short_description' => Yii::t('content', 'Short Description'),
-            'description' => Yii::t('content', 'Description'),
-            'created_at' => Yii::t('content', 'Created At'),
-            'updated_at' => Yii::t('content', 'Updated At'),
+            'id' => 'ID',
+            'block_id' => 'Block ID',
+            'lang_id' => 'Lang ID',
+            'name' => 'Name',
+            'title' => 'Title',
+            'text' => 'Text',
         ];
     }
 
     /**
      * @return \yii\db\ActiveQuery
      */
-    public function getContent()
+    public function getBlock()
+    {
+        return $this->hasOne(CoBlocks::className(), ['id' => 'block_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getLang()
     {
-        return $this->hasOne(CoContent::className(), ['id' => 'content_id']);
+        return $this->hasOne(Languages::className(), ['id' => 'lang_id']);
     }
 }

common/modules/content/models/CoContent.php

@@ -5,7 +5,7 @@ namespace common\modules\content\models;
 use Yii;
 use common\modules\content\models\CoBlocks;
 use common\models\MetaTags;
-use yii\base\Controller;
+
 /**
  * This is the model class for table "co_content".
  *
@@ -43,6 +43,9 @@ class CoContent extends \common\components\ActiveRecordModel
         return [
             'meta' => [
                 'class' => 'common\components\activeRecordBehaviors\MetaTagBehavior',
+            ],
+            'langs' => [
+                'class' => 'common\modules\content\components\CoContentLangBehavior',
             ]
         ];
     }
@@ -60,11 +63,11 @@ class CoContent extends \common\components\ActiveRecordModel
     public function rules()
     {
         return [
-            [['active', 'created_at', 'updated_at'], 'integer'],
+            [['active'], 'integer'],
             [['image'], 'file', 'skipOnEmpty' => true, 'extensions' => 'png, jpg, jpeg, gif'],
-            [['url', 'name', 'text'], 'required'],
-            [['url', 'name', 'title'], 'string', 'max' => 250],
-            [['category_id', 'text'], 'safe']
+            [['url'], 'required'],
+            [['url'], 'string', 'max' => 250],
+            [['category_id'], 'safe']
         ];
     }
 
@@ -90,15 +93,18 @@ class CoContent extends \common\components\ActiveRecordModel
     /**
      * @return \yii\db\ActiveQuery
      */
-    public function getMetaTags() {
-        return $this->hasOne(MetaTags::className(), [
-             'object_id' => 'id',
-            /*            */
-        ])->where([
-            'model_id'  => get_class($this),
-            'language' => 'ru',]);
+    public function getMetaTags($lang_id = null) 
+    {
+        $query = $this->hasOne(MetaTags::className(), ['object_id' => 'id'])->where(['model_id'  => get_class($this)]);
 
+        if($lang_id)
+        {
+            $query->andWhere(['lang_id' => $lang_id]);
         }
+
+        return $query;
+    }
+
     /**
      * @return \yii\db\ActiveQuery
      */
@@ -107,40 +113,16 @@ class CoContent extends \common\components\ActiveRecordModel
         return $this->hasOne(CoCategory::className(), ['id' => 'category_id']);
     }
 
-    /**
-     * @return html
-     */
-    public function getContent() {
-        $content = $this->text;
-        $content = \common\components\AppManager::prepareWidget($content);
-        $blocks = CoBlocks::find()->all();
-        $arrWhatReplace = [];
-        $arrReplace = [];
-        $arrWhatReplaceNext = [];
-        $arrReplaceNext = [];
-        foreach($blocks as $block) {
-            $arrWhatReplace[] = '{' . $block->name . '}';
-            $arrReplace[] = $block->text;
-            $arrWhatReplaceNext[] = '[' . $block->name . ']';
-            $arrReplaceNext[] = $block->text;
-        }
-
-        $arrWhatReplaceNext[] = '[about-reviews]';
-        $arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('about-reviews', true);
-        $arrWhatReplaceNext[] = '[content-phone]';
-        $arrReplaceNext[] = \common\models\Settings::getValue('content-phone');
-        $arrWhatReplaceNext[] = '[cases]';
-        $arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('cases', true);
-        $arrWhatReplaceNext[] = '[projects]';
-        $arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('projects', true);
-        $arrWhatReplaceNext[] = '[case-subscribe]';
-        $arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('case-subscribe', true);
-        $arrWhatReplaceNext[] = '[footer]';
-        $arrReplaceNext[] = \Yii::$app->getView()->render('@app/views/layouts/footer');
-        $arrWhatReplaceNext[] = '[footer-index]';
-        $arrReplaceNext[] = \Yii::$app->getView()->render('@app/views/layouts/footer-index');
-
-        return str_replace($arrWhatReplaceNext, $arrReplaceNext,str_replace($arrWhatReplace, $arrReplace, $content));
+    public function getContent($lang_id = null)
+    {
+        $lang_id = ($lang_id === null)? Languages::getCurrent()->id: $lang_id;
+
+        return $this->hasOne(CoContentLang::className(), ['content_id' => 'id'])->where('lang_id = :lang_id', [':lang_id' => $lang_id]);
+    }
+
+    public function getLangs()
+    {
+        return $this->hasMany(CoContentLang::className(), ['content_id' => 'id']);
     }
 
     public function beforeSave($insert) {

common/modules/content/models/CoContentLang.php

+<?php
+
+namespace common\modules\content\models;
+
+use Yii;
+
+use common\modules\content\models\CoContent;
+use common\modules\languages\models\Languages;
+
+/**
+ * This is the model class for table "co_content_lang".
+ *
+ * @property integer $id
+ * @property integer $content_id
+ * @property integer $lang_id
+ * @property string $name
+ * @property string $title
+ * @property string $text
+ *
+ * @property CoContent $content
+ * @property Languages $lang
+ */
+class CoContentLang extends \common\components\ActiveRecordModel
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'co_content_lang';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['content_id', 'lang_id', 'name', 'title'], 'required'],
+            [['content_id', 'lang_id'], 'integer'],
+            [['text'], 'string'],
+            [['name', 'title'], 'string', 'max' => 250],
+            [['content_id'], 'exist', 'skipOnError' => true, 'targetClass' => CoContent::className(), 'targetAttribute' => ['content_id' => 'id']],
+            [['lang_id'], 'exist', 'skipOnError' => true, 'targetClass' => Languages::className(), 'targetAttribute' => ['lang_id' => 'id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function name() 
+    {
+        return 'Языковой контент';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => Yii::t('content', 'ID'),
+            'name' => Yii::t('content', 'Name'),
+            'image' => 'Превью',
+            'title' => Yii::t('content', 'Title'),
+            'text' => Yii::t('content', 'Content'),
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getLang()
+    {
+        return $this->hasOne(Languages::className(), ['id' => 'lang_id']);
+    }
+
+    /**
+     * @return html
+     */
+    public function getContent() 
+    {
+        $content = $this->text;
+        $content = \common\components\AppManager::prepareWidget($content);
+        $blocks = CoBlocks::find()->all();
+        $arrWhatReplace = [];
+        $arrReplace = [];
+        $arrWhatReplaceNext = [];
+        $arrReplaceNext = [];
+        foreach($blocks as $block) {
+            $arrWhatReplace[] = '{' . $block->name . '}';
+            $arrReplace[] = $block->text;
+            $arrWhatReplaceNext[] = '[' . $block->name . ']';
+            $arrReplaceNext[] = $block->text;
+        }
+
+        $arrWhatReplaceNext[] = '[about-reviews]';
+        $arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('about-reviews', true);
+        $arrWhatReplaceNext[] = '[content-phone]';
+        $arrReplaceNext[] = \common\models\Settings::getValue('content-phone');
+        $arrWhatReplaceNext[] = '[cases]';
+        $arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('cases', true);
+        $arrWhatReplaceNext[] = '[projects]';
+        $arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('projects', true);
+        $arrWhatReplaceNext[] = '[case-subscribe]';
+        $arrReplaceNext[] = \common\modules\content\models\CoBlocks::printStaticBlock('case-subscribe', true);
+        $arrWhatReplaceNext[] = '[footer]';
+        $arrReplaceNext[] = \Yii::$app->getView()->render('@app/views/layouts/footer');
+        $arrWhatReplaceNext[] = '[footer-index]';
+        $arrReplaceNext[] = \Yii::$app->getView()->render('@app/views/layouts/footer-index');
+
+        return str_replace($arrWhatReplaceNext, $arrReplaceNext,str_replace($arrWhatReplace, $arrReplace, $content));
+    }
+}

common/modules/content/models/SearchCoBlocks.php

@@ -19,7 +19,7 @@ class SearchCoBlocks extends CoBlocks
     {
         return [
             [['id'], 'integer'],
-            [['lang', 'title', 'name', 'text', 'date_create', 'category_id'], 'safe'],
+            [['lang', 'title', 'name', 'text', 'category_id'], 'safe'],
         ];
     }
 
@@ -57,7 +57,6 @@ class SearchCoBlocks extends CoBlocks
 
         $query->andFilterWhere([
             'id' => $this->id,
-            'date_create' => $this->date_create,
             'category_id' => $this->category_id,
         ]);
 

common/modules/content/views/content-admin/_form.php

@@ -2,32 +2,122 @@
 
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
+use yii\helpers\ArrayHelper;
+
+use common\modules\content\models\CoContent;
+use common\modules\content\widgets\MetaTagsWidget;
 
 /* @var $this yii\web\View */
 /* @var $model common\modules\content\models\CoContent */
 /* @var $form yii\widgets\ActiveForm */
+
+$this->registerJsFile('/plugins/switchery/switchery.min.js', ['position' => \yii\web\View::POS_HEAD ]);
+$this->registerCssFile('/plugins/switchery/switchery.min.css', ['position' => \yii\web\View::POS_HEAD ]);
+$this->registerJsFile('/js/form-slider-switcher.demo.min.js', ['position' => \yii\web\View::POS_HEAD ]);
+$this->registerJsFile('/plugins/tinymce/js/tinymce/tinymce.min.js', ['position' => \yii\web\View::POS_END ]);
+
+$js = <<<JS
+    FormSliderSwitcher.init();
+    tinymce.init({
+        selector: "textarea",theme: "modern",
+        language: "ru_RU",
+        custom_elements: "emstart,emend,header,main,span",
+        extended_valid_elements: "span[id|name|class|style],i[id|name|class|style],ul[id|name|class|style],li[id|name|class|style]",
+        height: '350px',
+        menubar: "edit insert view format table tools",
+        plugins: [
+             "advlist autolink link image code lists charmap print preview hr anchor pagebreak",
+             "searchreplace wordcount visualblocks visualchars insertdatetime media nonbreaking",
+             "table contextmenu directionality emoticons paste textcolor responsivefilemanager"
+       ],
+       toolbar1: "undo redo | bold italic underline | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | styleselect",
+       toolbar2: "| responsivefilemanager | link unlink anchor | image media | forecolor backcolor  | print preview code ",
+       image_advtab: true ,
+       forced_root_block : false,
+       external_filemanager_path:"/filemanager/",
+       filemanager_title:"Responsive Filemanager" ,
+       external_plugins: { "filemanager" : "/filemanager/plugin.min.js"}
+    });
+JS;
+
+$this->registerJs($js, \yii\web\View::POS_READY, 'switcheryLoad');
+
+$blocks = \common\modules\content\models\CoBlocks::find()->all();
+
 ?>
 
 <div class="co-content-form">
 
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+        'options' => [
+            'enctype' => 'multipart/form-data'
+        ]
+    ]); ?>
+
+        <?= $form->field($model, 'category_id')->dropDownList(ArrayHelper::map(\common\modules\content\models\CoCategory::find()->all(), 'id', 'name'), [
+            'prompt' => 'Без привязки к категории',
+            'class' => 'form-control',
+        ])->hint('Для того что бы было проще сортировать данную страницу в общем списке вы можете привязать ее к определенной категории. Список категории настраивается ' . Html::a('тут',['/content/category-admin/manage']) . '.') ?>
+
+        <?= $form->field($model, 'url')->textInput(['maxlength' => 250])->hint('Для создания ЧПУ («Человеку Понятный Урл») укажите латинскими буквами путь, например, razdel/podrazdel/nazvanie_stranici.html') ?>
 
-    <?= $form->field($model, 'category_id')->textInput() ?>
+        <?= $form->field($model, 'active', [
+            'template' => '{input}<a href="#" class="btn btn-xs btn-success m-l-5 disabled">Страница скрыта от пользователя / Страница видна пользователю</a>'
+        ])->checkbox([
+            'data-theme' => 'self', 
+            'data-render' => 'switchery',
+            'data-classname' => 'switchery',
+            'label' => ' '
+        ], false); ?>
 
-    <?= $form->field($model, 'url')->textInput(['maxlength' => 250]) ?>
+        <?php if($model->preview) 
+        {
+            echo Html::img(\Yii::$app->params['frontUrl'] . CoContent::PHOTO_FOLDER . $model->preview);
+        } ?>
 
-    <?= $form->field($model, 'name')->textInput(['maxlength' => 250]) ?>
+        <?= $form->field($model, 'image')->fileInput() ?>
 
-    <?= $form->field($model, 'title')->textInput(['maxlength' => 250]) ?>
+        <ul class="nav nav-pills">
+            <?php $c = 0; foreach ($langs as $i => $content) : $c++; ?>
+                <li class="<?=($c==1?'active':'')?>"><a href="#lang-<?=$content->lang->url?>" data-toggle="tab"><?=$content->lang->name?></a></li>
+            <?php endforeach; ?>
+        </ul>        
         
-    <?= $form->field($model, 'active')->textInput() ?>
+        <?php
+        $block_hint = '';
+        if(count($blocks)) 
+        {
+            $block_hint .= "<ul>\n";
+            foreach($blocks as $block) {
+                $block_hint .= "<li>{{$block->name}} {$block->title}</li>\n";
+            }
 
-    <?= $form->field($model, 'created_at')->textInput() ?>
+            $block_hint .=  "</ul>\n";
+        }
+        ?>
 
-    <?= $form->field($model, 'updated_at')->textInput() ?>
+        <div class="tab-content">
+            <?php $c = 0; foreach ($langs as $content) : $c++;
+                $lang_id = $content->lang->id; ?>
+                <div class="tab-pane fade <?=($c==1?'active in':'')?>" id="lang-<?=$content->lang->url;?>">
+
+                    <?= $form->field($content, '['.$lang_id.']name')->textInput(['maxlength' => 250])->hint('Название страницы не будет отображаться пользователям сайта и служит исключительно для служебного пользования в Панель управления.') ?>
+
+                    <?= $form->field($content, '['.$lang_id.']title')->textInput(['maxlength' => 250])->hint('Заголовок страницы виден пользователю сайта и как правило оформляется в тег &lt;h1&gt;. Если дизайном страницы не предусмотрен вывод заголовка, то он не будет выводиться даже если был введен в данное поле.') ?>
+
+                    <?= $form->field($content, '['.$lang_id.']text')->textArea()->hint($block_hint) ?>
+
+                    <?= MetaTagsWidget::widget([
+                        'model' => $meta[$lang_id],
+                        'form' => $form,
+                    ])?>
+
+                </div>
+            <?php endforeach; ?>
+        </div>        
 
         <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('content', 'Create') : Yii::t('content', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+            <?= Html::submitButton('Сохранить', ['class' => 'btn btn-success']) ?>
         </div>
 
     <?php ActiveForm::end(); ?>

common/modules/content/views/content-admin/_search.php

-<?php
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model common\modules\content\models\SearchCoContent */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-<div class="co-content-search">
-
-    <?php $form = ActiveForm::begin([
-        'action' => ['index'],
-        'method' => 'get',
-    ]); ?>
-
-    <?= $form->field($model, 'id') ?>
-
-    <?= $form->field($model, 'category_id') ?>
-
-    <?= $form->field($model, 'url') ?>
-
-    <?= $form->field($model, 'name') ?>
-
-    <?= $form->field($model, 'title') ?>
-
-    <?php // echo $form->field($model, 'active') ?>
-
-    <?php // echo $form->field($model, 'created_at') ?>
-
-    <?php // echo $form->field($model, 'updated_at') ?>
-
-    <div class="form-group">
-        <?= Html::submitButton(Yii::t('content', 'Search'), ['class' => 'btn btn-primary']) ?>
-        <?= Html::resetButton(Yii::t('content', 'Reset'), ['class' => 'btn btn-default']) ?>
-    </div>
-
-    <?php ActiveForm::end(); ?>
-
-</div>

common/modules/content/views/content-admin/create.php

@@ -12,10 +12,10 @@ $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="co-content-create">
 
-    <h1><?= Html::encode($this->title) ?></h1>
-
     <?= $this->render('_form', [
         'model' => $model,
+        'meta' => $meta,
+        'langs' => $langs
     ]) ?>
 
 </div>

common/modules/content/views/content-admin/update.php

-
 <?php
-echo $form;
\ No newline at end of file
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model common\modules\content\models\CoContent */
+
+$this->title = Yii::t('content', 'Update Co Content');
+$this->params['breadcrumbs'][] = ['label' => Yii::t('content', 'Co Contents'), 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="co-content-update">
+
+    <?= $this->render('_form', [
+        'model' => $model,
+        'meta' => $meta,
+        'langs' => $langs,
+    ]) ?>
+
+</div>
\ No newline at end of file

common/modules/content/widgets/MetaTagsWidget.php

+<?php
+
+namespace common\modules\content\widgets;
+
+use Yii;
+use yii\helpers\Html;
+
+class MetaTagsWidget extends \yii\bootstrap\Widget
+{
+    public $form;
+
+    public $model;
+    
+    public function run()
+    {
+        return $this->render('meta-tags', [
+            'model' => $this->model,
+            'form' => $this->form,
+        ]);
+    }
+}

common/modules/content/widgets/views/meta-tags.php

+<?php
+
+use yii\helpers\Html;
+
+echo Html::tag('h4', 'Meta-теги страницы:');
+        
+echo $form->field($model, '['.$model->lang_id.']title')->textInput();
+echo $form->field($model, '['.$model->lang_id.']description')->textInput();
+echo $form->field($model, '['.$model->lang_id.']keywords')->textInput();
\ No newline at end of file

common/modules/languages/controllers/LanguageAdminController.php

@@ -20,6 +20,7 @@ class LanguageAdminController extends AdminController
 			'Create' 		  => 'Добавить язык',
 			'Update' 		  => 'Редактированть язык',
             'View'            => 'Просмотр языка',
+			'Delete'	 		  => 'Удаление языка',
 		];
 	}
 	
@@ -78,7 +79,7 @@ class LanguageAdminController extends AdminController
         $model = new Languages();
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id]);
+            return $this->redirect(['manage']);
         } else {
             return $this->render('create', [
                 'model' => $model,
@@ -97,7 +98,7 @@ class LanguageAdminController extends AdminController
         $model = $this->findModel($id);
 
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id]);
+            return $this->redirect(['manage']);
         } else {
             return $this->render('update', [
                 'model' => $model,
@@ -115,7 +116,7 @@ class LanguageAdminController extends AdminController
     {
         $this->findModel($id)->delete();
 
-        return $this->redirect(['index']);
+        return $this->redirect(['manage']);
     }
 
     /**

common/modules/languages/models/Languages.php

@@ -3,17 +3,30 @@
 namespace common\modules\languages\models;
 
 use Yii;
+use yii\behaviors\TimestampBehavior;
+use yii\db\Expression;
 
 /**
  * This is the model class for table "languages".
  *
  * @property integer $id
- * @property string $code
- * @property string $codeFull
+ * @property string $url
+ * @property string $local
  * @property string $name
  */
 class Languages extends \common\components\ActiveRecordModel
 {
+    //Переменная, для хранения текущего объекта языка
+    static $current = null;
+
+    const DEFAULT_TRUE = 1;
+    const DEFAULT_FALSE = 0;
+
+    public static $defaults_title = [
+        self::DEFAULT_TRUE => 'Да',
+        self::DEFAULT_FALSE => 'Нет',
+    ];
+
     /**
      * @inheritdoc
      */
@@ -33,11 +46,12 @@ class Languages extends \common\components\ActiveRecordModel
     public function rules()
     {
         return [
-            [['code', 'codeFull', 'name'], 'required'],
-            [['code'], 'string', 'max' => 2],
-            [['codeFull'], 'string', 'max' => 5],
+            [['url', 'local', 'name'], 'required'],
+            [['default'], 'safe'],
+            [['url'], 'string', 'max' => 2],
+            [['local'], 'string', 'max' => 5],
             [['name'], 'string', 'max' => 15],
-            [['name'], 'unique']
+            [['url'], 'unique']
         ];
     }
 
@@ -47,10 +61,90 @@ class Languages extends \common\components\ActiveRecordModel
     public function attributeLabels()
     {
         return [
-            'id' => Yii::t('languages', 'ID'),
-            'code' => Yii::t('languages', 'Language Code'),
-            'codeFull' => Yii::t('languages', 'Locale Code'),
-            'name' => Yii::t('languages', 'Name'),
+            'id' => 'ID',
+            'url' => 'Идентификатор для отображения в URL',
+            'local' => 'Язык пользователя (локаль)',
+            'name' => 'Название',
+            'default' => 'По умолчанию',
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            [
+                'class' => TimestampBehavior::className(),
+                'createdAtAttribute' => null,
+                'updatedAtAttribute' => null,
+                'value' => new Expression('NOW()'),
+            ],
         ];
     }
+
+    public function beforeSave($insert)
+    {
+        if (parent::beforeSave($insert)) 
+        {
+            if($this->default)
+            {
+                static::updateAll(['default' => self::DEFAULT_FALSE], ['default' => self::DEFAULT_TRUE]);
+            }
+
+            return true;
+        } 
+        else 
+        {
+            return false;
+        }
+    }
+
+    //Получение текущего объекта языка
+    static function getCurrent()
+    {
+        if(self::$current === null)
+        {
+            self::$current = self::getDefaultLang();
+        }
+
+        return self::$current;
+    }
+
+    //Установка текущего объекта языка и локаль пользователя
+    static function setCurrent($url = null)
+    {
+        $language = self::getLangByUrl($url);
+        self::$current = ($language === null) ? self::getDefaultLang() : $language;
+        Yii::$app->language = self::$current->local;
+    }
+
+    //Получения объекта языка по умолчанию
+    static function getDefaultLang()
+    {
+        return static::find()->where('`default` = :default', [':default' => self::DEFAULT_TRUE])->one();
+    }
+
+    //Получения объекта языка по буквенному идентификатору
+    static function getLangByUrl($url = null)
+    {
+        if ($url === null) 
+        {
+            return null;
+        } 
+        else 
+        {
+            $language = static::find()->where('url = :url', [':url' => $url])->one();
+
+            if ($language === null) 
+            {
+                return null;
+            }
+            else
+            {
+                return $language;
+            }
+        }
+    }
 }

common/modules/languages/models/SearchLanguages.php

@@ -18,8 +18,8 @@ class SearchLanguages extends Languages
     public function rules()
     {
         return [
-            [['id'], 'integer'],
-            [['code', 'codeFull', 'name'], 'safe'],
+            [['id', 'default'], 'integer'],
+            [['url', 'local', 'name', 'default'], 'safe'],
         ];
     }
 
@@ -57,10 +57,11 @@ class SearchLanguages extends Languages
 
         $query->andFilterWhere([
             'id' => $this->id,
+            'default' => $this->default,
         ]);
 
-        $query->andFilterWhere(['like', 'code', $this->code])
-            ->andFilterWhere(['like', 'codeFull', $this->codeFull])
+        $query->andFilterWhere(['like', 'url', $this->url])
+            ->andFilterWhere(['like', 'local', $this->local])
             ->andFilterWhere(['like', 'name', $this->name]);
 
         return $dataProvider;

common/modules/languages/views/language-admin/_form.php

@@ -12,14 +12,16 @@ use yii\widgets\ActiveForm;
 
     <?php $form = ActiveForm::begin(); ?>
 
-    <?= $form->field($model, 'code')->textInput(['maxlength' => 2]) ?>
+    <?= $form->field($model, 'url')->textInput(['maxlength' => 2]) ?>
 
-    <?= $form->field($model, 'codeFull')->textInput(['maxlength' => 5]) ?>
+    <?= $form->field($model, 'local')->textInput(['maxlength' => 5]) ?>
 
     <?= $form->field($model, 'name')->textInput(['maxlength' => 15]) ?>
 
+    <?= $form->field($model, 'default')->checkbox() ?>
+
     <div class="form-group">
-        <?= Html::submitButton($model->isNewRecord ? Yii::t('content', 'Create') : Yii::t('content', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+        <?= Html::submitButton('Сохранить', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
 
     <?php ActiveForm::end(); ?>

common/modules/languages/views/language-admin/create.php

@@ -12,8 +12,6 @@ $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="languages-create">
 
-    <h1><?= Html::encode($this->title) ?></h1>
-
     <?= $this->render('_form', [
         'model' => $model,
     ]) ?>

common/modules/languages/views/language-admin/index.php

@@ -3,6 +3,8 @@
 use yii\helpers\Html;
 use yii\grid\GridView;
 
+use common\modules\languages\models\Languages;
+
 /* @var $this yii\web\View */
 /* @var $searchModel common\modules\languages\models\SearchLanguages */
 /* @var $dataProvider yii\data\ActiveDataProvider */
@@ -12,18 +14,26 @@ use yii\grid\GridView;
     <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
 
     <p>
-        <?= Html::a(Yii::t('languages', 'Create Languages'), ['create'], ['class' => 'btn btn-success']) ?>
+        <?= Html::a('Добавить', ['create'], ['class' => 'btn btn-success']) ?>
     </p>
 
     <?= \common\components\zii\AdminGrid::widget([
         'dataProvider' => $dataProvider,
         'filterModel' => $searchModel,
         'columns' => [
-            ['class' => 'yii\grid\SerialColumn'],
+            // ['class' => 'yii\grid\SerialColumn'],
 
-            'code',
-            'codeFull',
+            'url',
+            'local',
             'name',
+            [
+                'attribute' => 'default',
+                'filter' => Html::dropDownList($searchModel->formName() . '[default]', $searchModel->default, Languages::$defaults_title, ['class' => 'form-control', 'prompt' => '']),
+                'value' => function($model) 
+                {
+                    return Languages::$defaults_title[$model->default];
+                }
+            ],
 
             [
 				'class' => 'common\components\ColorActionColumn',

common/modules/languages/views/language-admin/update.php

@@ -14,8 +14,6 @@ $this->params['breadcrumbs'][] = Yii::t('content', 'Update');
 ?>
 <div class="languages-update">
 
-    <h1><?= Html::encode($this->title) ?></h1>
-
     <?= $this->render('_form', [
         'model' => $model,
     ]) ?>

common/modules/languages/views/language-admin/view.php

@@ -29,9 +29,10 @@ $this->params['breadcrumbs'][] = $this->title;
         'model' => $model,
         'attributes' => [
             'id',
-            'code',
-            'codeFull',
+            'url',
+            'local',
             'name',
+            'default',
         ],
     ]) ?>
 

common/modules/languages/widgets/Languages.php

+<?php
+namespace common\modules\languages\widgets;
+
+use common\modules\languages\models\Languages as Model;
+
+class Languages extends \yii\bootstrap\Widget
+{
+    public function init(){}
+
+    public function run() 
+    {
+        return $this->render('languages', [
+            'current' => Model::getCurrent(),
+            'langs' => Model::find()->where('id != :current_id', [':current_id' => Model::getCurrent()->id])->all(),
+            'count' => Model::find()->count(),
+        ]);
+    }
+}
\ No newline at end of file

common/modules/languages/widgets/views/languages.php

+<?php
+use yii\helpers\Html;
+?>
+
+<?php if($count > 2) : ?>
+    <div class="lang_check">
+        <?= Html::a('<i class="icon-arrowDown"></i>' . $current->name, '#', ['class' => 'd_menu']) ?>
+        <?php foreach ($langs as $i => $lang): ?>
+            <?= Html::a('<i class="icon-arrowRight"></i>' . $lang->name, '/' . $lang->url . Yii::$app->getRequest()->getLangUrl(), ['class' => 'd_menu_hide']) ?>
+        <?php endforeach;?>
+    </div>
+<?php else : ?>
+    <nav class="top_nav clearfix">
+        <ul>
+            <?php foreach ($langs as $lang):?>
+                <li><?= Html::a($lang->name, '/' . $lang->url . Yii::$app->getRequest()->getLangUrl()) ?></li>
+            <?php endforeach;?>
+        </ul>
+    </nav>
+<?php endif; ?>
\ No newline at end of file

console/migrations/m160202_053232_fix_language_table.php

+<?php
+
+use yii\db\Migration;
+
+class m160202_053232_fix_language_table extends Migration
+{
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+        $this->update('languages', ['codeFull' => 'en-EN'], ['code' => 'en']);
+        $this->update('languages', ['codeFull' => 'ru-RU'], ['code' => 'ru']);
+
+        $this->renameColumn('languages', 'codeFull', 'local');
+        $this->renameColumn('languages', 'code', 'url');
+
+        $this->addColumn('languages', 'default', 'smallint(6) NOT NULL DEFAULT 0');
+
+        $this->update('languages', ['default' => 1], ['url' => 'ru']);
+    }
+
+    public function safeDown()
+    {
+        $this->renameColumn('languages', 'local', 'codeFull');
+        $this->renameColumn('languages', 'url', 'code');
+
+        $this->update('languages', ['codeFull' => 'eng'], ['code' => 'en']);
+        $this->update('languages', ['codeFull' => 'rus'], ['code' => 'ru']);
+
+        $this->dropColumn('languages', 'default');
+    }
+}

console/migrations/m160202_104337_upgrade_content.php

+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m160202_104337_upgrade_content extends Migration
+{
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+        Yii::$app->db->createCommand('ALTER TABLE `co_blocks` ENGINE = InnoDB;')->execute();
+        Yii::$app->db->createCommand('ALTER TABLE `co_blocks` CHANGE `id` `id` INT(11) NOT NULL AUTO_INCREMENT;')->execute();
+
+        $this->createTable(
+            'co_content_lang',
+            [
+                'id' => Schema::TYPE_PK,
+                'content_id' => Schema::TYPE_INTEGER.'(11) NOT NULL',
+                'lang_id' => Schema::TYPE_INTEGER.'(11) NOT NULL',
+                'name' => Schema::TYPE_STRING.'(250) NOT NULL',
+                'title' => Schema::TYPE_STRING.'(250) NOT NULL',
+                'text' => 'longtext DEFAULT NULL',
+            ]
+        );
+
+        $this->addForeignKey(
+            'fk_content_lang_lang_id_languages_id',
+            'co_content_lang', 'lang_id',
+            'languages', 'id'
+        );
+
+        $this->addForeignKey(
+            'fk_content_lang_content_id_content_id',
+            'co_content_lang', 'content_id',
+            'co_content', 'id'
+        );
+
+        $this->createTable(
+            'co_blocks_lang',
+            [
+                'id' => Schema::TYPE_PK,
+                'block_id' => Schema::TYPE_INTEGER.'(11) NOT NULL',
+                'lang_id' => Schema::TYPE_INTEGER.'(11) NOT NULL',
+                'name' => Schema::TYPE_STRING.'(50) NOT NULL',
+                'title' => Schema::TYPE_STRING.'(250) NOT NULL',
+                'text' => 'longtext DEFAULT NULL',
+            ]
+        );
+
+        $this->addForeignKey(
+            'fk_blocks_lang_lang_id_languages_id',
+            'co_blocks_lang', 'lang_id',
+            'languages', 'id'
+        );
+
+        $this->addForeignKey(
+            'fk_blocks_lang_blocks_id_blocks_id',
+            'co_blocks_lang', 'block_id',
+            'co_blocks', 'id'
+        );
+
+        $this->dropColumn('co_blocks', 'date_create');
+
+        $this->dropTable('co_content_data');
+    }
+
+    public function safeDown()
+    {
+        $this->dropForeignKey('fk_content_lang_lang_id_languages_id', 'co_content_lang');
+        $this->dropForeignKey('fk_content_lang_content_id_content_id', 'co_content_lang');
+        $this->dropForeignKey('fk_blocks_lang_lang_id_languages_id', 'co_blocks_lang');
+        $this->dropForeignKey('fk_blocks_lang_blocks_id_blocks_id', 'co_blocks_lang');
+        $this->dropTable('co_content_lang');
+        $this->dropTable('co_blocks_lang');
+
+        $this->addColumn('co_blocks', 'date_create', Schema::TYPE_TIMESTAMP . ' NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP');
+
+        $this->createTable(
+            'co_content_data',
+            [
+                'id' => Schema::TYPE_PK,
+            ]
+        );
+    }
+}

console/migrations/m160202_163727_fix_metatags.php

+<?php
+
+use yii\db\Schema;
+use yii\db\Migration;
+
+class m160202_163727_fix_metatags extends Migration
+{
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+        $this->renameColumn('meta_tags', 'language', 'lang_id');
+        $this->alterColumn('meta_tags', 'lang_id', Schema::TYPE_INTEGER.'(11) DEFAULT NULL');
+
+        $this->truncateTable('meta_tags');
+
+        $this->addForeignKey(
+            'fk_meta_tags_lang_id_languages_id',
+            'meta_tags', 'lang_id',
+            'languages', 'id'
+        );
+    }
+
+    public function safeDown()
+    {
+        $this->dropForeignKey('fk_meta_tags_lang_id_languages_id', 'meta_tags');
+
+        $this->renameColumn('meta_tags', 'lang_id', 'language');
+        $this->alterColumn('meta_tags', 'language', Schema::TYPE_STRING.'(5) NOT NULL');
+    }
+}

console/migrations/m160202_173116_fix_index_meta_tags.php

+<?php
+
+use yii\db\Migration;
+
+class m160202_173116_fix_index_meta_tags extends Migration
+{
+    // Use safeUp/safeDown to run migration code within a transaction
+    public function safeUp()
+    {
+        $this->dropIndex('object_id', 'meta_tags');
+        $this->createIndex('unique_object_model_lang', 'meta_tags', ['object_id', 'lang_id', 'model_id'], true);
+    }
+
+    public function safeDown()
+    {
+        $this->dropIndex('unique_object_model_lang', 'meta_tags');
+        $this->createIndex('object_id', 'meta_tags', ['object_id', 'model_id'], true);
+    }
+}

frontend/config/main.php

@@ -61,6 +61,9 @@ return [
         ],
     ],
     'components' => [
+        'request' => [
+            'class' => 'common\components\LangRequest'
+        ],
         'cache' => [
             'class' => 'yii\caching\FileCache',
         ],
@@ -98,7 +101,11 @@ return [
             'translations' => [
                 '*' => [
                     'class' => 'yii\i18n\PhpMessageSource',
-                    'sourceLanguage' => 'ru-RU',
+                    'basePath' => '@frontend/messages',
+                    'sourceLanguage' => 'en',
+                    'fileMap' => [
+                        //'main' => 'main.php',
+                    ],
                 ],
             ],
         ],
@@ -146,14 +153,10 @@ return [
             'showScriptName' => false,
             'enableStrictParsing' => true,
             'rules' => [
-                //TEMP
-                'keys' => 'site/keys',
                 'contacts' => 'site/contacts',
                 ['pattern' => 'sitemap', 'route' => 'sitemap/default/index', 'suffix' => '.xml'],
-                'source/<_u>/<_f>/<file>' => '@backend/web/<_u>/<_f>/<file>',
 
                 '' => 'content/page/view',
-
                 '<page:(/)>' => 'content/page/view',
                 'reviews' => 'reviews/review/index',
                 'faq/view/all' => 'faq/faq/all',

frontend/views/layouts/header.php

+<?php
+use yii\helpers\Html;
+use yii\helpers\Url;
+
+use common\modules\languages\widgets\Languages;
+?>
+
 <nav class="menu">
     <div class="toggle_block"><a href="#" class="toggle-mnu"><span></span></a></div>
     <div class="phone_menu"><?=\common\models\Settings::getValue('content-phone')?></div>
     <ul>
-        <li><a href="/about" class="link">О компании</a></li>
-        <li><a href="/case" class="link">Кейсы</a></li>
-        <li><a href="#" class="link">Блог</a></li>
-        <?php /*<li><a href="/school" class="link">Школа аналитики</a></li>*/ ?>
-        <li><a href="/contacts" class="link">Контакты</a></li>
+        <li><?=Html::a('О компании', ['/about']);?></li>
+        <li><?=Html::a('Кейсы', ['/case']);?></li>
+        <li><?=Html::a('Блог', ['/#']);?></li>
+        <!-- <li><?=Html::a('Школа аналитики', ['/school']);?></li> -->
+        <li><?=Html::a('Контакты', ['/contacts']);?></li>
     </ul>
 </nav>
 
@@ -14,26 +21,21 @@
     <div class="container">
         <div class="row">
             <div class="col-md-2 col-xs-3 col-sm-12">
-                <a href="/" class="logo">
+                <a href="<?=Url::to(['/'])?>" class="logo">
                     <img src="/images/logo.png" height="34" width="125" alt="">
                 </a>
             </div>
             <div class="col-md-7 col-xs-6 col-sm-12">
                 <nav class="top_nav clearfix">
                     <ul>
-                        <li><a href="/about">О компании</a></li>
-                        <li><a href="/case">Кейсы</a></li>
-                        <li><a href="#">Блог</a></li>
-                        <?php /*<li><a href="/school">Школа аналитики</a></li>*/ ?>
-                        <li><a href="/contacts">Контакты</a></li>
-                        <li><a href="#">ENG</a></li>
-                        <!-- <li><a href="#">RUS</a></li> -->
+                        <li><?=Html::a('О компании', ['/about']);?></li>
+                        <li><?=Html::a('Кейсы', ['/case']);?></li>
+                        <li><?=Html::a('Блог', ['/#']);?></li>
+                        <!-- <li><?=Html::a('Школа аналитики', ['/school']);?></li> -->
+                        <li><?=Html::a('Контакты', ['/contacts']);?></li>
                     </ul>
                 </nav>
-                <!-- <div class="lang_check">
-                    <a href="#" class="d_menu"><i class="icon-arrowDown"></i>ENG</a>
-                    <a href="#" class="d_menu_hide"><i class="icon-arrowRight"></i>RUS</a>
-                </div> -->
+                <?= Languages::widget();?>                
             </div>
             <div class="col-md-3 col-xs-3 col-sm-12">
                 <span class="top_phone"><?=\common\models\Settings::getValue('content-phone')?></span>