Merge

components/Bootstrap.php

@@ -34,6 +34,10 @@ class Bootstrap extends CApplicationComponent
 	 * @since 0.9.8
 	 */
 	public $plugins = array();
+	/**
+	 * @var boolean indicates whether assets should be republished on every request.
+	 */
+	public $publishAssets = YII_DEBUG;
 
 	protected $_assetsUrl;
 
@@ -296,7 +300,7 @@ class Bootstrap extends CApplicationComponent
 		else
 		{
 			$assetsPath = Yii::getPathOfAlias('bootstrap.assets');
-			$assetsUrl = Yii::app()->assetManager->publish($assetsPath, true, -1, YII_DEBUG);
+			$assetsUrl = Yii::app()->assetManager->publish($assetsPath, true, -1, $this->publishAssets);
 			return $this->_assetsUrl = $assetsUrl;
 		}
 	}

demo/css/styles.css

@@ -219,6 +219,7 @@ p {
   padding:6px 0;
 }
 .subnav.navbar-fixed-top { top:40px; }
+.donate h3 { margin-top:0; }
 footer .powered {
   color:#888888;
   margin-bottom:20px;

demo/less/styles.less

@@ -42,6 +42,10 @@ p {
 	top: 40px;
 }
 
+.donate h3 {
+    margin-top: 0;
+}
+
 footer {
 	.powered {
 		color: #888;

demo/protected/views/site/setup.php

@@ -13,41 +13,49 @@ $this->addMetaProperty('fb:app_id', Yii::app()->fb->appID);
 
 	<h2>Setup</h2>
 
-	<p>Download the latest release.</p>
+	<p>Download the latest release from Yii extensions by following the link below:</p>
 
 	<p>
-		<?php echo CHtml::link('<i class="icon-share icon-white"></i> Get Yii-Bootstrap from Yii extensions',
-				'http://www.yiiframework.com/extension/bootstrap/', array('class'=>'btn btn-primary btn-large', 'target'=>'_blank')); ?>
+		<?php $this->widget('bootstrap.widgets.TbButton', array(
+			'type'=>'primary',
+			'size'=>'large',
+			'icon'=>'download-alt white',
+			'label'=>'Download Yii-Bootstrap',
+			'url'=>'http://www.yiiframework.com/extension/bootstrap/',
+			'htmlOptions'=>array('target'=>'_blank'),
+		)); ?>
 	</p>
 
-	<p>Unzip the extension under <strong>protected/extensions/bootstrap</strong> and add the following code to your application configuration:</p>
+	<p>Unzip the extension under <strong>protected/extensions/bootstrap</strong> and modify your application configuration accordingly:</p>
+
+	<p>If you wish to use the provided Bootstrap theme copy the <strong>theme</strong> directory to your themes directory.</p>
 
 <?php echo $parser->safeTransform("~~~
 [php]
-'preload'=>array(
-    .....
-    'bootstrap', // preload the bootstrap component
-),
-'modules'=>array(
-    .....
+// Define a path alias for the Bootstrap extension as it's used internally.
+// In this example we assume that you unzipped the extension under protected/extensions.
+Yii::setPathOfAlias('bootstrap', dirname(__FILE__).'/../extensions/bootstrap');
+
+return array(
+	'theme'=>'bootstrap', // requires you to copy the theme under your themes directory
+	'modules'=>array(
 		'gii'=>array(
-        .....
 			'generatorPaths'=>array(
 				'bootstrap.gii',
 			),
 		),
-),
-'components'=>array(
-    .....
+	),
+	'components'=>array(
 		'bootstrap'=>array(
-        'class'=>'ext.bootstrap.components.Bootstrap', // assuming you extracted bootstrap under extensions
+			'class'=>'bootstrap.components.Bootstrap',
+		),
 	),
-),
+);
 ~~~"); ?>
 
 	<p>
 		You're done! Now you can start using Bootstrap in your application. For examples on how to use the widgets please visit the
-		<?php echo CHtml::link('demo page', array('site/index')); ?>.
+		<?php echo CHtml::link('docs', array('site/index')); ?>.
 	</p>
 
 </section>

gii/bootstrap/BootstrapCode.php

@@ -8,7 +8,7 @@
 
 Yii::import('gii.generators.crud.CrudCode');
 
-class BootstrapCode extendS CrudCode
+class BootstrapCode extends CrudCode
 {
 	public function generateActiveRow($modelClass, $column)
 	{

widgets/TbAlert.php

@@ -116,7 +116,7 @@ class TbAlert extends CWidget
 				if ($this->closeText !== false && !isset($alert['closeText']))
 					$alert['closeText'] = $this->closeText;
 
-				if ($alert['closeText'] !== false)
+				if (isset($alert['closeText']) && $alert['closeText'] !== false)
 					echo '<a class="close" data-dismiss="alert">'.$alert['closeText'].'</a>';
 
 				echo Yii::app()->user->getFlash($type);

widgets/TbButton.php

@@ -23,6 +23,8 @@ class TbButton extends CWidget
 	const BUTTON_AJAXLINK = 'ajaxLink';
 	const BUTTON_AJAXBUTTON = 'ajaxButton';
 	const BUTTON_AJAXSUBMIT = 'ajaxSubmit';
+	const BUTTON_INPUTBUTTON = 'inputButton';
+	const BUTTON_INPUTSUBMIT = 'inputSubmit';
 
 	// Button types.
 	const TYPE_PRIMARY = 'primary';
@@ -232,12 +234,19 @@ class TbButton extends CWidget
 				return CHtml::htmlButton($this->label, $this->htmlOptions);
 
 			case self::BUTTON_AJAXSUBMIT:
-				$this->ajaxOptions['type'] = 'POST';
+				$this->ajaxOptions['type'] = isset($this->ajaxOptions['type']) ? $this->ajaxOptions['type'] : 'POST';
 				$this->ajaxOptions['url'] = $this->url;
 				$this->htmlOptions['type'] = 'submit';
 				$this->htmlOptions['ajax'] = $this->ajaxOptions;
 				return CHtml::htmlButton($this->label, $this->htmlOptions);
 
+			case self::BUTTON_INPUTBUTTON:
+				return CHtml::button($this->label, $this->htmlOptions);
+
+			case self::BUTTON_INPUTSUBMIT:
+				$this->htmlOptions['type'] = 'submit';
+				return CHtml::button($this->label, $this->htmlOptions);
+
 			default:
 			case self::BUTTON_LINK:
 				return CHtml::link($this->label, $this->url, $this->htmlOptions);

widgets/TbModal.php

@@ -46,7 +46,7 @@ class TbModal extends CWidget
 		if ($this->autoOpen === false && !isset($this->options['show']))
 			$this->options['show'] = false;
 
-		$classes = array('modal');
+		$classes = array('modal hide');
 
 		if ($this->fade === true)
 			$classes[] = 'fade';