Fixed debugger with the new bootstrap.

apps/basic/controllers/SiteController.php

@@ -21,6 +21,7 @@ class SiteController extends Controller
 
 	public function actionIndex()
 	{
+		Yii::warning('test');
 		return $this->render('index');
 	}
 

framework/yii/bootstrap/ButtonDropdown.php

@@ -46,7 +46,7 @@ class ButtonDropdown extends Widget
 	/**
 	 * @var array the HTML attributes of the button.
 	 */
-	public $buttonOptions = array();
+	public $options = array();
 	/**
 	 * @var array the configuration array for [[Dropdown]].
 	 */
@@ -58,24 +58,11 @@ class ButtonDropdown extends Widget
 
 
 	/**
-	 * Initializes the widget.
-	 * If you override this method, make sure you call the parent implementation first.
-	 */
-	public function init()
-	{
-		parent::init();
-		Html::addCssClass($this->options, 'btn-group');
-	}
-
-	/**
 	 * Renders the widget.
 	 */
 	public function run()
 	{
-		echo Html::beginTag('div', $this->options) . "\n";
-		echo $this->renderButton() . "\n";
-		echo $this->renderDropdown() . "\n";
-		echo Html::endTag('div') . "\n";
+		echo $this->renderButton() . "\n" . $this->renderDropdown();
 		$this->registerPlugin('button');
 	}
 
@@ -85,21 +72,21 @@ class ButtonDropdown extends Widget
 	 */
 	protected function renderButton()
 	{
-		Html::addCssClass($this->buttonOptions, 'btn');
+		Html::addCssClass($this->options, 'btn');
 		if ($this->split) {
 			$tag = 'button';
-			$options = $this->buttonOptions;
-			$this->buttonOptions['data-toggle'] = 'dropdown';
-			Html::addCssClass($this->buttonOptions, 'dropdown-toggle');
+			$options = $this->options;
+			$this->options['data-toggle'] = 'dropdown';
+			Html::addCssClass($this->options, 'dropdown-toggle');
 			$splitButton = Button::widget(array(
 				'label' => '<span class="caret"></span>',
 				'encodeLabel' => false,
-				'options' => $this->buttonOptions,
+				'options' => $this->options,
 			));
 		} else {
 			$tag = 'a';
 			$this->label .= ' <span class="caret"></span>';
-			$options = $this->buttonOptions;
+			$options = $this->options;
 			if (!isset($options['href'])) {
 				$options['href'] = '#';
 			}

framework/yii/bootstrap/ButtonGroup.php

@@ -18,7 +18,7 @@ use yii\helpers\Html;
  * ```php
  * // a button group with items configuration
  * echo ButtonGroup::::widget(array(
- *     'items' => array(
+ *     'buttons' => array(
  *         array('label' => 'A'),
  *         array('label' => 'B'),
  *     )
@@ -26,7 +26,7 @@ use yii\helpers\Html;
  *
  * // button group with an item as a string
  * echo ButtonGroup::::widget(array(
- *     'items' => array(
+ *     'buttons' => array(
  *         Button::widget(array('label' => 'A')),
  *         array('label' => 'B'),
  *     )
@@ -60,7 +60,6 @@ class ButtonGroup extends Widget
 	public function init()
 	{
 		parent::init();
-		$this->clientOptions = false;
 		Html::addCssClass($this->options, 'btn-group');
 	}
 
@@ -70,7 +69,7 @@ class ButtonGroup extends Widget
 	public function run()
 	{
 		echo Html::tag('div', $this->renderButtons(), $this->options);
-		$this->registerPlugin('button');
+		BootstrapAsset::register($this->getView());
 	}
 
 	/**

framework/yii/debug/assets/main.css

@@ -5,7 +5,7 @@
 	font: 11px Verdana, Arial, sans-serif;
 	text-align: left;
 	height: 40px;
-	border-bottom: 1px solid #ccc;
+	border-bottom: 1px solid #e4e4e4;
 	background: rgb(237,237,237);
 	background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEgMSIgcHJlc2VydmVBc3BlY3RSYXRpbz0ibm9uZSI+CiAgPGxpbmVhckdyYWRpZW50IGlkPSJncmFkLXVjZ2ctZ2VuZXJhdGVkIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSIgeDE9IjAlIiB5MT0iMCUiIHgyPSIwJSIgeTI9IjEwMCUiPgogICAgPHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2VkZWRlZCIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjUzJSIgc3RvcC1jb2xvcj0iI2Y2ZjZmNiIgc3RvcC1vcGFjaXR5PSIxIi8+CiAgICA8c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiNmZmZmZmYiIHN0b3Atb3BhY2l0eT0iMSIvPgogIDwvbGluZWFyR3JhZGllbnQ+CiAgPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNncmFkLXVjZ2ctZ2VuZXJhdGVkKSIgLz4KPC9zdmc+);
 	background: -moz-linear-gradient(top,  rgba(237,237,237,1) 0%, rgba(246,246,246,1) 53%, rgba(255,255,255,1) 100%);
@@ -119,11 +119,22 @@ span.indent {
 
 ul.trace {
 	font-size: 12px;
-	color: #666;
-	margin: 2px 0 0 20px;
+	color: #999;
+	margin: 2px 0 0 0;
+	padding: 0;
+	list-style: none;
 }
 
 .default-index .container,
 .default-view .container {
 	margin-top: 10px;
 }
+
+.callout-danger {
+	background-color: #fcf2f2;
+	border-color: #dFb5b4;
+}
+.callout {
+	margin: 0 0 10px 0;
+	padding: 5px 10px;
+}

framework/yii/debug/panels/LogPanel.php

@@ -65,11 +65,11 @@ EOD;
 				));
 			}
 			if ($level == Logger::LEVEL_ERROR) {
-				$class = ' class="error"';
+				$class = ' class="danger"';
 			} elseif ($level == Logger::LEVEL_WARNING) {
 				$class = ' class="warning"';
 			} elseif ($level == Logger::LEVEL_INFO) {
-				$class = ' class="info"';
+				$class = ' class="success"';
 			} else {
 				$class = '';
 			}
@@ -84,7 +84,7 @@ EOD;
 <thead>
 <tr>
 	<th style="width: 100px;">Time</th>
-	<th style="width: 100px;">Level</th>
+	<th style="width: 65px;">Level</th>
 	<th style="width: 250px;">Category</th>
 	<th>Message</th>
 </tr>

framework/yii/debug/views/default/view.php

 <?php
 
+use yii\bootstrap\ButtonDropdown;
+use yii\bootstrap\ButtonGroup;
 use yii\helpers\Html;
 
 /**
@@ -36,35 +38,36 @@ $this->title = 'Yii Debugger';
 				</ul>
 			</div><!--/span-->
 			<div class="col-lg-10">
-				<div class="meta alert alert-info">
-					<div class="btn-group">
-						<?php echo Html::a('All', array('index'), array('class' => 'btn')); ?>
-						<button class="btn dropdown-toggle" data-toggle="dropdown">
-							Last 10
-							<span class="caret"></span>
-						</button>
-						<ul class="dropdown-menu">
+				<div class="callout callout-danger">
 					<?php
 						$count = 0;
+						$items = array();
 						foreach ($manifest as $meta) {
 							$label = $meta['tag'] . ': ' . $meta['method'] . ' ' . $meta['url'] . ($meta['ajax'] ? ' (AJAX)' : '')
 								. ', ' . date('Y-m-d h:i:s a', $meta['time'])
 								. ', ' . $meta['ip'];
 							$url = array('view', 'tag' => $meta['tag'], 'panel' => $activePanel->id);
-								echo '<li>' . Html::a(Html::encode($label), $url) . '</li>';
+							$items[] = array(
+								'label' => $label,
+								'url' => $url,
+							);
 							if (++$count >= 10) {
 								break;
 							}
 						}
+						echo ButtonGroup::widget(array(
+							'buttons' => array(
+								Html::a('All', array('index'), array('class' => 'btn btn-default')),
+								ButtonDropdown::widget(array(
+									'label' => 'Last 10',
+									'options' => array('class' => 'btn-default'),
+									'dropdown' => array('items' => $items),
+								)),
+							),
+						));
+						echo "\n" . $summary['tag'] . ': ' . $summary['method'] . ' ' . Html::a(Html::encode($summary['url']), $summary['url']);
+						echo ' at ' . date('Y-m-d h:i:s a', $summary['time']) . ' by ' . $summary['ip'];
 					?>
-						</ul>
-					</div>
-					<?php echo $summary['tag']; ?>:
-					<?php echo $summary['method']; ?>
-					<?php echo Html::a(Html::encode($summary['url']), $summary['url']); ?>
-					<?php echo $summary['ajax'] ? ' (AJAX)' : ''; ?>
-					at <?php echo date('Y-m-d h:i:s a', $summary['time']); ?>
-					by <?php echo $summary['ip']; ?>
 				</div>
 				<?php echo $activePanel->getDetail(); ?>
 			</div>