php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 13:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'it3rmit-patch-2'

Browse Source
This commit is contained in:
Alexander Makarov
2014-05-27 14:07:25 +04:00
parent e88978f872 ea45113d0f
commit f53bb3185f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/bootstrap/ButtonDropdown.php
View File

@@ -64,7 +64,10 @@ class ButtonDropdown extends Widget
*/ */
public function run() public function run()
{ {
echo $this->renderButton() . "\n" . $this->renderDropdown(); echo Html::beginTag('div', ['class' => 'btn-group']);
echo "\n" . $this->renderButton();
echo "\n" . $this->renderDropdown();
echo "\n" . Html::endTag('div');
$this->registerPlugin('button'); $this->registerPlugin('button');
} }

1
extensions/bootstrap/CHANGELOG.md
View File

@@ -4,6 +4,7 @@ Yii Framework 2 bootstrap extension Change Log
2.0.0-rc under development 2.0.0-rc under development
-------------------------- --------------------------
- Bug #3292: Fixed dropdown widgets rendering incorrect HTML (it3rmit)
- Chg #3036: Upgraded Twitter Bootstrap to 3.1.x (qiangxue) - Chg #3036: Upgraded Twitter Bootstrap to 3.1.x (qiangxue)