Commits

Christoffer Niska committed 6607ad1

Fixed the issue with dropdown menu caret not showing.

Comments (0)

Files changed (3)

widgets/BootMenu.php

             else
                 $item['linkOptions']['class'] = 'dropdown-toggle';
 
+			$item['label'] .= ' <b class="caret"></b>';
 			$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());
     }
 }

widgets/BootNav.php

 
 		echo CHtml::openTag('div', $this->htmlOptions);
 		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 '<div class="nav-collapse">';
 

widgets/BootTwipsy.php

 	/**
 	 * @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.