From 0a1ff00cc000fb54e3581501463c706b7a8f9aa5 Mon Sep 17 00:00:00 2001 From: Simon Karlen Date: Thu, 5 Aug 2021 09:21:05 +0200 Subject: [PATCH] updated docs and bs version --- composer.json | 2 +- docs/guide-de/assets-setup.md | 12 ++++++------ docs/guide-de/basic-usage.md | 2 +- docs/guide-de/helper-html.md | 4 +++- docs/guide-de/migrating-yii2-bootstrap.md | 2 +- docs/guide-de/usage-widgets.md | 2 +- docs/guide-es/basic-usage.md | 2 +- docs/guide-es/helper-html.md | 3 +-- docs/guide-ja/assets-setup.md | 10 +++++----- docs/guide-ja/basic-usage.md | 2 +- docs/guide-ja/helper-html.md | 2 +- docs/guide-ja/migrating-yii2-bootstrap.md | 2 +- docs/guide-ja/usage-widgets.md | 2 +- docs/guide-pt-BR/basic-usage.md | 2 +- docs/guide-pt-BR/helper-html.md | 3 +-- docs/guide-ru/basic-usage.md | 2 +- docs/guide-ru/helper-html.md | 3 +-- docs/guide-uk/basic-usage.md | 2 +- docs/guide-zh-CN/basic-usage.md | 2 +- docs/guide-zh-CN/helper-html.md | 3 +-- docs/guide/assets-setup.md | 12 ++++++------ docs/guide/basic-usage.md | 2 +- docs/guide/helper-html.md | 2 +- docs/guide/migrating-yii2-bootstrap.md | 2 +- docs/guide/usage-widgets.md | 2 +- src/Accordion.php | 2 +- src/ActiveField.php | 4 ++-- src/ActiveForm.php | 2 +- src/Alert.php | 4 ++-- src/BaseHtml.php | 2 +- src/Breadcrumbs.php | 2 +- src/Button.php | 2 +- src/ButtonDropdown.php | 4 ++-- src/ButtonGroup.php | 4 ++-- src/ButtonToolbar.php | 4 ++-- src/Carousel.php | 2 +- src/Dropdown.php | 2 +- src/LinkPager.php | 2 +- src/Modal.php | 2 +- src/Nav.php | 4 ++-- src/NavBar.php | 6 +++--- src/Offcanvas.php | 4 ++-- src/Popover.php | 4 ++-- src/Progress.php | 2 +- src/Tabs.php | 4 ++-- src/Toast.php | 4 ++-- src/ToggleButtonGroup.php | 2 +- 47 files changed, 75 insertions(+), 77 deletions(-) diff --git a/composer.json b/composer.json index 9b9e569..bf16f1f 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ "php": ">=7.0", "ext-json": "*", "yiisoft/yii2": "^2.0.42", - "bower-asset/bootstrap": "^5.0.0" + "bower-asset/bootstrap": "^5.1.0" }, "require-dev": { "yiisoft/yii2-coding-standards": "~2.0", diff --git a/docs/guide-de/assets-setup.md b/docs/guide-de/assets-setup.md index 29ba30b..f307ce8 100644 --- a/docs/guide-de/assets-setup.md +++ b/docs/guide-de/assets-setup.md @@ -66,7 +66,7 @@ Fügen Sie dafür folgende Zeilen zur `package.json`-Datei Ihres Projekts hinzu: { ... "dependencies": { - "bootstrap": "4.2.1", + "bootstrap": "5.1", ... } ... @@ -77,7 +77,7 @@ Fügen Sie zur `composer.json`-Datei Ihres Projekts folgende Zeilen hinzu zum Ve ```json "replace": { - "npm-asset/bootstrap": ">=5.0.2" + "npm-asset/bootstrap": ">=5.1" }, ``` @@ -89,7 +89,7 @@ Fügen Sie zur `composer.json`-Datei Ihres Projekts folgende Zeilen hinzu zum Ve ```json "replace": { - "npm-asset/bootstrap": ">=5.0.2" + "npm-asset/bootstrap": ">=5.1" }, ``` @@ -103,14 +103,14 @@ return [ 'bundles' => [ 'yii\bootstrap5\BootstrapAsset' => [ 'sourcePath' => null, - 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/', + 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.1/dist/', 'css' => [ 'css/bootstrap.min.css' ], ], 'yii\bootstrap5\BootstrapPluginAsset' => [ 'sourcePath' => null, - 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/', + 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.1/dist/', 'js' => [ 'js/bootstrap.bundle.min.js' ], @@ -135,7 +135,7 @@ Fügen Sie zur `composer.json`-Datei Ihres Projekts folgende Zeilen hinzu zum Ve ```json "replace": { - "npm-asset/bootstrap": ">=5.0.2" + "npm-asset/bootstrap": ">=5.1" }, ``` diff --git a/docs/guide-de/basic-usage.md b/docs/guide-de/basic-usage.md index 134ff26..f5d2fa0 100644 --- a/docs/guide-de/basic-usage.md +++ b/docs/guide-de/basic-usage.md @@ -2,7 +2,7 @@ Grundlegende Verwendung ======================= Yii verpackt die Bootstrap Basics nicht in PHP Code, da dass HTML selbst sehr einfach aufgebaut ist. Sie finden mehr -Informationen zur Verwendung der Basics unter [bootstrap documentation website](http://getbootstrap.com/css/). Yii bietet +Informationen zur Verwendung der Basics unter [bootstrap documentation website](https://getbootstrap.com/docs/). Yii bietet aber eine einfache Methode zur Einbindung der Bootstrap Assets in Ihre Seite durch das Hinzufügen einer Zeile zu `AppAsset.ph` im `@app/assets` Verzeichnis: diff --git a/docs/guide-de/helper-html.md b/docs/guide-de/helper-html.md index 23440b0..c7a4a9e 100644 --- a/docs/guide-de/helper-html.md +++ b/docs/guide-de/helper-html.md @@ -6,7 +6,9 @@ Ausschliesslich die komplexesten von ihnen sind mittels Widgets in dieser Erweit mittels HTML zusammengestellt werden. Einige spezielle Bootstrap Markups sind implementiert im [[\yii\bootstrap5\Html]]-Helper. Die [[\yii\bootstrap5\Html]]-Klasse ist eine Erweiterung der regulären [[\yii\helpers\Html]]-Klasse mit Anpassungen zur -Verwendung mit Bootstrap. Sie bietet verschiedene nützliche Methoden. +Verwendung mit Bootstrap. Sie bietet verschiedene nützliche Methoden wie z.B. + +- `staticControl()` - erlaubt das erstellen von "[statischen Feldern](https://getbootstrap.com/docs/5.1/forms/form-control/#readonly-plain-text)" Die [[\yii\bootstrap5\Html]]-Klasse erbt von der [[\yii\helpers\Html]]-Klasse und ersetzt diese dadurch vollumfänglich. Sie benötigen folglich **nicht** beide in Ihren Views. diff --git a/docs/guide-de/migrating-yii2-bootstrap.md b/docs/guide-de/migrating-yii2-bootstrap.md index a6a879c..7e67c78 100644 --- a/docs/guide-de/migrating-yii2-bootstrap.md +++ b/docs/guide-de/migrating-yii2-bootstrap.md @@ -18,7 +18,7 @@ Die grössten Änderungen finden Sie hier zusammengefasst: ### ActiveForm Es gibt eine neue Konstante [[yii\bootstrap5\ActiveForm::LAYOUT_FLOATING]]. Sie repräsentiert ein -[neues Formular-Layout](https://getbootstrap.com/docs/5.0/forms/floating-labels/) in Bootstrap 5. +[neues Formular-Layout](https://getbootstrap.com/docs/5.1/forms/floating-labels/) in Bootstrap 5. ### Breadcrumbs diff --git a/docs/guide-de/usage-widgets.md b/docs/guide-de/usage-widgets.md index cb2ae11..65e5aab 100644 --- a/docs/guide-de/usage-widgets.md +++ b/docs/guide-de/usage-widgets.md @@ -65,7 +65,7 @@ Das Navbar Widget hat so seine Eigenheiten. Bei der Verwendung des Widgets sollt ab welchem die Navigation zugeklappt wird (Mobile Navigation) sowie das Farbschema definiert sind. Diese Definition geschieht über CSS Klassen. Die Standartwerte lauten `navbar-light bg-light` fürs Farbschema und -`navbar-expand-lg` für den brakpoint. Für weitere Informationen, konsultieren Sie die [Bootstrap Dokumentation](https://getbootstrap.com/docs/4.2/components/navbar/): +`navbar-expand-lg` für den brakpoint. Für weitere Informationen, konsultieren Sie die [Bootstrap Dokumentation](https://getbootstrap.com/docs/5.1/components/navbar/): ```php Navbar::begin([ 'options' => [ diff --git a/docs/guide-es/basic-usage.md b/docs/guide-es/basic-usage.md index 3d1fdac..8126817 100644 --- a/docs/guide-es/basic-usage.md +++ b/docs/guide-es/basic-usage.md @@ -2,7 +2,7 @@ Uso Básico ========== Yii no se ajusta a los conceptos básicos de bootstrap dentro del código PHP, desde el HTML es muy simple en si mismo -en este caso. Puedes encontrar los detalles sobre el uso de los conceptos básicos en la [web de bootstrap](http://getbootstrap.com/css/). Yii proporciona una manera de incluir los assets de bootstrap en tus páginas añadiendo una única linea a `AppAsset.php` localizado en tu +en este caso. Puedes encontrar los detalles sobre el uso de los conceptos básicos en la [web de bootstrap](https://getbootstrap.com/docs/). Yii proporciona una manera de incluir los assets de bootstrap en tus páginas añadiendo una única linea a `AppAsset.php` localizado en tu directorio `@app/assets`: ```php diff --git a/docs/guide-es/helper-html.md b/docs/guide-es/helper-html.md index f4f7110..2c2916f 100644 --- a/docs/guide-es/helper-html.md +++ b/docs/guide-es/helper-html.md @@ -8,8 +8,7 @@ Sin embargo, algunas marcas especiales de Bootstrap son cubiertas por el helper [[\yii\bootstrap5\Html]] es una versión mejorada de la regular [[\yii\helpers\Html]] dedicada a las necesidades de Bootstrap. Proporciona varios métodos útiles: - - `icon()` - permite renderizar iconos de Glyphicon - - `staticControl()` - permite renderizar formularios "static controls" + - `staticControl()` - permite renderizar formularios "[static controls](https://getbootstrap.com/docs/5.1/forms/form-control/#readonly-plain-text)" [[\yii\bootstrap5\Html]] hereda todas las funcionalidades disponibles en [[\yii\helpers\Html]] y puede usarse como sustituto, así que no es necesario incluir ambos dentro de los archivos de tus vistas. diff --git a/docs/guide-ja/assets-setup.md b/docs/guide-ja/assets-setup.md index 6b0fa5e..ad4dac7 100644 --- a/docs/guide-ja/assets-setup.md +++ b/docs/guide-ja/assets-setup.md @@ -80,7 +80,7 @@ Bower または NPM のクライアントを直接に使って Bootstrap のア ```json "replace": { - "npm-asset/bootstrap": ">=5.0.2" + "npm-asset/bootstrap": ">=5.1" }, ``` @@ -93,7 +93,7 @@ Bower または NPM のクライアントを直接に使って Bootstrap のア ```json "replace": { - "npm-asset/bootstrap": ">=5.0.2" + "npm-asset/bootstrap": ">=5.1" }, ``` @@ -107,14 +107,14 @@ return [ 'bundles' => [ 'yii\bootstrap5\BootstrapAsset' => [ 'sourcePath' => null, - 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/', + 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.1/dist/', 'css' => [ 'css/bootstrap.min.css' ], ], 'yii\bootstrap5\BootstrapPluginAsset' => [ 'sourcePath' => null, - 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/', + 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.1/dist/', 'js' => [ 'js/bootstrap.bundle.min.js' ], @@ -141,7 +141,7 @@ Bootstrap アセットを手作業でダウンロードし、プロジェクト ```json "replace": { - "npm-asset/bootstrap": ">=5.0.2" + "npm-asset/bootstrap": ">=5.1" }, ``` diff --git a/docs/guide-ja/basic-usage.md b/docs/guide-ja/basic-usage.md index 3ca66c7..3253a32 100644 --- a/docs/guide-ja/basic-usage.md +++ b/docs/guide-ja/basic-usage.md @@ -2,7 +2,7 @@ ================ Yii は bootstrap の基礎を PHP コードでラップすることをしていません。なぜなら、この場合の HTML コードがそれ自体として非常にシンプルだからです。 -bootstrap の基礎を使用することに関する詳細は、[bootstrap ドキュメント・ウェブ・サイト](http://getbootstrap.com/css/) で見ることが出来ます。 +bootstrap の基礎を使用することに関する詳細は、[bootstrap ドキュメント・ウェブ・サイト](https://getbootstrap.com/docs/) で見ることが出来ます。 それでも、Yii はあなたのページに bootstrap のアセットをインクルードするための便利な方法を提供しています。 `@app/assets` ディレクトリに配置されている `AppAsset.php` に一行を加えるだけで大丈夫です。 diff --git a/docs/guide-ja/helper-html.md b/docs/guide-ja/helper-html.md index 4ff8539..e6d2508 100644 --- a/docs/guide-ja/helper-html.md +++ b/docs/guide-ja/helper-html.md @@ -8,7 +8,7 @@ Bootstrap は、一貫性の高い多数の HTML 構文ないしはスケルト [[\yii\bootstrap5\Html]] は通常の [[\yii\helpers\Html]] の拡張版であり、Bootstrap の要求に特化して、 いくつかの便利なメソッドを提供するものです。例えば、 - - `staticControl()` - フォームの "[static controls](https://getbootstrap.com/docs/4.1/components/forms/#readonly-plain-text)" のレンダリングを可能にする + - `staticControl()` - フォームの "[static controls](https://getbootstrap.com/docs/5.1/forms/form-control/#readonly-plain-text)" のレンダリングを可能にする [[\yii\bootstrap5\Html]] は [[\yii\helpers\Html]] を継承しており、 その代替物として使うことが出来ますので、ビュー・ファイルの中で両方を使う必要はありません。 diff --git a/docs/guide-ja/migrating-yii2-bootstrap.md b/docs/guide-ja/migrating-yii2-bootstrap.md index 04e7bc2..32a01a5 100644 --- a/docs/guide-ja/migrating-yii2-bootstrap.md +++ b/docs/guide-ja/migrating-yii2-bootstrap.md @@ -16,7 +16,7 @@ yii2-bootstrap5 は、Bootstrap 4 から Bootstrap 5 への移行ガイドに従 ### ActiveForm -新しい定数[[yii\bootstrap5\ActiveForm::LAYOUT_FLOATING]]があります。 Bootstrap5で導入された[新しいフォームレイアウト](https://getbootstrap.com/docs/5.0/forms/floating-labels/)です。 +新しい定数[[yii\bootstrap5\ActiveForm::LAYOUT_FLOATING]]があります。 Bootstrap5で導入された[新しいフォームレイアウト](https://getbootstrap.com/docs/5.1/forms/floating-labels/)です。 ### Breadcrumbs diff --git a/docs/guide-ja/usage-widgets.md b/docs/guide-ja/usage-widgets.md index f6c925f..b5d97a9 100644 --- a/docs/guide-ja/usage-widgets.md +++ b/docs/guide-ja/usage-widgets.md @@ -66,7 +66,7 @@ Navbar ウィジェットには独特の癖があります。あなたは Navbar Navbar の全体的なスタイル (カラー・スキーム) を指定しなければなりません。 カラー・スキームと折り畳みのブレークポイントは CSS のクラスで変更することが出来ます。指定されない場合は、カラー・スキームは `navbar-light bg-light`、 -ブレークポイントは`navbar-expand-lg` がデフォルトとして採用されます。詳細な情報は、[Bootstrap documentation](https://getbootstrap.com/docs/4.2/components/navbar/) を参照して下さい。 +ブレークポイントは`navbar-expand-lg` がデフォルトとして採用されます。詳細な情報は、[Bootstrap documentation](https://getbootstrap.com/docs/5.1/components/navbar/) を参照して下さい。 ```php Navbar::begin([ diff --git a/docs/guide-pt-BR/basic-usage.md b/docs/guide-pt-BR/basic-usage.md index f07e952..b46bac4 100644 --- a/docs/guide-pt-BR/basic-usage.md +++ b/docs/guide-pt-BR/basic-usage.md @@ -2,7 +2,7 @@ Uso Básico =========== O Yii Não registra os componentes básicos do bootstrap em código PHP visto que esse HTML é muito simples, por si só. -Você pode encontrar detalhes sobre como usar o básico no [site documentação do Bootstrap] (http://getbootstrap.com/css/). O Yii ainda fornece uma +Você pode encontrar detalhes sobre como usar o básico no [site documentação do Bootstrap] (https://getbootstrap.com/docs/). O Yii ainda fornece uma forma conveniente para incluir assets de bootstrap em suas páginas com uma única linha adicionado ao arquivo `AppAsset.php` localizado no seu diretório `@app/assets`: diff --git a/docs/guide-pt-BR/helper-html.md b/docs/guide-pt-BR/helper-html.md index 616cc2d..5cbde6e 100644 --- a/docs/guide-pt-BR/helper-html.md +++ b/docs/guide-pt-BR/helper-html.md @@ -1,7 +1,6 @@ Bootstrap introduz construções HTML mais consistentes e esqueletos, que permitem a criação de diferentes efeitos visuais. Apenas o mais complexos deles são cobertos por os widgets fornecidos com esta extensão . O restante deverá ser escrito manualmente usando escrita HTML direta. No entanto, vários casos especiais de marcação Bootstrap são cobertos pelo helper [[\yii\bootstrap5\Html]]. [[\yii\bootstrap5\Html]] é uma versão melhorada de [[\yii\helpers\Html]] dedicada à quem precisa do Bootstrap. Ele fornece vários métodos úteis : - icon() - allows rendering of Glyphicon icons - staticControl() - allows rendering of form "static controls" +- staticControl() - allows rendering of form "[static controls](https://getbootstrap.com/docs/5.1/forms/form-control/#readonly-plain-text)" [[\yii\bootstrap5\Html]] herda toda funcionalidade disponível em [[\yii\helpers\Html]] e pode ser usado como um substituto , para que você não precisa de ambos dentro de seus arquivos de views . Por exemplo: diff --git a/docs/guide-ru/basic-usage.md b/docs/guide-ru/basic-usage.md index 39b74f8..cf47ad5 100644 --- a/docs/guide-ru/basic-usage.md +++ b/docs/guide-ru/basic-usage.md @@ -1,7 +1,7 @@ Базовое использование =========== -Yii не оборачивает базовый Bootstrap в PHP код, поскольку HTML, в этом случае, прост сам по себе. Вы можете найти подробную информацию о возможностях Bootstrap в [официальной документации](http://getbootstrap.com/css/). Тем не менее, Yii обеспечивает удобный способ включения Bootstrap assets на страницах вашего приложения добавлением одной строки в файл `AppAsset.php`, расположенный в директории `@app/assets`: +Yii не оборачивает базовый Bootstrap в PHP код, поскольку HTML, в этом случае, прост сам по себе. Вы можете найти подробную информацию о возможностях Bootstrap в [официальной документации](https://getbootstrap.com/docs/). Тем не менее, Yii обеспечивает удобный способ включения Bootstrap assets на страницах вашего приложения добавлением одной строки в файл `AppAsset.php`, расположенный в директории `@app/assets`: ```php public $depends = [ diff --git a/docs/guide-ru/helper-html.md b/docs/guide-ru/helper-html.md index 166ffc9..88f7e3b 100644 --- a/docs/guide-ru/helper-html.md +++ b/docs/guide-ru/helper-html.md @@ -3,8 +3,7 @@ Bootstrap предоставляет множество последовательных HTML конструкции и каркасов, которые позволяют создавать различные визуальные эффекты. Только самые сложные из них передставлены виджетами, поставляемые с данным расширением. Остальные должны быть собраны вручную, используя HTML напрямую. Тем не менее, несколько специальных Bootstrap разметок предоставляются в помощнике [[\yii\bootstrap5\Html]]. [[\yii\bootstrap5\Html]] является расширенной версией [[\yii\helpers\Html]], удовлетворяющей потребности Bootstrap. Он предоставляет несколько полезных методов: - - `icon()` - позволяет отображать иконки Glyphicon - - `staticControl()` - позволяет отображать "статические элементы управления" формы + - `staticControl()` - позволяет отображать "[статические элементы управления](https://getbootstrap.com/docs/5.1/forms/form-control/#readonly-plain-text)" формы [[\yii\bootstrap5\Html]] наследует все функциональные возможности, доступные в [[\yii\helpers\Html]], и может быть использован в качестве замены в ваших представлениях. Например: diff --git a/docs/guide-uk/basic-usage.md b/docs/guide-uk/basic-usage.md index a909ccd..c4e4a78 100644 --- a/docs/guide-uk/basic-usage.md +++ b/docs/guide-uk/basic-usage.md @@ -2,7 +2,7 @@ =================== Yii не загортає основи bootstrap в код PHP, оскільки в цьому випадку, сам по собі HTML є дуже простим. -Ви можете знайти детальну інформацію щодо використання основ на [сайті документації bootstrap](http://getbootstrap.com/css/). +Ви можете знайти детальну інформацію щодо використання основ на [сайті документації bootstrap](https://getbootstrap.com/docs/). Проте Yii забезпечує зручний спосіб підключення ресурсів bootstrap до ваших сторінок за допомогою додання всього одного рядка до файлу `AppAsset.php`, розташованого в каталозі `@app/assets`: diff --git a/docs/guide-zh-CN/basic-usage.md b/docs/guide-zh-CN/basic-usage.md index 9fb4816..a515f8e 100644 --- a/docs/guide-zh-CN/basic-usage.md +++ b/docs/guide-zh-CN/basic-usage.md @@ -1,7 +1,7 @@ 使用 =========== -Yii不会将 bootstrap 合并到PHP代码中，因为HTML本身是非常简单的。猛击 [bootstrap 文档页](http://getbootstrap.com/css/) 查看如何使用 bootstrap. 但是 Yii 还是提供了在框架中更为方便的管理和使用 bootstrap的方式，在 `@app/assets` 路径下的 `AppAsset.php` 文件中，添加如下代码即可： +Yii不会将 bootstrap 合并到PHP代码中，因为HTML本身是非常简单的。猛击 [bootstrap 文档页](https://getbootstrap.com/docs/) 查看如何使用 bootstrap. 但是 Yii 还是提供了在框架中更为方便的管理和使用 bootstrap的方式，在 `@app/assets` 路径下的 `AppAsset.php` 文件中，添加如下代码即可： ```php public $depends = [ diff --git a/docs/guide-zh-CN/helper-html.md b/docs/guide-zh-CN/helper-html.md index b37430d..a8fd81f 100644 --- a/docs/guide-zh-CN/helper-html.md +++ b/docs/guide-zh-CN/helper-html.md @@ -7,8 +7,7 @@ Bootstrap 引入了许多一致的 HTML 结构和骨架，允许创建不同的 [[\yii\bootstrap5\Html]] 是基于 Bootstrap 的 [[\yii\helpers\Html]] 增强版. 它提供了很多实用的方法，例如: - - `icon()` - 生成Glyphicon图标 - - `staticControl()` - 生成表单静态组件 "static controls" + - `staticControl()` - 生成表单静态组件 "[static controls](https://getbootstrap.com/docs/5.1/forms/form-control/#readonly-plain-text)" [[\yii\bootstrap5\Html]] 继承了 [[\yii\helpers\Html]] 的所有功能，所以不需要在视图文件中同时引入这两个文件，如果需要，仅使用 [[\yii\bootstrap5\Html]] 即可. 例如: diff --git a/docs/guide/assets-setup.md b/docs/guide/assets-setup.md index a94d2ac..93c4bb1 100644 --- a/docs/guide/assets-setup.md +++ b/docs/guide/assets-setup.md @@ -69,7 +69,7 @@ In the `package.json` of your project, add the following lines: { ... "dependencies": { - "bootstrap": "4.2.1", + "bootstrap": "5.1", ... } ... @@ -80,7 +80,7 @@ In the `composer.json` of your project, add the following lines in order to prev ```json "replace": { - "npm-asset/bootstrap": ">=5.0.2" + "npm-asset/bootstrap": ">=5.1" }, ``` @@ -93,7 +93,7 @@ In the `composer.json` of your project, add the following lines in order to prev ```json "replace": { - "npm-asset/bootstrap": ">=5.0.2" + "npm-asset/bootstrap": ">=5.1" }, ``` @@ -107,14 +107,14 @@ return [ 'bundles' => [ 'yii\bootstrap5\BootstrapAsset' => [ 'sourcePath' => null, - 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/', + 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.1/dist/', 'css' => [ 'css/bootstrap.min.css' ], ], 'yii\bootstrap5\BootstrapPluginAsset' => [ 'sourcePath' => null, - 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.0.2/dist/, + 'baseUrl' => 'https://cdn.jsdelivr.net/npm/bootstrap@5.1/dist/, 'js' => [ 'js/bootstrap.bundle.min.js' ], @@ -141,7 +141,7 @@ In the `composer.json` of your project, add the following lines in order to prev ```json "replace": { - "npm-asset/bootstrap": ">=5.0.2" + "npm-asset/bootstrap": ">=5.1" }, ``` diff --git a/docs/guide/basic-usage.md b/docs/guide/basic-usage.md index 18de09f..f354dfe 100644 --- a/docs/guide/basic-usage.md +++ b/docs/guide/basic-usage.md @@ -2,7 +2,7 @@ Basic Usage =========== Yii doesn't wrap the bootstrap basics into PHP code since HTML is very simple by itself in this case. You can find details -about using the basics at [bootstrap documentation website](http://getbootstrap.com/css/). Still Yii provides a +about using the basics at [bootstrap documentation website](https://getbootstrap.com/docs/). Still Yii provides a convenient way to include bootstrap assets in your pages with a single line added to `AppAsset.php` located in your `@app/assets` directory: diff --git a/docs/guide/helper-html.md b/docs/guide/helper-html.md index ec84235..d090c52 100644 --- a/docs/guide/helper-html.md +++ b/docs/guide/helper-html.md @@ -8,7 +8,7 @@ However, several special Bootstrap markup cases are covered by the [[\yii\bootst [[\yii\bootstrap5\Html]] is an enhanced version of the regular [[\yii\helpers\Html]] dedicated to the Bootstrap needs. It provides some useful methods like: - - `staticControl()` - allows rendering of form "[static controls](https://getbootstrap.com/docs/4.1/components/forms/#readonly-plain-text)" + - `staticControl()` - allows rendering of form "[static controls](https://getbootstrap.com/docs/5.1/forms/form-control/#readonly-plain-text)" As [[\yii\bootstrap5\Html]] extends [[\yii\helpers\Html]], it can be used as a substitute, so you don't need them both inside your view files. diff --git a/docs/guide/migrating-yii2-bootstrap.md b/docs/guide/migrating-yii2-bootstrap.md index 77a5d15..355504f 100644 --- a/docs/guide/migrating-yii2-bootstrap.md +++ b/docs/guide/migrating-yii2-bootstrap.md @@ -18,7 +18,7 @@ The most notable changes are summarized below: ### ActiveForm There is a new constant [[yii\bootstrap5\ActiveForm::LAYOUT_FLOATING]]. It's a -[new form layout](https://getbootstrap.com/docs/5.0/forms/floating-labels/) introduced in Bootstrap 5. +[new form layout](https://getbootstrap.com/docs/5.1/forms/floating-labels/) introduced in Bootstrap 5. ### Breadcrumbs diff --git a/docs/guide/usage-widgets.md b/docs/guide/usage-widgets.md index 4d62c3d..d4b681e 100644 --- a/docs/guide/usage-widgets.md +++ b/docs/guide/usage-widgets.md @@ -66,7 +66,7 @@ The navbar widget has its peculiarities. You should define at which breakpoint t style of navbar (color scheme). You can change the color scheme and the collapse breakpoint with css classes. If not defined, the scheme defaults to -`navbar-light bg-light` and the breakpoint to `navbar-expand-lg`. For more information, see [Bootstrap documentation](https://getbootstrap.com/docs/4.2/components/navbar/): +`navbar-light bg-light` and the breakpoint to `navbar-expand-lg`. For more information, see [Bootstrap documentation](https://getbootstrap.com/docs/5.1/components/navbar/): ```php Navbar::begin([ diff --git a/src/Accordion.php b/src/Accordion.php index 98f5e27..e130be4 100644 --- a/src/Accordion.php +++ b/src/Accordion.php @@ -46,7 +46,7 @@ use yii\helpers\ArrayHelper; * ]); * ``` * - * @see https://getbootstrap.com/docs/5.0/components/collapse/#accordion-example + * @see https://getbootstrap.com/docs/5.1/components/collapse/#accordion-example * @author Antonio Ramirez * @author Simon Karlen */ diff --git a/src/ActiveField.php b/src/ActiveField.php index ce8f691..1ff30d5 100644 --- a/src/ActiveField.php +++ b/src/ActiveField.php @@ -83,7 +83,7 @@ use yii\helpers\ArrayHelper; * @property-read ActiveForm $form * * @see ActiveForm - * @see https://getbootstrap.com/docs/5.0/components/forms/ + * @see https://getbootstrap.com/docs/5.1/components/forms/ * * @author Michael Härtl * @author Simon Karlen @@ -430,7 +430,7 @@ class ActiveField extends \yii\widgets\ActiveField * - encode: bool, whether value should be HTML-encoded or not. * * @return $this the field object itself - * @see https://getbootstrap.com/docs/5.0/components/forms/#readonly-plain-text + * @see https://getbootstrap.com/docs/5.1/components/forms/#readonly-plain-text */ public function staticControl(array $options = []): self { diff --git a/src/ActiveForm.php b/src/ActiveForm.php index 95a4bcf..be7d3e0 100644 --- a/src/ActiveForm.php +++ b/src/ActiveForm.php @@ -53,7 +53,7 @@ use yii\base\InvalidConfigException; * ``` * * @see ActiveField for details on the [[fieldConfig]] options - * @see https://getbootstrap.com/docs/5.0/components/forms/ + * @see https://getbootstrap.com/docs/5.1/components/forms/ * * @author Michael Härtl * @author Simon Karlen diff --git a/src/Alert.php b/src/Alert.php index 28e3afa..4f3e161 100644 --- a/src/Alert.php +++ b/src/Alert.php @@ -35,7 +35,7 @@ use yii\helpers\ArrayHelper; * Alert::end(); * ``` * - * @see https://getbootstrap.com/docs/5.0/components/alerts/ + * @see https://getbootstrap.com/docs/5.1/components/alerts/ * @author Antonio Ramirez * @author Simon Karlen */ @@ -57,7 +57,7 @@ class Alert extends Widget * - tag: string, the tag name of the button. Defaults to 'button'. * * The rest of the options will be rendered as the HTML attributes of the button tag. - * Please refer to the [Alert documentation](https://getbootstrap.com/docs/5.0/components/alerts/) + * Please refer to the [Alert documentation](https://getbootstrap.com/docs/5.1/components/alerts/) * for the supported HTML attributes. */ public $closeButton = []; diff --git a/src/BaseHtml.php b/src/BaseHtml.php index 4df7c9e..4deb2d6 100644 --- a/src/BaseHtml.php +++ b/src/BaseHtml.php @@ -39,7 +39,7 @@ abstract class BaseHtml extends \yii\helpers\Html * the attributes of the resulting tag. There are also a special options: * * @return string generated HTML - * @see https://getbootstrap.com/docs/5.0/components/forms/#readonly-plain-text + * @see https://getbootstrap.com/docs/5.1/components/forms/#readonly-plain-text */ public static function staticControl(string $value, array $options = []): string { diff --git a/src/Breadcrumbs.php b/src/Breadcrumbs.php index 906d777..5d46e94 100644 --- a/src/Breadcrumbs.php +++ b/src/Breadcrumbs.php @@ -23,7 +23,7 @@ use yii\helpers\ArrayHelper; * 'options' => [], * ]); * ``` - * @see https://getbootstrap.com/docs/5.0/components/breadcrumb/ + * @see https://getbootstrap.com/docs/5.1/components/breadcrumb/ * @author Alexandr Kozhevnikov * @author Simon Karlen */ diff --git a/src/Button.php b/src/Button.php index f0b5e58..d650ae2 100644 --- a/src/Button.php +++ b/src/Button.php @@ -17,7 +17,7 @@ use yii\base\InvalidConfigException; * 'options' => ['class' => 'btn-lg'], * ]); * ``` - * @see https://getbootstrap.com/docs/5.0/components/buttons/ + * @see https://getbootstrap.com/docs/5.1/components/buttons/ * @author Antonio Ramirez */ class Button extends Widget diff --git a/src/ButtonDropdown.php b/src/ButtonDropdown.php index bb6aed4..7293540 100644 --- a/src/ButtonDropdown.php +++ b/src/ButtonDropdown.php @@ -25,8 +25,8 @@ use yii\helpers\Url; * ], * ]); * ``` - * @see https://getbootstrap.com/docs/5.0/components/buttons/ - * @see https://getbootstrap.com/docs/5.0/components/dropdowns/ + * @see https://getbootstrap.com/docs/5.1/components/buttons/ + * @see https://getbootstrap.com/docs/5.1/components/dropdowns/ * @author Antonio Ramirez */ class ButtonDropdown extends Widget diff --git a/src/ButtonGroup.php b/src/ButtonGroup.php index 21b1bf9..5283c65 100644 --- a/src/ButtonGroup.php +++ b/src/ButtonGroup.php @@ -33,8 +33,8 @@ use yii\helpers\ArrayHelper; * * Pressing on the button should be handled via JavaScript. See the following for details: * - * @see https://getbootstrap.com/docs/5.0/components/buttons/ - * @see https://getbootstrap.com/docs/5.0/components/button-group/ + * @see https://getbootstrap.com/docs/5.1/components/buttons/ + * @see https://getbootstrap.com/docs/5.1/components/button-group/ * * @author Antonio Ramirez * @author Simon Karlen diff --git a/src/ButtonToolbar.php b/src/ButtonToolbar.php index 22d0652..ace521b 100644 --- a/src/ButtonToolbar.php +++ b/src/ButtonToolbar.php @@ -44,8 +44,8 @@ use Throwable; * * Pressing on the button should be handled via JavaScript. See the following for details: * - * @see https://getbootstrap.com/docs/5.0/components/buttons/ - * @see https://getbootstrap.com/docs/5.0/components/button-group/#button-toolbar + * @see https://getbootstrap.com/docs/5.1/components/buttons/ + * @see https://getbootstrap.com/docs/5.1/components/button-group/#button-toolbar * * @author Simon Karlen */ diff --git a/src/Carousel.php b/src/Carousel.php index 3f61466..7d5ac33 100644 --- a/src/Carousel.php +++ b/src/Carousel.php @@ -31,7 +31,7 @@ use yii\helpers\ArrayHelper; * ]); * ``` * - * @see https://getbootstrap.com/docs/5.0/components/carousel/ + * @see https://getbootstrap.com/docs/5.1/components/carousel/ * @author Antonio Ramirez * @author Simon Karlen */ diff --git a/src/Dropdown.php b/src/Dropdown.php index 2890484..2d6806d 100644 --- a/src/Dropdown.php +++ b/src/Dropdown.php @@ -26,7 +26,7 @@ use yii\helpers\ArrayHelper; * ?> * * ``` - * @see https://getbootstrap.com/docs/5.0/components/dropdowns/ + * @see https://getbootstrap.com/docs/5.1/components/dropdowns/ * @author Antonio Ramirez * @author Simon Karlen */ diff --git a/src/LinkPager.php b/src/LinkPager.php index 273e2ca..15d7da9 100644 --- a/src/LinkPager.php +++ b/src/LinkPager.php @@ -25,7 +25,7 @@ use yii\helpers\ArrayHelper; * ], * ``` * - * @see https://getbootstrap.com/docs/5.0/components/pagination/ + * @see https://getbootstrap.com/docs/5.1/components/pagination/ * @author Simon Karlen * @since 2.0.2 * diff --git a/src/Modal.php b/src/Modal.php index 8851bc3..717c62a 100644 --- a/src/Modal.php +++ b/src/Modal.php @@ -24,7 +24,7 @@ use yii\helpers\ArrayHelper; * Modal::end(); * ~~~ * - * @see https://getbootstrap.com/docs/5.0/components/modal/ + * @see https://getbootstrap.com/docs/5.1/components/modal/ * @author Antonio Ramirez * @author Qiang Xue * @author Simon Karlen diff --git a/src/Nav.php b/src/Nav.php index 85b4667..be88203 100644 --- a/src/Nav.php +++ b/src/Nav.php @@ -44,8 +44,8 @@ use yii\helpers\ArrayHelper; * * Note: Multilevel dropdowns beyond Level 1 are not supported in Bootstrap 5. * - * @see https://getbootstrap.com/docs/5.0/components/navs/ - * @see https://getbootstrap.com/docs/5.0/components/dropdowns/ + * @see https://getbootstrap.com/docs/5.1/components/navs/ + * @see https://getbootstrap.com/docs/5.1/components/dropdowns/ * * @author Antonio Ramirez */ diff --git a/src/NavBar.php b/src/NavBar.php index 88d798e..d6021ba 100644 --- a/src/NavBar.php +++ b/src/NavBar.php @@ -34,7 +34,7 @@ use yii\helpers\ArrayHelper; * * @property-write array $containerOptions * - * @see https://getbootstrap.com/docs/5.0/components/navbar/ + * @see https://getbootstrap.com/docs/5.1/components/navbar/ * @author Antonio Ramirez * @author Alexander Kochetov */ @@ -58,12 +58,12 @@ class NavBar extends Widget public $collapseOptions = []; /** * @var string|bool the text of the brand or false if it's not used. Note that this is not HTML-encoded. - * @see https://getbootstrap.com/docs/5.0/components/navbar/ + * @see https://getbootstrap.com/docs/5.1/components/navbar/ */ public $brandLabel = false; /** * @var string|bool src of the brand image or false if it's not used. Note that this param will override `$this->brandLabel` param. - * @see https://getbootstrap.com/docs/5.0/components/navbar/ + * @see https://getbootstrap.com/docs/5.1/components/navbar/ * @since 2.0.8 */ public $brandImage = false; diff --git a/src/Offcanvas.php b/src/Offcanvas.php index d3ebece..680cad0 100644 --- a/src/Offcanvas.php +++ b/src/Offcanvas.php @@ -28,7 +28,7 @@ use yii\helpers\ArrayHelper; * Offcanvas::end(); * ``` * - * @see https://getbootstrap.com/docs/5.0/components/offcanvas/ + * @see https://getbootstrap.com/docs/5.1/components/offcanvas/ * @author Simon Karlen */ class Offcanvas extends Widget @@ -68,7 +68,7 @@ class Offcanvas extends Widget * - tag: string, the tag name of the button. Defaults to 'button'. * * The rest of the options will be rendered as the HTML attributes of the button tag. - * Please refer to the [Offcanvas plugin help](https://getbootstrap.com/docs/5.0/components/offcanvas/) + * Please refer to the [Offcanvas plugin help](https://getbootstrap.com/docs/5.1/components/offcanvas/) * for the supported HTML attributes. */ public $closeButton = []; diff --git a/src/Popover.php b/src/Popover.php index 32819a8..fa2ba34 100644 --- a/src/Popover.php +++ b/src/Popover.php @@ -25,7 +25,7 @@ use yii\helpers\ArrayHelper; * Popover::end(); * ``` * - * @see https://getbootstrap.com/docs/5.0/components/popovers/ + * @see https://getbootstrap.com/docs/5.1/components/popovers/ * @author Simon Karlen */ class Popover extends Widget @@ -76,7 +76,7 @@ class Popover extends Widget * - label: string, the label of the button. Defaults to 'Show'. * * The rest of the options will be rendered as the HTML attributes of the button tag. - * Please refer to the [Popover plugin help](https://getbootstrap.com/docs/5.0/components/popovers/) + * Please refer to the [Popover plugin help](https://getbootstrap.com/docs/5.1/components/popovers/) * for the supported HTML attributes. */ public $toggleButton = false; diff --git a/src/Progress.php b/src/Progress.php index 1985650..3056fab 100644 --- a/src/Progress.php +++ b/src/Progress.php @@ -71,7 +71,7 @@ use yii\helpers\ArrayHelper; * ] * ]); * ``` - * @see https://getbootstrap.com/docs/5.0/components/progress/ + * @see https://getbootstrap.com/docs/5.1/components/progress/ * @author Antonio Ramirez * @author Alexander Makarov * @author Simon Karlen diff --git a/src/Tabs.php b/src/Tabs.php index 46eee3f..4bf9492 100644 --- a/src/Tabs.php +++ b/src/Tabs.php @@ -53,8 +53,8 @@ use yii\helpers\ArrayHelper; * ]); * ``` * - * @see https://getbootstrap.com/docs/5.0/components/navs/#tabs - * @see https://getbootstrap.com/docs/5.0/components/card/#navigation + * @see https://getbootstrap.com/docs/5.1/components/navs/#tabs + * @see https://getbootstrap.com/docs/5.1/components/card/#navigation * @author Antonio Ramirez * @author Simon Karlen */ diff --git a/src/Toast.php b/src/Toast.php index 42ffad3..76bd1a8 100644 --- a/src/Toast.php +++ b/src/Toast.php @@ -37,7 +37,7 @@ use yii\helpers\ArrayHelper; * Toast::end(); * ``` * - * @see https://getbootstrap.com/docs/5.0/components/toasts/ + * @see https://getbootstrap.com/docs/5.1/components/toasts/ * @author Simon Karlen */ class Toast extends Widget @@ -68,7 +68,7 @@ class Toast extends Widget * - label: string, the label of the button. Defaults to '×'. * * The rest of the options will be rendered as the HTML attributes of the button tag. - * Please refer to the [Toast documentation](https://getbootstrap.com/docs/5.0/components/toasts/) + * Please refer to the [Toast documentation](https://getbootstrap.com/docs/5.1/components/toasts/) * for the supported HTML attributes. */ public $closeButton = []; diff --git a/src/ToggleButtonGroup.php b/src/ToggleButtonGroup.php index 4f79fe2..c9c5b63 100644 --- a/src/ToggleButtonGroup.php +++ b/src/ToggleButtonGroup.php @@ -22,7 +22,7 @@ use yii\base\InvalidConfigException; * ]) ?> * ``` * - * @see https://getbootstrap.com/docs/5.0/components/buttons/#checkbox-and-radio-buttons + * @see https://getbootstrap.com/docs/5.1/components/buttons/#checkbox-and-radio-buttons * * @author Paul Klimov * @author Simon Karlen