Commit 00269992 by niskac

Fixed the issue with dropdown menu caret not showing.

parent 939b267b
...@@ -191,10 +191,11 @@ class BootMenu extends CMenu ...@@ -191,10 +191,11 @@ class BootMenu extends CMenu
else else
$item['linkOptions']['class'] = 'dropdown-toggle'; $item['linkOptions']['class'] = 'dropdown-toggle';
$item['label'] .= ' <b class="caret"></b>';
$item['linkOptions']['data-toggle'] = 'dropdown'; $item['linkOptions']['data-toggle'] = 'dropdown';
} }
$label = $this->linkLabelWrapper === null ? $item['label'] : '<' . $this->linkLabelWrapper . '>' . $item['label'] . '<b class="caret"></b></' . $this->linkLabelWrapper . '>'; $label = $this->linkLabelWrapper === null ? $item['label'] : '<' . $this->linkLabelWrapper . '>' . $item['label'] . '</' . $this->linkLabelWrapper . '>';
return CHtml::link($label, $item['url'], isset($item['linkOptions']) ? $item['linkOptions'] : array()); return CHtml::link($label, $item['url'], isset($item['linkOptions']) ? $item['linkOptions'] : array());
} }
} }
...@@ -79,7 +79,8 @@ class BootNav extends BootWidget ...@@ -79,7 +79,8 @@ class BootNav extends BootWidget
echo CHtml::openTag('div', $this->htmlOptions); echo CHtml::openTag('div', $this->htmlOptions);
echo '<div class="navbar-inner"><div class="'.$containerCssClass.'">'; echo '<div class="navbar-inner"><div class="'.$containerCssClass.'">';
echo '<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"></a>'; //todo: Add support for collapse on narrow layouts. //todo: Add support for collapse on narrow layouts.
//echo '<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"></a>';
echo CHtml::openTag('a', $this->brandOptions).$this->brand.'</a>'; echo CHtml::openTag('a', $this->brandOptions).$this->brand.'</a>';
echo '<div class="nav-collapse">'; echo '<div class="nav-collapse">';
......
...@@ -13,7 +13,7 @@ class BootTwipsy extends BootWidget ...@@ -13,7 +13,7 @@ class BootTwipsy extends BootWidget
/** /**
* @var string the CSS selector to use for selecting the twipsy elements. * @var string the CSS selector to use for selecting the twipsy elements.
*/ */
public $selector = 'a[title]'; public $selector = 'a[title], a[data-title]';
/** /**
* Initializes the widget. * Initializes the widget.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment