Previous exceptions refinements.

wicaksono · May 26, 2013 · 813c4f4 · 813c4f4
1 parent b525d9c
commit 813c4f4
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 36 deletions.
diff --git a/framework/yii/views/errorHandler/main.php b/framework/yii/views/errorHandler/main.php
@@ -55,7 +55,7 @@
 a:hover{
 	text-decoration: underline;
 }
-h1,h2,p,img,ul li{
+h1,h2,h3,p,img,ul li{
 	font-family: Arial,sans-serif;
 	color: #505050;
 }
@@ -92,33 +92,46 @@
 	font-size: 20px;
 	text-shadow: 0 1px 0 #cacaca;
 }
+
 /* previous exceptions */
-.header div.previous{
-	margin: 20px 20px 0 0;
+.header .previous{
+	margin: 20px 0;
+	padding-left: 30px;
 }
-.header div.previous div{
-	margin: 15px 20px 0 25px;
+.header .previous div{
+	margin: 20px 0;
 }
-.header div.previous h1{
-	font-size: 20px;
-	margin-bottom: 10px;
-}
-h1 span.arrow{
-	display: inline-block;
+.header .previous .arrow{
 	-moz-transform: scale(-1, 1);
 	-webkit-transform: scale(-1, 1);
 	-o-transform: scale(-1, 1);
 	transform: scale(-1, 1);
 	filter: progid:DXImageTransform.Microsoft.BasicImage(mirror=1);
-	width: 30px;
-	text-align: center;
+	font-size: 26px;
+	position: absolute;
+	margin-top: -9px;
+	margin-left: -22px;
+	color: #e51717;
+	text-shadow: 0 1px 0 #cacaca;
 }
-.header div.previous h2{
-	font-size: 15px;
-	margin-left: 30px;
+.header .previous h2{
+	font-size: 20px;
+	color: #e51717;
+	text-shadow: 0 1px 0 #cacaca;
+	margin-bottom: 10px;
 }
-.header div.previous p{
-	margin: 10px 0 0 30px;
+.header .previous h2 a{
+	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;
 }
 

diff --git a/framework/yii/views/errorHandler/previousException.php b/framework/yii/views/errorHandler/previousException.php
@@ -1,20 +1,24 @@
+<?php
+/**
+ * @var \yii\base\View $this
+ * @var \yii\base\Exception $exception
+ * @var string $previousHtml
+ * @var \yii\base\ErrorHandler $context
+ */
+$context = $this->context;
+?>
 <div class="previous">
-	<h1><span class="arrow">&crarr;</span><span>Caused by: </span><?php
-		/**
-		 * @var \yii\base\View $this
-		 * @var \yii\base\Exception $exception
-		 * @var string $previousHtml
-		 * @var \yii\base\ErrorHandler $context
-		 */
-		$context = $this->context;
-		if ($exception instanceof \yii\base\Exception) {
-			echo '<span>' . $context->htmlEncode($exception->getName()) . '</span>';
-			echo ' &ndash; ' . $context->addTypeLinks(get_class($exception));
-		} else {
-			echo '<span>' . $context->htmlEncode(get_class($exception)) . '</span>';
-		}
-	?></h1>
-	<h2><?php echo $context->htmlEncode($exception->getMessage()); ?></h2>
-	<p>In <span class="file"><?php echo $exception->getFile(); ?></span> at line <span class="line"><?php echo $exception->getLine(); ?></span></p>
+	<span class="arrow">&crarr;</span>
+	<h2>
+		<span>Caused by:</span>
+		<?php if ($exception instanceof \yii\base\Exception): ?>
+			<span><?php echo $context->htmlEncode($exception->getName()); ?></span> &ndash;
+			<?php echo $context->addTypeLinks(get_class($exception)); ?>
+		<?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; ?>
-</div>
+</div>