Skip to content

Y
yii2
Commit bb7a6872 by Qiang Xue
Options

Merge pull request #2401 from schmunk42/feature/toolbar-ui-3

Feature/toolbar ui 3
parents 65a8eae7 e1c30eab
Showing with 89 additions and 77 deletions
extensions/debug/views/default/index.php
...@@ -17,95 +17,102 @@ $this->title = 'Yii Debugger'; ...@@ -17,95 +17,102 @@ $this->title = 'Yii Debugger';
<div class="default-index"> <div class="default-index">
<div id="yii-debug-toolbar" class="yii-debug-toolbar-top"> <div id="yii-debug-toolbar" class="yii-debug-toolbar-top">
<div class="yii-debug-toolbar-block title"> <div class="yii-debug-toolbar-block title">
<a href="#"> <a href="#">
<img width="29" height="30" alt="" src="<?= \yii\debug\Module::getYiiLogo() ?>"> <img width="29" height="30" alt="" src="<?= \yii\debug\Module::getYiiLogo() ?>">
Yii Debugger Yii Debugger
</a> </a>
</div> </div>
<?php foreach ($panels as $panel): ?> <?php foreach ($panels as $panel): ?>
<?= $panel->getSummary() ?> <?= $panel->getSummary() ?>
<?php endforeach; ?> <?php endforeach; ?>
</div> </div>
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<h1>Available Debug Data</h1>
<?php <?php
$timeFormatter = extension_loaded('intl') ? Yii::createObject(['class' => 'yii\i18n\Formatter']) : Yii::$app->formatter; if (isset($this->context->module->panels['db']) && isset($this->context->module->panels['request'])) {
echo GridView::widget([ echo " <h1>Available Debug Data</h1>";
'dataProvider' => $dataProvider, $timeFormatter = extension_loaded('intl') ? Yii::createObject(['class' => 'yii\i18n\Formatter']) : Yii::$app->formatter;
'filterModel' => $searchModel,
'rowOptions' => function ($model, $key, $index, $grid) use ($searchModel) {
$dbPanel = $this->context->module->panels['db'];
if ($searchModel->isCodeCritical($model['statusCode']) || $dbPanel->isQueryCountCritical($model['sqlCount'])) { echo GridView::widget([
return ['class'=>'danger']; 'dataProvider' => $dataProvider,
} else { 'filterModel' => $searchModel,
return []; 'rowOptions' => function ($model, $key, $index, $grid) use ($searchModel) {
} $dbPanel = $this->context->module->panels['db'];
},
'columns' => [
['class' => 'yii\grid\SerialColumn'],
[
'attribute' => 'tag',
'value' => function ($data) {
return Html::a($data['tag'], ['view', 'tag' => $data['tag']]);
},
'format' => 'html',
],
[
'attribute' => 'time',
'value' => function ($data) use ($timeFormatter) {
return $timeFormatter->asDateTime($data['time'], 'short');
},
],
'ip',
[
'attribute' => 'sqlCount',
'label' => 'Total queries',
'value' => function ($data) {
$dbPanel = $this->context->module->panels['db'];
if ($dbPanel->isQueryCountCritical($data['sqlCount'])) { if ($searchModel->isCodeCritical($model['statusCode']) || $dbPanel->isQueryCountCritical($model['sqlCount'])) {
return ['class'=>'danger'];
} else {
return [];
}
},
'columns' => [
['class' => 'yii\grid\SerialColumn'],
[
'attribute' => 'tag',
'value' => function ($data) {
return Html::a($data['tag'], ['view', 'tag' => $data['tag']]);
},
'format' => 'html',
],
[
'attribute' => 'time',
'value' => function ($data) use ($timeFormatter) {
return $timeFormatter->asDateTime($data['time'], 'short');
},
],
'ip',
[
'attribute' => 'sqlCount',
'label' => 'Total queries',
'value' => function ($data) {
$dbPanel = $this->context->module->panels['db'];
$content = Html::tag('b', $data['sqlCount']) . ' ' . Html::tag('span', '', ['class' => 'glyphicon glyphicon-exclamation-sign']); if ($dbPanel->isQueryCountCritical($data['sqlCount'])) {
return Html::a($content, ['view', 'panel' => 'db', 'tag' => $data['tag']], [
'title' => 'Too many queries. Allowed count is ' . $dbPanel->criticalQueryThreshold,
]);
} else { $content = Html::tag('b', $data['sqlCount']) . ' ' . Html::tag('span', '', ['class' => 'glyphicon glyphicon-exclamation-sign']);
return $data['sqlCount']; return Html::a($content, ['view', 'panel' => 'db', 'tag' => $data['tag']], [
} 'title' => 'Too many queries. Allowed count is ' . $dbPanel->criticalQueryThreshold,
}, ]);
'format' => 'html',
], } else {
[ return $data['sqlCount'];
'attribute' => 'method', }
'filter' => ['get' => 'GET', 'post' => 'POST', 'delete' => 'DELETE', 'put' => 'PUT', 'head' => 'HEAD'] },
], 'format' => 'html',
[ ],
'attribute'=>'ajax', [
'value' => function ($data) { 'attribute' => 'method',
return $data['ajax'] ? 'Yes' : 'No'; 'filter' => ['get' => 'GET', 'post' => 'POST', 'delete' => 'DELETE', 'put' => 'PUT', 'head' => 'HEAD']
}, ],
'filter' => ['No', 'Yes'], [
], 'attribute'=>'ajax',
[ 'value' => function ($data) {
'attribute' => 'url', return $data['ajax'] ? 'Yes' : 'No';
'label' => 'URL', },
], 'filter' => ['No', 'Yes'],
[ ],
'attribute' => 'statusCode', [
'filter' => [200 => 200, 404 => 404, 403 => 403, 500 => 500], 'attribute' => 'url',
'label' => 'Status code' 'label' => 'URL',
],
[
'attribute' => 'statusCode',
'filter' => [200 => 200, 404 => 404, 403 => 403, 500 => 500],
'label' => 'Status code'
],
], ],
], ]);
]); ?>
} else {
echo "<div class='alert alert-warning'>No data available. Panel <code>db</code> or <code>request</code> not found.</div>";
}
?>
</div> </div>
</div> </div>
</div> </div>
extensions/debug/views/default/panels/db/detail.php
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
use yii\grid\GridView; use yii\grid\GridView;
?> ?>
<h1>Database Queries</h1> <h1>Database Queries</h1>
......
extensions/debug/views/default/panels/log/detail.php
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
use yii\helpers\Html; use yii\helpers\Html;
use yii\grid\GridView; use yii\grid\GridView;
use yii\log\Logger; use yii\log\Logger;
?> ?>
<h1>Log Messages</h1> <h1>Log Messages</h1>
<?php <?php
......
extensions/debug/views/default/panels/log/summary.php
<?php <?php
use yii\log\Target; use yii\log\Target;
use yii\log\Logger; use yii\log\Logger;
?> ?>
<?php <?php
......
extensions/debug/views/default/panels/request/detail.php
...@@ -5,6 +5,8 @@ use yii\bootstrap\Tabs; ...@@ -5,6 +5,8 @@ use yii\bootstrap\Tabs;
* @var yii\debug\panels\RequestPanel $panel * @var yii\debug\panels\RequestPanel $panel
*/ */
echo "<h1>Request</h1>";
echo Tabs::widget([ echo Tabs::widget([
'items' => [ 'items' => [
[ [
......
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