From 498b013324ae08b4ddb127e2dfae324dd4616bb1 Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Fri, 18 Dec 2015 15:56:11 +0200
Subject: [PATCH] Добавлен виджет мультиязычности

---
 common/modules/blog/controllers/AjaxController.php |  8 ++++----
 common/modules/blog/views/ajax/_article_form.php   |  2 +-
 common/modules/blog/views/ajax/_category_form.php  |  2 +-
 common/modules/blog/views/article/_form.php        | 36 +++++++++---------------------------
 common/modules/blog/views/category/_form.php       | 33 +++++++--------------------------
 common/widgets/Multilang.php                       | 45 +++++++++++++++++++++++++++++++++++++++++++++
 common/widgets/views/multilang-begin.php           | 29 +++++++++++++++++++++++++++++
 common/widgets/views/multilang-end.php             | 10 ++++++++++
 frontend/web/js/option.js                          | 76 ++++++++++++++++++++++++++++++++++++++++------------------------------------
 9 files changed, 146 insertions(+), 95 deletions(-)
 create mode 100644 common/widgets/Multilang.php
 create mode 100644 common/widgets/views/multilang-begin.php
 create mode 100644 common/widgets/views/multilang-end.php

diff --git a/common/modules/blog/controllers/AjaxController.php b/common/modules/blog/controllers/AjaxController.php
index 5322aac..327cade 100644
--- a/common/modules/blog/controllers/AjaxController.php
+++ b/common/modules/blog/controllers/AjaxController.php
@@ -26,24 +26,24 @@ class AjaxController extends Controller
         return true;
     }
 
-    public function actionCategoryForm($lang_id)
+    public function actionCategoryForm($lang_id, $widget_id)
     {
         $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1, 'language_id' => $lang_id])->one();
         if(!$model) {
             throw new NotFoundHttpException('Language not found');
         }
         $category_lang = new ArticleCategoryLang();
-        return $this->renderAjax('_category_form', ['model' => $model, 'category_lang' => $category_lang]);
+        return $this->renderAjax('_category_form', ['model' => $model, 'category_lang' => $category_lang, 'widget_id' => $widget_id]);
     }
 
-    public function actionArticleForm($lang_id)
+    public function actionArticleForm($lang_id, $widget_id)
     {
         $model = Language::find()->where(['>=', 'language_id', 1])->andWhere(['active' => 1, 'language_id' => $lang_id])->one();
         if(!$model) {
             throw new NotFoundHttpException('Language not found');
         }
         $article_lang = new ArticleLang();
-        return $this->renderAjax('_article_form', ['model' => $model, 'article_lang' => $article_lang]);
+        return $this->renderAjax('_article_form', ['model' => $model, 'article_lang' => $article_lang, 'widget_id' => $widget_id]);
     }
 
     public function actionRemoveImage()
diff --git a/common/modules/blog/views/ajax/_article_form.php b/common/modules/blog/views/ajax/_article_form.php
index 6d69bc6..ecc3dbc 100644
--- a/common/modules/blog/views/ajax/_article_form.php
+++ b/common/modules/blog/views/ajax/_article_form.php
@@ -5,7 +5,7 @@ use mihaildev\ckeditor\CKEditor;
 
 $form = \yii\bootstrap\ActiveForm::begin();
 ?>
-<div role="" class="tab-pane active ajax-loaded" id="lang-<?=$model->language_id?>">
+<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]) ?>
 
diff --git a/common/modules/blog/views/ajax/_category_form.php b/common/modules/blog/views/ajax/_category_form.php
index bad2d83..6b5caf1 100644
--- a/common/modules/blog/views/ajax/_category_form.php
+++ b/common/modules/blog/views/ajax/_category_form.php
@@ -5,7 +5,7 @@ use mihaildev\ckeditor\CKEditor;
 
 $form = \yii\bootstrap\ActiveForm::begin();
 ?>
-<div role="" class="tab-pane active ajax-loaded" id="lang-<?=$model->language_id?>">
+<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]) ?>
 
diff --git a/common/modules/blog/views/article/_form.php b/common/modules/blog/views/article/_form.php
index eb236e1..8e2d776 100644
--- a/common/modules/blog/views/article/_form.php
+++ b/common/modules/blog/views/article/_form.php
@@ -1,5 +1,6 @@
 <?php
 use common\modules\blog\models\ArticleCategory;
+use common\widgets\Multilang;
 use yii\bootstrap\ActiveForm;
 use common\modules\blog\models\Article;
 use yii\bootstrap\Html;
@@ -80,36 +81,15 @@ $uploaddir = \Yii::getAlias('@saveImageDir');
 
         <hr>
 
-        <div class="dropdown pull-right">
-            <button class="btn btn-default dropdown-toggle" type="button" id="dropdownLang" 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-dropdown" aria-labelledby="dropdownMenu1">
-                <?php foreach($langs as $index => $lang) {
-                    if(in_array($index, array_keys($article_langs))) continue;
-                    ?>
-                    <li><a href="#lang-tabs" data-lang="<?=$lang->language_id?>"><span class="flag <?=$lang->country_code?>"></span></a></li>
-                <?php } ?>
-            </ul>
-        </div>
-        <ul class="nav nav-tabs f32" id="lang-tabs" role="tablist">
+        <?php
+        $multilang = Multilang::begin(['ajaxpath' => Url::to(['/blog/ajax/article-form']), 'form' => $form, 'data_langs' => $article_langs]);
+        ?>
             <?php
             $first = 1;
             foreach($article_langs as $index => $article_lang) {
                 ?>
-                <li role="lang_inputs" class="<?php if($first) { echo 'active'; }?>" data-lang="<?=$index?>"><a href="#lang-<?=$index?>" aria-controls="lang-<?=$index?>" role="tab" data-toggle="tab"><span class="flag <?=$langs[$index]->country_code?>"></span></a></li>
-            <?php
-                $first = 0;
-            }
-            ?>
-        </ul>
-        <div class="tab-content lang-tab-content">
-            <?php
-            $first = 1;
-            foreach($article_langs as $index => $article_lang) {
-                ?>
-                <div role="" class="tab-pane <?php if($first) { echo 'active main-tab'; } ?>" id="lang-<?=$index?>">
+                <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]text")->widget(CKEditor::className(),['editorOptions' => [ 'preset' => 'full', 'inline' => false, ], ]); ?>
@@ -135,7 +115,9 @@ $uploaddir = \Yii::getAlias('@saveImageDir');
                 $first = 0;
             }
             ?>
-        </div>
+        <?php
+        $multilang->end();
+        ?>
 
         <div class="form-group">
             <?= Html::submitButton($article->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $article->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
diff --git a/common/modules/blog/views/category/_form.php b/common/modules/blog/views/category/_form.php
index 4e1e615..1248c8b 100644
--- a/common/modules/blog/views/category/_form.php
+++ b/common/modules/blog/views/category/_form.php
@@ -1,4 +1,5 @@
 <?php
+use common\widgets\Multilang;
 use yii\bootstrap\ActiveForm;
 use common\modules\blog\models\ArticleCategory;
 use yii\bootstrap\Html;
@@ -75,31 +76,9 @@ $uploaddir = \Yii::getAlias('@saveImageDir');
 
         <hr>
 
-        <div class="dropdown pull-right">
-            <button class="btn btn-default dropdown-toggle" type="button" id="dropdownLang" 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-dropdown" aria-labelledby="dropdownMenu1">
-                <?php foreach($langs as $index => $lang) {
-                    if(in_array($index, array_keys($category_langs))) continue;
-                    ?>
-                    <li><a href="#lang-tabs" data-lang="<?=$lang->language_id?>"><span class="flag <?=$lang->country_code?>"></span></a></li>
-                <?php } ?>
-            </ul>
-        </div>
-        <ul class="nav nav-tabs f32" id="lang-tabs" role="tablist">
-            <?php
-            $first = 1;
-            foreach($category_langs as $index => $category_lang) {
-                ?>
-                <li role="lang_inputs" class="<?php if($first) { echo 'active'; }?>" data-lang="<?=$index?>"><a href="#lang-<?=$index?>" aria-controls="lang-<?=$index?>" role="tab" data-toggle="tab"><span class="flag <?=$langs[$index]->country_code?>"></span></a></li>
-            <?php
-                $first = 0;
-            }
-            ?>
-        </ul>
-        <div class="tab-content lang-tab-content">
+        <?php
+        $multilang = Multilang::begin(['ajaxpath' => Url::to(['/blog/ajax/category-form']), 'form' => $form, 'data_langs' => $category_langs])
+        ?>
             <?php
             $first = 1;
             foreach($category_langs as $index => $category_lang) {
@@ -130,7 +109,9 @@ $uploaddir = \Yii::getAlias('@saveImageDir');
                 $first = 0;
             }
             ?>
-        </div>
+            <?php
+            $multilang->end();
+            ?>
 
         <div class="form-group">
             <?= Html::submitButton($category->isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $category->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
diff --git a/common/widgets/Multilang.php b/common/widgets/Multilang.php
new file mode 100644
index 0000000..98549ae
--- /dev/null
+++ b/common/widgets/Multilang.php
@@ -0,0 +1,45 @@
+<?php
+namespace common\widgets;
+use common\models\Language;
+use yii\base\InvalidParamException;
+use yii\base\Widget;
+use yii\bootstrap\ActiveForm;
+
+class Multilang extends Widget
+{
+    public $id;
+
+    public $langs;
+
+    public $data_langs = [];
+
+    public $ajaxpath;
+
+    public $form;
+
+    public function init()
+    {
+        parent::init();
+        if(empty($this->id)) {
+            $this->id = \Yii::$app->security->generateRandomString(8);
+        }
+        if(empty($this->langs)) {
+            $this->langs = Language::getActiveLanguages();
+        }
+        if(empty($this->ajaxpath)) {
+            throw new InvalidParamException('ajaxpath must be set');
+        }
+        if(empty($this->form)) {
+            throw new InvalidParamException('form must be set');
+        }
+        ob_start();
+        echo $this->render('multilang-begin', ['id' => $this->id, 'langs' => $this->langs, 'data_langs' => $this->data_langs, 'ajaxpath' => $this->ajaxpath, 'form' => $this->form]);
+    }
+
+    public function run()
+    {
+        echo $this->render('multilang-end', ['id' => $this->id, 'langs' => $this->langs, 'data_langs' => $this->data_langs, 'ajaxpath' => $this->ajaxpath, 'form' => $this->form]);
+        $content = ob_get_clean();
+        return $content;
+    }
+}
\ No newline at end of file
diff --git a/common/widgets/views/multilang-begin.php b/common/widgets/views/multilang-begin.php
new file mode 100644
index 0000000..dd098f4
--- /dev/null
+++ b/common/widgets/views/multilang-begin.php
@@ -0,0 +1,29 @@
+<?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_langs))) 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
+    $first = 1;
+    foreach($data_langs as $index => $data_lang) {
+        ?>
+        <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
+        $first = 0;
+    }
+    ?>
+</ul>
+<div class="tab-content lang-tab-content" id="tab-content-<?=$id?>">
+
diff --git a/common/widgets/views/multilang-end.php b/common/widgets/views/multilang-end.php
new file mode 100644
index 0000000..fdec4e6
--- /dev/null
+++ b/common/widgets/views/multilang-end.php
@@ -0,0 +1,10 @@
+<?php
+use yii\helpers\Url;
+?>
+</div>
+<script>
+    if(typeof form === 'undefined') {
+        var form = [];
+    }
+    form['<?=$id?>'] = '<?=$ajaxpath?>';
+</script>
\ No newline at end of file
diff --git a/frontend/web/js/option.js b/frontend/web/js/option.js
index 5a9b0ec..60ac1c3 100644
--- a/frontend/web/js/option.js
+++ b/frontend/web/js/option.js
@@ -36,42 +36,6 @@ $(function() {
     $(document).on('click', '.remove_lang', function() {
         $(this).parents('.form-wrapper').remove();
     });
-    if($('#lang-tabs li').length > 1) {
-        $('#lang-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
-    }
-    $(document).on('click', '#lang-dropdown li a[data-lang]', function() {
-        var lang = $(this).data('lang');
-        var flag = $(this).find('span').first().clone();
-        var el = $(this);
-        $.get('/blog/ajax/category-form', { lang_id: lang }, function(data) {
-            $('#lang-tabs li').removeClass('active');
-            $('#lang-tabs').append('<li role="lang_inputs" class="active" data-lang="'+lang+'"><a href="#lang-'+lang+'" aria-controls="lang-'+lang+'" role="tab" data-toggle="tab">'+$('<p>').append($(flag)).html()+'</a></li>');
-            $('.lang-tab-content .tab-pane.active').removeClass('active');
-            $('.lang-tab-content').append($(data).find('.ajax-loaded').first());
-            $('body').append($(data).filter('script'));
-            $(el).parent().remove();
-            if(!$('#lang-dropdown li').length) {
-                $('#dropdownLang').addClass('disabled');
-            }
-            if($('#lang-tabs li').length > 1) {
-                $('#lang-tabs li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>')
-            }
-        });
-    });
-    $(document).on('click', '.remove-lang', function() {
-        var lang = $(this).parent().data('lang');
-        var flag = $(this).parent().find('span.flag').first().clone();
-        $('#lang-'+lang).remove();
-        $('#lang-dropdown').append('<li><a href="#lang-tabs" data-lang="'+lang+'">'+$('<p>').append($(flag)).html()+'</a></li>');
-        $('#dropdownLang').removeClass('disabled');
-        $(this).parent().remove();
-        if($('#lang-tabs li').length <= 1) {
-            $('#lang-tabs li').find('.remove-lang').remove();
-        }
-        if(!$('#lang-tabs>li.active').length) {
-            $('#lang-tabs>li').first().find('a').tab('show');
-        }
-    });
     $(document).on('change', '.image_inputs_field', function() {
         readURL(this);
     });
@@ -89,4 +53,44 @@ $(function() {
         }
         return false;
     });
+    $.each($('.nav-tabs.f32'), function(key, value) {
+        if($(value).find('li').length > 1) {
+            $(value).find('li').append('<span class="glyphicon glyphicon-remove-circle remove-lang"></span>');
+        }
+    });
+    $(document).on('click', '.dropdown-menu.f32 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) {
+            $('#'+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', '.remove-lang', function() {
+        var lang = $(this).parent().data('lang');
+        var flag = $(this).parent().find('span.flag').first().clone();
+        var id = $(this).parent().find('a[aria-controls]').first().attr('aria-controls').substr(0,8);
+        $('#'+id+'-'+lang).remove();
+        $('#lang-'+id).append('<li><a href="#'+id+'" data-lang="'+lang+'">'+$('<p>').append($(flag)).html()+'</a></li>');
+        $('#'+id+'Lang').removeClass('disabled');
+        $(this).parent().remove();
+        if($('#'+id+'-tabs li').length <= 1) {
+            $('#'+id+'-tabs li').find('.remove-lang').remove();
+        }
+        if(!$('#'+id+'-tabs>li.active').length) {
+            $('#'+id+'-tabs>li').first().find('a').tab('show');
+        }
+    });
 });
\ No newline at end of file
--
libgit2 0.21.4