Commit b3d19e93 by Crisu83

Fixed a bug in BootNav and updated the demo.

parent 8f4aa205
...@@ -70,6 +70,6 @@ return array( ...@@ -70,6 +70,6 @@ return array(
// Application-level parameters // Application-level parameters
'params'=>array( 'params'=>array(
'appTitle'=>'Yii-Bootstrap - Bringing together the Yii PHP framework and Twitter\'s Bootstrap', 'appTitle'=>'Yii-Bootstrap - Bringing together the Yii PHP framework and Twitter\'s Bootstrap',
'appDescription'=>'Yii-Bootstrap is an extension for Yii that focuses on server-side that allows you to easily use Bootstrap in your Yii applications.', 'appDescription'=>'Yii-Bootstrap is an extension for Yii that provides a wide range of server-side widgets that allow you to easily use Bootstrap with Yii.',
), ),
); );
\ No newline at end of file
...@@ -87,8 +87,8 @@ ...@@ -87,8 +87,8 @@
<?php echo CHtml::link('Bootstrap', 'http://twitter.github.com/bootstrap/'); ?>, Twitter's new web development toolkit. <?php echo CHtml::link('Bootstrap', 'http://twitter.github.com/bootstrap/'); ?>, Twitter's new web development toolkit.
Now with support for Bootstrap 2! Now with support for Bootstrap 2!
<?php echo CHtml::link('Yii-Bootstrap', 'http://www.yiiframework.com/extension/bootstrap/'); ?> <?php echo CHtml::link('Yii-Bootstrap', 'http://www.yiiframework.com/extension/bootstrap/'); ?>
is an extension for Yii that focuses on server-side that allows you to easily use Bootstrap in your Yii applications. is an extension for Yii that provides a wide range of server-side widgets that allow you to easily use Bootstrap with Yii.
These widgets have all been developed with care to work seemlessly together with Bootstrap and its jQuery plugins. All widgets have been developed following Yii's conventions and work seemlessly together with Bootstrap and its jQuery plugins.
</p> </p>
</div> </div>
......
...@@ -2,7 +2,8 @@ ...@@ -2,7 +2,8 @@
$this->pageTitle = Yii::app()->params['appTitle']; $this->pageTitle = Yii::app()->params['appTitle'];
$this->addMetaProperty('og:title', Yii::app()->params['appTitle']); $this->addMetaProperty('og:title', Yii::app()->params['appTitle']);
$this->addMetaProperty('og:type', 'website'); $this->addMetaProperty('og:type', 'website');
$this->addMetaProperty('og:url', Yii::app()->request->requestUri); $this->addMetaProperty('og:image', Yii::app()->request->baseUrl.'/images/bootstrap-avatar_normal.png');
$this->addMetaProperty('og:url', $this->createUrl('index'));
$this->addMetaProperty('og:site_name', Yii::app()->name); $this->addMetaProperty('og:site_name', Yii::app()->name);
$this->addMetaProperty('og:locale',Yii::app()->fb->locale); $this->addMetaProperty('og:locale',Yii::app()->fb->locale);
$this->addMetaProperty('fb:app_id', Yii::app()->fb->appID); $this->addMetaProperty('fb:app_id', Yii::app()->fb->appID);
...@@ -688,7 +689,6 @@ Yii::app()->user->setFlash('error', '<strong>Oh snap!</strong> Change a few thin ...@@ -688,7 +689,6 @@ Yii::app()->user->setFlash('error', '<strong>Oh snap!</strong> Change a few thin
'Option one is this and that—be sure to include why it\'s great', 'Option one is this and that—be sure to include why it\'s great',
'Option two can is something else and selecting it will deselect option one', 'Option two can is something else and selecting it will deselect option one',
)); ?> )); ?>
<?php echo $form->captchaRow($model, 'captcha'); ?>
</fieldset> </fieldset>
...@@ -776,7 +776,6 @@ Yii::app()->user->setFlash('error', '<strong>Oh snap!</strong> Change a few thin ...@@ -776,7 +776,6 @@ Yii::app()->user->setFlash('error', '<strong>Oh snap!</strong> Change a few thin
'Option one is this and that—be sure to include why it\'s great', 'Option one is this and that—be sure to include why it\'s great',
'Option two can is something else and selecting it will deselect option one', 'Option two can is something else and selecting it will deselect option one',
)); ?> )); ?>
<?php echo \$form->captchaRow(\$model, 'captcha'); ?>
</fieldset> </fieldset>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
$this->pageTitle = array('Setup', Yii::app()->params['appTitle']); $this->pageTitle = array('Setup', Yii::app()->params['appTitle']);
$this->addMetaProperty('og:title', 'Setup - '.Yii::app()->name); $this->addMetaProperty('og:title', 'Setup - '.Yii::app()->name);
$this->addMetaProperty('og:type', 'website'); $this->addMetaProperty('og:type', 'website');
$this->addMetaProperty('og:url', Yii::app()->request->requestUri); $this->addMetaProperty('og:url', $this->createUrl('setup'));
$this->addMetaProperty('og:site_name', Yii::app()->name); $this->addMetaProperty('og:site_name', Yii::app()->name);
$this->addMetaProperty('og:locale',Yii::app()->fb->locale); $this->addMetaProperty('og:locale',Yii::app()->fb->locale);
$this->addMetaProperty('fb:app_id', Yii::app()->fb->appID); $this->addMetaProperty('fb:app_id', Yii::app()->fb->appID);
...@@ -42,7 +42,7 @@ $this->addMetaProperty('fb:app_id', Yii::app()->fb->appID); ...@@ -42,7 +42,7 @@ $this->addMetaProperty('fb:app_id', Yii::app()->fb->appID);
..... .....
'bootstrap'=>array( 'bootstrap'=>array(
'class'=>'ext.bootstrap.components.Bootstrap', // assuming you extracted bootstrap under extensions 'class'=>'ext.bootstrap.components.Bootstrap', // assuming you extracted bootstrap under extensions
'coreCss'=>true // whether to register the Bootstrap core CSS (bootstrap.min.css), defaults to true 'coreCss'=>true, // whether to register the Bootstrap core CSS (bootstrap.min.css), defaults to true
'responsiveCss'=>false, // whether to register the Bootstrap responsive CSS (bootstrap-responsive.min.css), default to false 'responsiveCss'=>false, // whether to register the Bootstrap responsive CSS (bootstrap-responsive.min.css), default to false
'plugins'=>array( 'plugins'=>array(
// Optionally you can configure the \"global\" plugins (button, popover, tooltip and transition) // Optionally you can configure the \"global\" plugins (button, popover, tooltip and transition)
......
...@@ -54,7 +54,8 @@ class BootNavbar extends BootWidget ...@@ -54,7 +54,8 @@ class BootNavbar extends BootWidget
{ {
if ($this->brand !== false) if ($this->brand !== false)
{ {
$this->brand = CHtml::encode(Yii::app()->name); if (!isset($this->brand))
$this->brand = CHtml::encode(Yii::app()->name);
if (!isset($this->brandUrl)) if (!isset($this->brandUrl))
$this->brandUrl = Yii::app()->homeUrl; $this->brandUrl = Yii::app()->homeUrl;
......
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