From eb0f55f88844259ff07ec1dbe475b3aca80bc4cc Mon Sep 17 00:00:00 2001 From: Tobi Date: Tue, 3 Jan 2023 17:05:26 +0100 Subject: [PATCH 1/8] update composer to bootstrap4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a37bf68..8ea2dcd 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "yiisoft/yii2": "~2.0.0", "yiisoft/yii2-jui": "~2.0.0", - "yiisoft/yii2-bootstrap": "~2.0.0" + "yiisoft/yii2-bootstrap4": "*" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.1" From 6ac7c853a3c88a9caf7d9801abde34846f0f7d71 Mon Sep 17 00:00:00 2001 From: Tobi Date: Wed, 4 Jan 2023 11:16:46 +0100 Subject: [PATCH 2/8] change composer dep to bootstrap5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8ea2dcd..20866a4 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "yiisoft/yii2": "~2.0.0", "yiisoft/yii2-jui": "~2.0.0", - "yiisoft/yii2-bootstrap4": "*" + "yiisoft/yii2-bootstrap5": "*" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.1" From 35d4726f71567e8121806eb96c0e267773865882 Mon Sep 17 00:00:00 2001 From: Tobi Date: Mon, 2 Sep 2024 22:36:15 +0200 Subject: [PATCH 3/8] Update composer.json for bs5 --- composer.json | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/composer.json b/composer.json index 20866a4..33172d3 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "lajax/yii2-translate-manager", - "description": "Translation management extension for Yii 2", + "description": "Translation management extension for Yii 2 with Bootstrap 5", "type": "yii2-extension", "keywords": ["yii2", "extension", "translate", "language", "module"], "license": "MIT", @@ -15,13 +15,10 @@ } ], "require": { - "yiisoft/yii2": "~2.0.0", + "yiisoft/yii2": "~2.0.45", "yiisoft/yii2-jui": "~2.0.0", - "yiisoft/yii2-bootstrap5": "*" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^2.1" - }, + "yiisoft/yii2-bootstrap5": "~2.0.2" + }, "autoload": { "psr-4": { "lajax\\translatemanager\\": "" From ab7f6b405234a3c9994e2fac78276b5e24808892 Mon Sep 17 00:00:00 2001 From: Tobi Date: Mon, 2 Sep 2024 22:47:07 +0200 Subject: [PATCH 4/8] Update TranslateManagerAsset.php --- bundles/TranslateManagerAsset.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bundles/TranslateManagerAsset.php b/bundles/TranslateManagerAsset.php index 340c4fe..5ececfa 100644 --- a/bundles/TranslateManagerAsset.php +++ b/bundles/TranslateManagerAsset.php @@ -30,6 +30,6 @@ class TranslateManagerAsset extends AssetBundle */ public $depends = [ 'yii\web\YiiAsset', - 'yii\bootstrap\BootstrapAsset', + 'yii\bootstrap5\BootstrapAsset', ]; } From e8501c011e9e01fda81b9792aed850ef4b291c6b Mon Sep 17 00:00:00 2001 From: Tobi Date: Mon, 2 Sep 2024 22:49:01 +0200 Subject: [PATCH 5/8] Update import.php --- views/language/import.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/language/import.php b/views/language/import.php index b4f49b1..6070d06 100644 --- a/views/language/import.php +++ b/views/language/import.php @@ -1,7 +1,7 @@ - \ No newline at end of file + From 739d53af389a6cce5ff4b712ad820c95491e6a85 Mon Sep 17 00:00:00 2001 From: Tobi Date: Mon, 2 Sep 2024 22:49:25 +0200 Subject: [PATCH 6/8] Update dialog.php --- views/language/dialog.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/language/dialog.php b/views/language/dialog.php index 7b9f098..13f2398 100644 --- a/views/language/dialog.php +++ b/views/language/dialog.php @@ -4,7 +4,7 @@ * * @since 1.2 */ -use yii\bootstrap\ActiveForm; +use yii\bootstrap5\ActiveForm; use yii\helpers\Html; /* @var $this yii\web\View */ From a81306afcbc4f76c1e00dc627be768d83193c5f5 Mon Sep 17 00:00:00 2001 From: Tobi Date: Mon, 2 Sep 2024 22:50:19 +0200 Subject: [PATCH 7/8] Update language.php --- views/layouts/language.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/layouts/language.php b/views/layouts/language.php index 57bb1c4..b81b8d8 100644 --- a/views/layouts/language.php +++ b/views/layouts/language.php @@ -5,8 +5,8 @@ * @since 1.0 */ use yii\helpers\Html; -use yii\bootstrap\Nav; -use yii\bootstrap\NavBar; +use yii\bootstrap5\Nav; +use yii\bootstrap5\NavBar; use yii\widgets\Breadcrumbs; use lajax\translatemanager\bundles\TranslateManagerAsset; From 16c7a577f234294ef771f15af8f89f318aa6b368 Mon Sep 17 00:00:00 2001 From: Tobi Date: Mon, 2 Sep 2024 22:54:37 +0200 Subject: [PATCH 8/8] Update list.php --- views/language/list.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/views/language/list.php b/views/language/list.php index defccc4..8cb1055 100644 --- a/views/language/list.php +++ b/views/language/list.php @@ -52,10 +52,16 @@ 'template' => '{view} {update} {translate} {delete}', 'buttons' => [ 'translate' => function ($url, $model, $key) { - return Html::a('', ['language/translate', 'language_id' => $model->language_id], [ - 'title' => Yii::t('language', 'Translate'), - 'data-pjax' => '0', - ]); + return Html::a(' + + + ', + ['language/translate', 'language_id' => $model->language_id], [ + 'title' => Yii::t('language', 'Translate'), + 'data-pjax' => '0', + ] +); + }, ], ], @@ -63,4 +69,4 @@ ]); Pjax::end(); ?> - \ No newline at end of file +