Skip to content

Y
yii2
Commit 813c4f4a by resurtm
Options

Previous exceptions refinements.

parent b525d9c7
Showing with 48 additions and 31 deletions
framework/yii/views/errorHandler/main.php
...@@ -55,7 +55,7 @@ a{ ...@@ -55,7 +55,7 @@ a{
a:hover{ a:hover{
text-decoration: underline; text-decoration: underline;
} }
h1,h2,p,img,ul li{ h1,h2,h3,p,img,ul li{
font-family: Arial,sans-serif; font-family: Arial,sans-serif;
color: #505050; color: #505050;
} }
...@@ -92,33 +92,46 @@ html,body{ ...@@ -92,33 +92,46 @@ html,body{
font-size: 20px; font-size: 20px;
text-shadow: 0 1px 0 #cacaca; text-shadow: 0 1px 0 #cacaca;
} }
/* previous exceptions */ /* previous exceptions */
.header div.previous{ .header .previous{
margin: 20px 20px 0 0; margin: 20px 0;
padding-left: 30px;
} }
.header div.previous div{ .header .previous div{
margin: 15px 20px 0 25px; margin: 20px 0;
} }
.header div.previous h1{ .header .previous .arrow{
font-size: 20px;
margin-bottom: 10px;
}
h1 span.arrow{
display: inline-block;
-moz-transform: scale(-1, 1); -moz-transform: scale(-1, 1);
-webkit-transform: scale(-1, 1); -webkit-transform: scale(-1, 1);
-o-transform: scale(-1, 1); -o-transform: scale(-1, 1);
transform: scale(-1, 1); transform: scale(-1, 1);
filter: progid:DXImageTransform.Microsoft.BasicImage(mirror=1); filter: progid:DXImageTransform.Microsoft.BasicImage(mirror=1);
width: 30px; font-size: 26px;
text-align: center; position: absolute;
margin-top: -9px;
margin-left: -22px;
color: #e51717;
text-shadow: 0 1px 0 #cacaca;
} }
.header div.previous h2{ .header .previous h2{
font-size: 15px; font-size: 20px;
margin-left: 30px; color: #e51717;
text-shadow: 0 1px 0 #cacaca;
margin-bottom: 10px;
} }
.header div.previous p{ .header .previous h2 a{
margin: 10px 0 0 30px; color: #e57373;
}
.header .previous h2 a:hover{
color: #e51717;
}
.header .previous h3{
font-size: 14px;
margin: 10px 0;
}
.header .previous p{
font-size: 14px;
color: #aaa; color: #aaa;
} }
......
framework/yii/views/errorHandler/previousException.php
<div class="previous"> <?php
<h1><span class="arrow">&crarr;</span><span>Caused by: </span><?php /**
/**
* @var \yii\base\View $this * @var \yii\base\View $this
* @var \yii\base\Exception $exception * @var \yii\base\Exception $exception
* @var string $previousHtml * @var string $previousHtml
* @var \yii\base\ErrorHandler $context * @var \yii\base\ErrorHandler $context
*/ */
$context = $this->context; $context = $this->context;
if ($exception instanceof \yii\base\Exception) { ?>
echo '<span>' . $context->htmlEncode($exception->getName()) . '</span>'; <div class="previous">
echo ' &ndash; ' . $context->addTypeLinks(get_class($exception)); <span class="arrow">&crarr;</span>
} else { <h2>
echo '<span>' . $context->htmlEncode(get_class($exception)) . '</span>'; <span>Caused by:</span>
} <?php if ($exception instanceof \yii\base\Exception): ?>
?></h1> <span><?php echo $context->htmlEncode($exception->getName()); ?></span> &ndash;
<h2><?php echo $context->htmlEncode($exception->getMessage()); ?></h2> <?php echo $context->addTypeLinks(get_class($exception)); ?>
<p>In <span class="file"><?php echo $exception->getFile(); ?></span> at line <span class="line"><?php echo $exception->getLine(); ?></span></p> <?php else: ?>
<span><?php echo $context->htmlEncode(get_class($exception)); ?></span>
<?php endif; ?>
</h2>
<h3><?php echo $context->htmlEncode($exception->getMessage()); ?></h3>
<p>in <span class="file"><?php echo $exception->getFile(); ?></span> at line <span class="line"><?php echo $exception->getLine(); ?></span></p>
<?php echo $previousHtml; ?> <?php echo $previousHtml; ?>
</div> </div>
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