Permalink
Browse files

Removed Bug#3

  • Loading branch information...
1 parent baef873 commit 27394e868278823e9c950ccf0f077ccc575e7d39 @thelfensdrfer thelfensdrfer committed Mar 2, 2012
Showing with 5 additions and 3 deletions.
  1. +1 −1 EBootstrap.php
  2. +1 −1 EBootstrapSidebar.php
  3. +3 −1 EBootstrapTabContentWrapper.php
  4. 0 css/bootstrap.css
View
@@ -129,7 +129,7 @@ public static function buttonDropdown(EBootstrapButton $button, $submenuItems =
$html = '';
self::mergeClass($htmlOptions, array('btn-group'));
- echo self::openTag('div', $htmlOptions);
+ $html .= self::openTag('div', $htmlOptions);
if (!$split) {
$button->htmlOptions['data-toggle'] = "dropdown";
View
@@ -54,7 +54,7 @@ protected function renderMenuRecursive($items, $header = true) {
$class[]=$this->lastItemCssClass;
if($this->itemCssClass!==null)
$class[]=$this->itemCssClass;
- if ($header and (isset($item['items'])))
+ if (($header and (isset($item['items']))) or (isset($item['header']) and ($item['header'] == true)))
$class[]='nav-header';
if($class!==array()) {
if(empty($options['class']))
@@ -14,7 +14,9 @@ class EBootstrapTabContentWrapper extends EBootstrapWidget {
public function init() {
parent::init();
- echo EBootstrap::openTag('div', array('class' => 'tab-content'));
+ EBootstrap::mergeClass($this->htmlOptions, array('tab-content'));
+
+ echo EBootstrap::openTag('div', $this->htmlOptions);
}
/*
View
0 css/bootstrap.css 100644 → 100755
No changes.

0 comments on commit 27394e8

Please sign in to comment.