Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
cb8cc9f6
Commit
cb8cc9f6
authored
May 26, 2013
by
Carsten Brandt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix error page alignment problems in various browsers
issue #418
parent
1d3df026
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
7 deletions
+14
-7
callStackItem.php
framework/yii/views/errorHandler/callStackItem.php
+7
-2
main.php
framework/yii/views/errorHandler/main.php
+7
-5
No files found.
framework/yii/views/errorHandler/callStackItem.php
View file @
cb8cc9f6
...
@@ -16,7 +16,7 @@ $context = $this->context;
...
@@ -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;
...
@@ -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
;
?>
...
...
framework/yii/views/errorHandler/main.php
View file @
cb8cc9f6
...
@@ -169,7 +169,7 @@ html,body{
...
@@ -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{
...
@@ -204,9 +204,8 @@ html,body{
background-color
:
#ffebeb
;
background-color
:
#ffebeb
;
position
:
absolute
;
position
:
absolute
;
width
:
100%
;
width
:
100%
;
height
:
20
px
;
height
:
18
px
;
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{
...
@@ -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{
...
@@ -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{
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment