Browse Source

Fix error page alignment problems in various browsers

issue #418
tags/2.0.0-beta
Carsten Brandt 12 years ago
parent
commit
cb8cc9f61d
  1. 9
      framework/yii/views/errorHandler/callStackItem.php
  2. 12
      framework/yii/views/errorHandler/main.php

9
framework/yii/views/errorHandler/callStackItem.php

@ -16,7 +16,7 @@ $context = $this->context;
<li class="<?php if (!$context->isCoreFile($file) || $index === 1) echo 'application'; ?> call-stack-item"> <li class="<?php if (!$context->isCoreFile($file) || $index === 1) echo 'application'; ?> call-stack-item">
<div class="element-wrap"> <div class="element-wrap">
<div class="element"> <div class="element">
<span class="line-number"><?php echo (int)$index; ?>.</span> <span class="item-number"><?php echo (int)$index; ?>.</span>
<span class="text"><?php if ($file !== null) echo 'in ' . $context->htmlEncode($file); ?></span> <span class="text"><?php if ($file !== null) echo 'in ' . $context->htmlEncode($file); ?></span>
<?php if ($method !== null): ?> <?php if ($method !== null): ?>
<span class="call"> <span class="call">
@ -36,7 +36,12 @@ $context = $this->context;
<?php endfor; ?> <?php endfor; ?>
<div class="code"> <div class="code">
<span class="lines"><?php for ($i = $begin; $i <= $end; ++$i) echo (int)$i . '<br/>'; ?></span> <span class="lines"><?php for ($i = $begin; $i <= $end; ++$i) echo (int)$i . '<br/>'; ?></span>
<pre><?php for ($i = $begin; $i <= $end; ++$i) echo $context->htmlEncode($lines[$i]); ?></pre> <pre><?php
// fill empty lines with a whitespace to avoid rendering problems in opera
for ($i = $begin; $i <= $end; ++$i) {
echo (trim($lines[$i]) == '') ? " \n" : $context->htmlEncode($lines[$i]);
}
?></pre>
</div> </div>
</div> </div>
<?php endif; ?> <?php endif; ?>

12
framework/yii/views/errorHandler/main.php

@ -169,7 +169,7 @@ html,body{
color: #000; color: #000;
text-shadow: 0 1px 0 #cacaca; text-shadow: 0 1px 0 #cacaca;
} }
.call-stack ul li .line-number{ .call-stack ul li .item-number{
width: 45px; width: 45px;
display: inline-block; display: inline-block;
} }
@ -204,9 +204,8 @@ html,body{
background-color: #ffebeb; background-color: #ffebeb;
position: absolute; position: absolute;
width: 100%; width: 100%;
height: 20px; height: 18px;
z-index: 100; z-index: 100;
margin-top: 15px;
} }
.call-stack ul li .hover-line{ .call-stack ul li .hover-line{
background: none; background: none;
@ -216,8 +215,8 @@ html,body{
} }
.call-stack ul li .code{ .call-stack ul li .code{
min-width: 860px; /* 960px - 50px * 2 */ min-width: 860px; /* 960px - 50px * 2 */
margin: 0 auto; margin: 15px auto;
padding: 15px 50px; padding: 0 50px;
position: relative; position: relative;
} }
.call-stack ul li .code .lines{ .call-stack ul li .code .lines{
@ -226,6 +225,8 @@ html,body{
left: 50px; left: 50px;
line-height: 18px; line-height: 18px;
font-size: 14px; font-size: 14px;
vertical-align: middle;
text-align: right;
font-family: Consolas, Courier New, monospace; font-family: Consolas, Courier New, monospace;
color: #aaa; color: #aaa;
} }
@ -235,6 +236,7 @@ html,body{
left: 50px; left: 50px;
line-height: 18px; line-height: 18px;
font-size: 14px; font-size: 14px;
vertical-align: middle;
font-family: Consolas, Courier New, monospace; font-family: Consolas, Courier New, monospace;
display: inline; display: inline;
} }

Loading…
Cancel
Save