Commits

Christoffer Niska committed f68a653

Fixed a bug in BootNav and updated the demo.

Comments (0)

Files changed (5)

demo/protected/config/main.php

 	// Application-level parameters
 	'params'=>array(
 		'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.',
 	),
 );

demo/protected/views/layouts/main.php

 			<?php echo CHtml::link('Bootstrap', 'http://twitter.github.com/bootstrap/'); ?>, Twitter's new web development toolkit.
 			Now with support for Bootstrap 2!
 			<?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.
-			These widgets have all been developed with care to work seemlessly together with Bootstrap and its jQuery plugins.
+			is an extension for Yii that provides a wide range of server-side widgets that allow you to easily use Bootstrap with Yii.
+			All widgets have been developed following Yii's conventions and work seemlessly together with Bootstrap and its jQuery plugins.
 		</p>
 	</div>
 

demo/protected/views/site/index.php

 $this->pageTitle = Yii::app()->params['appTitle'];
 $this->addMetaProperty('og:title', Yii::app()->params['appTitle']);
 $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:locale',Yii::app()->fb->locale);
 $this->addMetaProperty('fb:app_id', Yii::app()->fb->appID);
 			'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',
 		)); ?>
-		<?php echo $form->captchaRow($model, 'captcha'); ?>
 
 	</fieldset>
 
 		'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',
 	)); ?>
-	<?php echo \$form->captchaRow(\$model, 'captcha'); ?>
 
 </fieldset>
 

demo/protected/views/site/setup.php

 $this->pageTitle = array('Setup', Yii::app()->params['appTitle']);
 $this->addMetaProperty('og:title', 'Setup - '.Yii::app()->name);
 $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:locale',Yii::app()->fb->locale);
 $this->addMetaProperty('fb:app_id', Yii::app()->fb->appID);
     .....
     'bootstrap'=>array(
         '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
         'plugins'=>array(
             // Optionally you can configure the \"global\" plugins (button, popover, tooltip and transition)

widgets/BootNavbar.php

 	{
 		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))
 				$this->brandUrl = Yii::app()->homeUrl;