php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 23:09:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed indentation and button group label bug

Browse Source
This commit is contained in:
Antonio Ramirez
2013-05-29 14:32:33 +02:00
parent f651e72372
commit fce33a25dd
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
framework/yii/bootstrap/Button.php
View File

@@ -22,18 +22,17 @@ use yii\helpers\Html;
* 'label' => 'Action', * 'label' => 'Action',
* 'items' => Dropdown::widget(array( * 'items' => Dropdown::widget(array(
* 'clientOptions' => false, * 'clientOptions' => false,
* 'items' => array( * 'items' => array(
* array( * array(
* 'label' => 'DropdownA', * 'label' => 'DropdownA',
* 'url' => '/', * 'url' => '/',
* ), * ),
* array( * array(
* 'label' => 'DropdownB', * 'label' => 'DropdownB',
* 'url' => '#', * 'url' => '#',
* ), * ),
* ),
* ), * ),
* ), * )),
* )); * ));
* *
* // split button group using `items` dropdown configuration * // split button group using `items` dropdown configuration
@@ -134,10 +133,12 @@ class Button extends Widget
$splitButton = Html::tag('button', '<span class="caret"></span>', $this->buttonOptions); $splitButton = Html::tag('button', '<span class="caret"></span>', $this->buttonOptions);
} else { } else {
$tag = 'a'; $tag = 'a';
$label .= ' <span class="caret"></span>';
$options = $this->buttonOptions; $options = $this->buttonOptions;
if (!isset($options['href'])) { if (!isset($options['href'])) {
$options['href'] = '#'; $options['href'] = '#';
} }
$this->addCssClass($options, 'dropdown-toggle');
$options['data-toggle'] = 'dropdown'; $options['data-toggle'] = 'dropdown';
} }
return Html::tag($tag, $label, $options) . "\n" . $splitButton; return Html::tag($tag, $label, $options) . "\n" . $splitButton;