Commit b70fceb6 by Alexander Makarov

NavBar updated to reflect bootstrap v3 changes. Logo is now visible when viewed via mobile.

parent 10f2b925
...@@ -65,16 +65,21 @@ class NavBar extends Widget ...@@ -65,16 +65,21 @@ class NavBar extends Widget
$this->clientOptions = false; $this->clientOptions = false;
Html::addCssClass($this->options, 'navbar'); Html::addCssClass($this->options, 'navbar');
Html::addCssClass($this->brandOptions, 'navbar-brand'); Html::addCssClass($this->brandOptions, 'navbar-brand');
if (empty($this->options['role'])) {
$this->options['role'] = 'navigation';
}
echo Html::beginTag('div', $this->options); echo Html::beginTag('nav', $this->options);
if ($this->responsive) { if ($this->responsive) {
echo Html::beginTag('div', array('class' => 'container')); echo Html::beginTag('div', array('class' => 'container'));
echo $this->renderToggleButton(); echo $this->renderToggleButton();
echo Html::beginTag('div', array('class' => 'nav-collapse collapse navbar-responsive-collapse'));
} }
if ($this->brandLabel !== null) { if ($this->brandLabel !== null) {
echo Html::a($this->brandLabel, $this->brandUrl, $this->brandOptions); echo Html::a($this->brandLabel, $this->brandUrl, $this->brandOptions);
} }
if ($this->responsive) {
echo Html::beginTag('div', array('class' => 'nav-collapse collapse navbar-responsive-collapse'));
}
} }
/** /**
...@@ -86,7 +91,7 @@ class NavBar extends Widget ...@@ -86,7 +91,7 @@ class NavBar extends Widget
echo Html::endTag('div'); echo Html::endTag('div');
echo Html::endTag('div'); echo Html::endTag('div');
} }
echo Html::endTag('div'); echo Html::endTag('nav');
BootstrapPluginAsset::register($this->getView()); BootstrapPluginAsset::register($this->getView());
} }
......
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