[FrameworkBundle] made various small fixes to the Exception layout
This commit is contained in:
Fabien Potencier
parent
d7ce23fe53
commit
be8618ec56
@ -22,12 +22,6 @@ build: 56
|
||||
text-align:left;
|
||||
background-color:#efefef;
|
||||
}
|
||||
.sf-exceptionreset body
|
||||
{
|
||||
/* Pour faire des hovers autre que sur des a */
|
||||
/*behavior: url(/htc/csshover.htc);*/
|
||||
/* Ca fonctionne avec ie6 et ce n'est pas accessible */
|
||||
}
|
||||
.sf-exceptionreset abbr
|
||||
{
|
||||
border-bottom: 1px dotted #000;
|
||||
@ -124,7 +118,7 @@ build: 56
|
||||
{
|
||||
background-color:#FFFFFF;
|
||||
border:1px solid #dfdfdf;
|
||||
padding:50px;
|
||||
padding:40px 50px;
|
||||
}
|
||||
|
||||
.sf-exceptionreset .block_exception
|
||||
@ -198,17 +192,10 @@ build: 56
|
||||
text-decoration:underline;
|
||||
}
|
||||
|
||||
.sf-exceptionreset .logs
|
||||
{
|
||||
padding-bottom:20px;
|
||||
}
|
||||
|
||||
.sf-exceptionreset .logs h2
|
||||
{
|
||||
float:left;
|
||||
width:654px;
|
||||
background: url(../images/icon_log.png) no-repeat 0 -4px;
|
||||
padding-left:24px;
|
||||
}
|
||||
|
||||
.sf-exceptionreset .error_count
|
||||
|
||||
@ -45,10 +45,17 @@
|
||||
{% endfor %}
|
||||
|
||||
{% if logger %}
|
||||
|
||||
<div class="block">
|
||||
<div class="logs clear_fix">
|
||||
<h2>Logs <a href="#" onclick="toggle('logs'); return false;">»</a></h2>
|
||||
{% spaceless %}
|
||||
<h2>
|
||||
Logs
|
||||
<a href="#" onclick="toggle('logs'); switchIcons('icon_logs_open', 'icon_logs_close'); return false;">
|
||||
<img class="toggle" id="icon_logs_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: hidden" />
|
||||
<img class="toggle" id="icon_logs_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: display; margin-left: -18px" />
|
||||
</a>
|
||||
</h2>
|
||||
{% endspaceless %}
|
||||
|
||||
{% if logger.counterrors %}
|
||||
<div class="error_count">
|
||||
@ -65,13 +72,19 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if currentContent %}
|
||||
<div class="block">
|
||||
|
||||
<h2>Content of the Output <a href="#" onclick="toggle('output_content'); return false;">»</a></h2>
|
||||
{% spaceless %}
|
||||
<h2>
|
||||
Content of the Output
|
||||
<a href="#" onclick="toggle('output_content'); switchIcons('icon_content_open', 'icon_content_close'); return false;">
|
||||
<img class="toggle" id="icon_content_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: hidden" />
|
||||
<img class="toggle" id="icon_content_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: display; margin-left: -18px" />
|
||||
</a>
|
||||
</h2>
|
||||
{% endspaceless %}
|
||||
|
||||
<div id="output_content" style="display: none">
|
||||
{{ currentContent }}
|
||||
|
||||
@ -4,27 +4,25 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset={{ _charset }}"/>
|
||||
<title>{{ exception.message }} ({{ status_code }} {{ status_text }})</title>
|
||||
|
||||
<link href="{{ asset('/bundles/framework/css/exception_layout.css') }}" rel="stylesheet" type="text/css" media="all" />
|
||||
<link href="{{ asset('/bundles/framework/css/exception.css') }}" rel="stylesheet" type="text/css" media="all" />
|
||||
<link href="{{ asset('bundles/framework/css/exception_layout.css') }}" rel="stylesheet" type="text/css" media="all" />
|
||||
<link href="{{ asset('bundles/framework/css/exception.css') }}" rel="stylesheet" type="text/css" media="all" />
|
||||
</head>
|
||||
<body>
|
||||
<div id="content">
|
||||
<div class="header clear_fix">
|
||||
<div class="header_logo">
|
||||
<a href="http://symfony.com/">
|
||||
<img src="{{ asset('bundles/framework/images/logo_symfony.gif') }}" alt="Symfony" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="search">
|
||||
<form method="post" action="http://symfony.com/search">
|
||||
<form method="get" action="http://symfony.com/search">
|
||||
<div class="form_row">
|
||||
|
||||
<label for="search_id">
|
||||
<img src="{{ asset('bundles/framework/images/grey_magnifier.png') }}" alt="Search on Symfony website" />
|
||||
</label>
|
||||
|
||||
<input name="search_name" id="search_id" type="text" placeholder="Search on Symfony website" />
|
||||
<input name="q" id="search_id" type="text" placeholder="Search on Symfony website" />
|
||||
|
||||
<button type="submit">
|
||||
<span class="border_l">
|
||||
|
||||
@ -9,11 +9,13 @@
|
||||
{% endif %}
|
||||
|
||||
{% if trace.file is defined and trace.line is defined %}
|
||||
in {{ trace.file|format_file(trace.line) }}
|
||||
in {{ trace.file|format_file(trace.line) }}
|
||||
{% spaceless %}
|
||||
<a href="#" onclick="toggle('trace_{{ prefix ~ '_' ~ i }}'); switchIcons('icon_{{ prefix ~ '_' ~ i }}_open', 'icon_{{ prefix ~ '_' ~ i }}_close'); return false;">
|
||||
<img class="toggle" id="icon_{{ prefix ~ '_' ~ i }}_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == prefix ? 'hidden' : 'display' }}" />
|
||||
<img class="toggle" id="icon_{{ prefix ~ '_' ~ i }}_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == prefix ? 'display' : 'hidden' }}; margin-left: -22px" />
|
||||
<img class="toggle" id="icon_{{ prefix ~ '_' ~ i }}_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == prefix ? 'display' : 'hidden' }}; margin-left: -18px" />
|
||||
</a>
|
||||
{% endspaceless %}
|
||||
<div id="trace_{{ prefix ~ '_' ~ i }}" style="display: {{ 0 == i ? 'block' : 'none' }}" class="trace">
|
||||
{{ trace.file|file_excerpt(trace.line) }}
|
||||
</div>
|
||||
|
||||
@ -1,9 +1,14 @@
|
||||
<div class="block">
|
||||
{% if count > 0 %}
|
||||
<h2>
|
||||
<span>{{ count - position + 1 }}/{{ count + 1 }}</span>
|
||||
{{ exception.class|abbr_class }}: {{ exception.message|replace({ "\n": '<br />' }) }}
|
||||
<a href="#" onclick="toggle('traces_{{ position }}', 'traces'); return false;">»</a><br />
|
||||
<span><small>[{{ count - position + 1 }}/{{ count + 1 }}]</small></span>
|
||||
{{ exception.class|abbr_class }}: {{ exception.message|replace({ "\n": '<br />' }) }}
|
||||
{% spaceless %}
|
||||
<a href="#" onclick="toggle('traces_{{ position }}', 'traces'); switchIcons('icon_traces_{{ position }}_open', 'icon_traces_{{ position }}_close'); return false;">
|
||||
<img class="toggle" id="icon_traces_{{ position }}_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == position ? 'display' : 'hidden' }}" />
|
||||
<img class="toggle" id="icon_traces_{{ position }}_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == position ? 'hidden' : 'display' }}; margin-left: -18px" />
|
||||
</a>
|
||||
{% endspaceless %}
|
||||
</h2>
|
||||
{% else %}
|
||||
<h2>Stack Trace</h3>
|
||||
@ -11,12 +16,10 @@
|
||||
|
||||
<a id="traces_link_{{ position }}"></a>
|
||||
<ol class="traces list_exception" id="traces_{{ position }}" style="display: {{ 0 == position ? 'block' : 'none' }}">
|
||||
|
||||
{% for i, trace in exception.trace %}
|
||||
<li>
|
||||
{% include 'FrameworkBundle:Exception:trace.html.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %}
|
||||
</li>
|
||||
{% endfor %}
|
||||
|
||||
</ol>
|
||||
</div>
|
||||
Reference in New Issue
Block a user