diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace _ in stylesheets (ids and classes) by - (should be consistent across the whole framework now)

Browse Source
This commit is contained in:
Fabien Potencier 2012-11-12 18:32:01 +01:00
parent 983b2b5e2a
commit 812b9b1724
16 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css
View File

@ -89,7 +89,7 @@ build: 56
margin: 10px 0 20px; margin: 10px 0 20px;
} }
.sf-reset .block, .sf-reset .block,
.sf-reset .block_exception { .sf-reset .block-exception {
-moz-border-radius: 16px; -moz-border-radius: 16px;
-webkit-border-radius: 16px; -webkit-border-radius: 16px;
border-radius: 16px; border-radius: 16px;
@ -100,44 +100,44 @@ build: 56
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
padding: 40px 50px; padding: 40px 50px;
} }
.sf-reset .block_exception { .sf-reset .block-exception {
background-color: #f6f6f6; background-color: #f6f6f6;
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
padding: 30px 28px; padding: 30px 28px;
} }
.sf-reset .block_exception div { .sf-reset .block-exception div {
color: #313131; color: #313131;
font-size: 10px; font-size: 10px;
} }
.sf-reset .block_exception_detected .illustration_exception, .sf-reset .block-exception-detected .illustration-exception,
.sf-reset .block_exception_detected .text_exception { .sf-reset .block-exception-detected .text-exception {
float: left; float: left;
} }
.sf-reset .block_exception_detected .illustration_exception { .sf-reset .block-exception-detected .illustration-exception {
width: 152px; width: 152px;
} }
.sf-reset .block_exception_detected .text_exception { .sf-reset .block-exception-detected .text-exception {
width: 670px; width: 670px;
padding: 30px 44px 24px 46px; padding: 30px 44px 24px 46px;
position: relative; position: relative;
} }
.sf-reset .text_exception .open_quote, .sf-reset .text-exception .open-quote,
.sf-reset .text_exception .close_quote { .sf-reset .text-exception .close-quote {
position: absolute; position: absolute;
} }
.sf-reset .open_quote { .sf-reset .open-quote {
top: 0; top: 0;
left: 0; left: 0;
} }
.sf-reset .close_quote { .sf-reset .close-quote {
bottom: 0; bottom: 0;
right: 50px; right: 50px;
} }
.sf-reset .block_exception p { .sf-reset .block-exception p {
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
} }
.sf-reset .block_exception p a, .sf-reset .block-exception p a,
.sf-reset .block_exception p a:hover { .sf-reset .block-exception p a:hover {
color: #565656; color: #565656;
} }
.sf-reset h2 { .sf-reset h2 {
@ -159,12 +159,12 @@ build: 56
float: left; float: left;
width: 654px; width: 654px;
} }
.sf-reset .error_count { .sf-reset .error-count {
float: right; float: right;
width: 170px; width: 170px;
text-align: right; text-align: right;
} }
.sf-reset .error_count span { .sf-reset .error-count span {
display: inline-block; display: inline-block;
background-color: #aacd4e; background-color: #aacd4e;
-moz-border-radius: 6px; -moz-border-radius: 6px;
@ -183,7 +183,7 @@ build: 56
.sf-reset .linked li { .sf-reset .linked li {
display: inline; display: inline;
} }
.sf-reset #output_content { .sf-reset #output-content {
color: #000; color: #000;
font-size: 12px; font-size: 12px;
} }

12
src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css
View File

@ -17,26 +17,26 @@ img {
font-size: 0; font-size: 0;
line-height: 0; line-height: 0;
} }
.clear_fix:after { .clear-fix:after {
content: "\0020"; content: "\0020";
display: block; display: block;
height: 0; height: 0;
clear: both; clear: both;
visibility: hidden; visibility: hidden;
} }
.clear_fix { .clear-fix {
display: inline-block; display: inline-block;
} }
* html .clear_fix { * html .clear-fix {
height: 1%; height: 1%;
} }
.clear_fix { .clear-fix {
display: block; display: block;
} }
.header { .header {
padding: 30px 30px 20px 30px; padding: 30px 30px 20px 30px;
} }
.header_logo { .header-logo {
float: left; float: left;
} }
.search { .search {
@ -117,4 +117,4 @@ pre {
pre.xdebug-var-dump{ pre.xdebug-var-dump{
white-space: pre; white-space: pre;
font-family: monospace; font-family: monospace;
} }

32
src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig
View File

@ -1,13 +1,13 @@
<div class="sf-reset"> <div class="sf-reset">
<div class="block_exception"> <div class="block-exception">
<div class="block_exception_detected clear_fix"> <div class="block-exception-detected clear-fix">
<div class="illustration_exception"> <div class="illustration-exception">
<img alt="Exception detected!" src="{{ asset('bundles/framework/images/exception_detected.png') }}"/> <img alt="Exception detected!" src="{{ asset('bundles/framework/images/exception_detected.png') }}"/>
</div> </div>
<div class="text_exception"> <div class="text-exception">
<div class="open_quote"> <div class="open-quote">
<img alt="" src="{{ asset('bundles/framework/images/open_quote.gif') }}"/> <img alt="" src="{{ asset('bundles/framework/images/open_quote.gif') }}"/>
</div> </div>
@ -25,14 +25,14 @@
<ul> <ul>
{% for i, previous in exception.allPrevious %} {% for i, previous in exception.allPrevious %}
<li> <li>
{{ previous.class|abbr_class }} <a href="#traces_link_{{ i + 1 }}" onclick="toggle('traces_{{ i + 1 }}', 'traces'); switchIcons('icon_traces_{{ i + 1 }}_open', 'icon_traces_{{ i + 1 }}_close');">&#187;</a> {{ previous.class|abbr_class }} <a href="#traces-link-{{ i + 1 }}" onclick="toggle('traces-{{ i + 1 }}', 'traces'); switchIcons('icon-traces-{{ i + 1 }}-open', 'icon-traces-{{ i + 1 }}-close');">&#187;</a>
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
<div class="close_quote"> <div class="close-quote">
<img alt="" src="{{ asset('bundles/framework/images/close_quote.gif') }}"/> <img alt="" src="{{ asset('bundles/framework/images/close_quote.gif') }}"/>
</div> </div>
@ -46,19 +46,19 @@
{% if logger %} {% if logger %}
<div class="block"> <div class="block">
<div class="logs clear_fix"> <div class="logs clear-fix">
{% spaceless %} {% spaceless %}
<h2> <h2>
Logs&nbsp; Logs&nbsp;
<a href="#" onclick="toggle('logs'); switchIcons('icon_logs_open', 'icon_logs_close'); return false;"> <a href="#" onclick="toggle('logs'); switchIcons('icon-logs-open', 'icon-logs-close'); return false;">
<img class="toggle" id="icon_logs_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: hidden" /> <img class="toggle" id="icon-logs-open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: hidden" />
<img class="toggle" id="icon_logs_close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: visible; margin-left: -18px" /> <img class="toggle" id="icon-logs-close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: visible; margin-left: -18px" />
</a> </a>
</h2> </h2>
{% endspaceless %} {% endspaceless %}
{% if logger.counterrors %} {% if logger.counterrors %}
<div class="error_count"> <div class="error-count">
<span> <span>
{{ logger.counterrors }} error{{ logger.counterrors > 1 ? 's' : ''}} {{ logger.counterrors }} error{{ logger.counterrors > 1 ? 's' : ''}}
</span> </span>
@ -79,14 +79,14 @@
{% spaceless %} {% spaceless %}
<h2> <h2>
Content of the Output&nbsp; Content of the Output&nbsp;
<a href="#" onclick="toggle('output_content'); switchIcons('icon_content_open', 'icon_content_close'); return false;"> <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-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: visible; margin-left: -18px" /> <img class="toggle" id="icon-content-open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: visible; margin-left: -18px" />
</a> </a>
</h2> </h2>
{% endspaceless %} {% endspaceless %}
<div id="output_content" style="display: none"> <div id="output-content" style="display: none">
{{ currentContent }} {{ currentContent }}
</div> </div>

8
src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
View File

@ -11,12 +11,12 @@
{{ trace.function ? '<br />' : '' }} {{ trace.function ? '<br />' : '' }}
in {{ trace.file|format_file(trace.line) }}&nbsp; in {{ trace.file|format_file(trace.line) }}&nbsp;
{% spaceless %} {% spaceless %}
<a href="#" onclick="toggle('trace_{{ prefix ~ '_' ~ i }}'); switchIcons('icon_{{ prefix ~ '_' ~ i }}_open', 'icon_{{ prefix ~ '_' ~ i }}_close'); return false;"> <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 == i ? 'display' : 'hidden' }}" /> <img class="toggle" id="icon-{{ prefix ~ '-' ~ i }}-close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == i ? 'display' : 'hidden' }}" />
<img class="toggle" id="icon_{{ prefix ~ '_' ~ i }}_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == i ? 'hidden' : 'display' }}; margin-left: -18px" /> <img class="toggle" id="icon-{{ prefix ~ '-' ~ i }}-open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == i ? 'hidden' : 'display' }}; margin-left: -18px" />
</a> </a>
{% endspaceless %} {% endspaceless %}
<div id="trace_{{ prefix ~ '_' ~ i }}" style="display: {{ 0 == i ? 'block' : 'none' }}" class="trace"> <div id="trace-{{ prefix ~ '-' ~ i }}" style="display: {{ 0 == i ? 'block' : 'none' }}" class="trace">
{{ trace.file|file_excerpt(trace.line) }} {{ trace.file|file_excerpt(trace.line) }}
</div> </div>
{% endif %} {% endif %}

10
src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
View File

@ -4,9 +4,9 @@
<span><small>[{{ count - position + 1 }}/{{ count + 1 }}]</small></span> <span><small>[{{ count - position + 1 }}/{{ count + 1 }}]</small></span>
{{ exception.class|abbr_class }}: {{ exception.message|nl2br|format_file_from_text }}&nbsp; {{ exception.class|abbr_class }}: {{ exception.message|nl2br|format_file_from_text }}&nbsp;
{% spaceless %} {% spaceless %}
<a href="#" onclick="toggle('traces_{{ position }}', 'traces'); switchIcons('icon_traces_{{ position }}_open', 'icon_traces_{{ position }}_close'); return false;"> <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 == count ? 'display' : 'hidden' }}" /> <img class="toggle" id="icon-traces-{{ position }}-close" alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="visibility: {{ 0 == count ? 'display' : 'hidden' }}" />
<img class="toggle" id="icon_traces_{{ position }}_open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == count ? 'hidden' : 'display' }}; margin-left: -18px" /> <img class="toggle" id="icon-traces-{{ position }}-open" alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="visibility: {{ 0 == count ? 'hidden' : 'display' }}; margin-left: -18px" />
</a> </a>
{% endspaceless %} {% endspaceless %}
</h2> </h2>
@ -14,8 +14,8 @@
<h2>Stack Trace</h2> <h2>Stack Trace</h2>
{% endif %} {% endif %}
<a id="traces_link_{{ position }}"></a> <a id="traces-link-{{ position }}"></a>
<ol class="traces list_exception" id="traces_{{ position }}" style="display: {{ 0 == count ? 'block' : 'none' }}"> <ol class="traces list-exception" id="traces-{{ position }}" style="display: {{ 0 == count ? 'block' : 'none' }}">
{% for i, trace in exception.trace %} {% for i, trace in exception.trace %}
<li> <li>
{% include 'TwigBundle:Exception:trace.html.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %} {% include 'TwigBundle:Exception:trace.html.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %}

16
src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig
View File

@ -9,25 +9,25 @@
</head> </head>
<body> <body>
<div id="content"> <div id="content">
<div class="header clear_fix"> <div class="header clear-fix">
<div class="header_logo"> <div class="header-logo">
<img src="{{ asset('bundles/framework/images/logo_symfony.png') }}" alt="Symfony" /> <img src="{{ asset('bundles/framework/images/logo_symfony.png') }}" alt="Symfony" />
</div> </div>
<div class="search"> <div class="search">
<form method="get" action="http://symfony.com/search"> <form method="get" action="http://symfony.com/search">
<div class="form_row"> <div class="form-row">
<label for="search_id"> <label for="search-id">
<img src="{{ asset('bundles/framework/images/grey_magnifier.png') }}" alt="Search on Symfony website" /> <img src="{{ asset('bundles/framework/images/grey_magnifier.png') }}" alt="Search on Symfony website" />
</label> </label>
<input name="q" id="search_id" type="search" placeholder="Search on Symfony website" /> <input name="q" id="search-id" type="search" placeholder="Search on Symfony website" />
<button type="submit"> <button type="submit">
<span class="border_l"> <span class="border-l">
<span class="border_r"> <span class="border-r">
<span class="btn_bg">OK</span> <span class="btn-bg">OK</span>
</span> </span>
</span> </span>
</button> </button>

2
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/time.html.twig
View File

@ -166,7 +166,7 @@
*/ */
function getContainerWidth() function getContainerWidth()
{ {
return query('#collector_content h2').clientWidth; return query('#collector-content h2').clientWidth;
} }
/** /**

8
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/admin.html.twig
View File

@ -16,12 +16,12 @@
&#187;&#160;<label for="file">Import</label><br /> &#187;&#160;<label for="file">Import</label><br />
<input type="file" name="file" id="file" /><br /> <input type="file" name="file" id="file" /><br />
<button type="submit"> <button type="submit">
<span class="border_l"> <span class="border-l">
<span class="border_r"> <span class="border-r">
<span class="btn_bg">UPLOAD</span> <span class="btn-bg">UPLOAD</span>
</span> </span>
</span> </span>
</button> </button>
<div class="clear_fix"></div> <div class="clear-fix"></div>
</form> </form>
</div> </div>

14
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/header.html.twig
View File

@ -1,21 +1,21 @@
<div id="header" class="clear_fix"> <div id="header" class="clear-fix">
<h1> <h1>
<img src="data:image/png;base64,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" alt="Symfony profiler"/> <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAARMAAAA+CAMAAAA/Mg/WAAAAjVBMVEXW1ta/v8Dh4eFgXmE8Oj7j4+PLy8unpqiPjpB4d3nIyMjX19dIRkro6OiYl5lUUlZsa22zsrTy8vLl5eU9Oz9KSEzs7OzBwcGEg4XLy8ybmpy9vb3ExMSxsbLa2tp+fH/Y2Nlxb3JXVVjPz89kYmWkpKXd3d3T09O+vr+LiYzMzMy6urowLjL////v7+/NfgWIAAAAL3RSTlP/////////////////////////////////////////////////////////////AFqlOPcAAAAJdnBBZwAAARMAAAA+AHci3fUAAAeMSURBVHja7Zvneuo4EIbdC65gOqGEEFIs+/4vbzWj5hLF5GySZxef7wcWtqVkXkYzIxmMWiNzu7btjJDMttdbsx6TPmQSbW3Skb2NxszERyB92f5Ymfgx0Sr2x8jEzMinis2xMXHXZFC5OyomXkZuUOyNiMnUITfJ8UfDxCc3yx8FE0TyFwpnopD8hdJm4jlkUOdjmh4XhMm8eyZuTIZ0LCrUfs4CbXTvTPJBHzlVVbogCwrlRFD2nTOZkgE9zqrqCM5SUV0IanvPTIZnzpmSeIbGpsHEce+ZSTCAZEG9ZDaXTESYDe+YiTuUc07gJnIOYQv1vwqziTGZPCWibVifMRl2k7SiOrP2/AJeoncUbxoE5hcXRD4ss356EXUoQYlRlpO6tsrS+JxJTHpaXC7z5sypCtKSJqJM4z8oXkJCfp5JsivLd+Olvo1JP+nMUyxFTm8Myx6rkluq2e2fTCoP8nrg/3SIYBRuZRJ+kHer2eZEXx7BTSrQEa/sU9JSXjdlwnTy6jr6UpwJYJgf1xOdN+gvllXcwKQTYS+iWF2ksyqFaCJyzSM9dqC4nUkQ1F9W+CuLp0lZyvYwE4+0VUD0kMXrHt9XMxFrN6Slad2Q/cVAonr915hsO8uaqmH5/FSdKnECZ9EraSn4mnWeaUbYiLDR72WanaTl0jO6sGlBPi0M45BwSy3auBoGfcULIuEuLct6KEuLCtpJi0lxgNvUgAkdz+iEk+eqmWXm+wr1LOqUCxHqL3ryxnuPtl3ejElYm8TxzJgQPO3Z2PDoWS7kErF/xQmgI/Qwo5yA1vSEI/c83YzEPFzW11UJmiAGamjyUDJzD7sSZSyBgBTSUExE/5UlBjSwk01a2lTtNDMTIXZx3MCxrbhVZ4Ch4uPPCNlKVFOwXvyhTOxLOFFEpKLad5o7vtAjdFQsD2U5tKaQuAm06NhNAMOuQCYvqxKZLCdgKF5ZFVomGHnLhwl0OvDcxECSrp+g3tRKR+n1TLrqhAaqMBJ5OcOGS40HCwHY1AyY0VPTd8A0WuHFtEsQTDEnO75pBg4UPrxHTE+Ar+Blp0bFFCBnwkwD55ggk135AO5fv9Omxa+sls14opjgCHA/HncJO4BjJV0mxwokPeKtQqVUj7yK0yceNySSSiTKFJ+eYBbaokKLXXY+bsaTjELE0TxH9ohdfkeIKKZ4WcA2EAloST/pKzDhAMB9CnaFQnnRMVnuAAUf6qUxYJcJThZVzL9i+0Q06gZVE13FmbIps+VTxwML8cAaPvcf0mDiqcF8YK1urKdIIeCTZ43j8k9ZVWRPyOTAkgw2UAk9qWNyxV6oXbmCUeC1zwQ9A1U0CL0OMOlR8dCynJkeMxQxuy6dq80kAMO5HIxAcrJEeGfE38eiv9FIHmANMAE3kQ0UJBwNkxf0LkGReUuPyTk9Yy3PdFThJB1m0n5MZLPVtotoAkAhcxKa1mdiq8SObdFD3Znh5PFk2WswawUFeHkQdk+6RX2fCZxryoJbr10mWKcqKK8qulxuZSJdIRIFag7tNhP7D5jIwLSGUXVMJv+WidVlsuEF65zXaSoLLTRENKu9DM004RN12ZQYZpIPMBEJLIYXlKFcf0mDqmKSqECDE+SgYfIODJS0TCqs1GbIhJ1CUFppy3U+831CfD0TfTwx+0yw0PHQWVSyYLoiDukeu3Y8KTRMREDqM8mI0CuAUNnm+YYQ69R9YSTxaubmOeVyExNP7aH4OG6fyZTyWKs1liFSL9ZeBmei3goGK13eKfgAfSa5iicycpz4hJmLAk4nW7PSjXm+sGH+DDPhR1WfBH0m6D9OTGJlgsilV9pKGkySVn1y0NZsDyoZFy0mAZHa81ItFbnmIkoVndZNFpG99k1zG8v1ckZkc5hJ5LCyNXAAzodM1vJPyjr2vaiX0HipGRO10Wgk9fKwAqu1TAqo8g60cD08lS0mZnvn9ZSmG+kb6VA48ZtMgu5yeStnFwZcPZPW41lE8iETj5c+KqPsSqb3mjNRUFCARM+kvkJ/VJtJTRpaPBdIYb9oVLF7opXbL9eIE5oisKh9bBOKW5QkxinZgADlBkglDlSPTpdYBmJuQvKOy1qjFkyEkqcdsrJqLRPQkq0aywejzSQnLc0vl0W7zn8kOmWaDRKh7Kt7z9hfK6zruyGxsBL9/sqwcHelt/foE50WvMjXaPDxaATB9vuklsSKyY/I+OSR11Ff2A/vz4tl4DdqC1PxN5hA7tRoj7FlTnQKP3USM//WZ8ou7r14v8QkIhrNBtzEHHhsA4n42+SwRPw7TLSO8jjgJvaAnxPnG5GYuFNb/xqTyGk9Bdzsz3Lq6JOOPqWoDffvFB3P7eaV5Y8xUdWWWBTPFiLrPBOt1nf+3a2ss832xgu2E9Eqdu+ciaqrN4LJEZDMB2bOPTOp/dazjM2cnGd40Go7gu8MB83alQZazMJ6haP4bnmovmqB2i9GikQxUVDmj+wB11iRKCZq+gwrHNFvmnzn7+8POBOlKCODyryx/UYyGHKVYIS/pXXDTyNJNM7fXEdrja84QGSMTFB+3seS++6If5uPMoPclmE1D8x6RPoHDj0oidWaaPMAAAAASUVORK5CYII=" alt="Symfony profiler"/>
</h1> </h1>
<div class="search"> <div class="search">
<form method="get" action="http://symfony.com/search" target="_blank"> <form method="get" action="http://symfony.com/search" target="_blank">
<div class="form_row"> <div class="form-row">
<label for="search_id"> <label for="search-id">
<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAABUElEQVQoz2NgAIJ29iBdD0d7X2cPb+tY2f9MDMjgP2O2hKu7vS8CBlisZUNSMJ3fxRMkXO61wm2ue6I3iB1q8Z8ZriDZFCS03fm/wX+1/xp/TBo8QPxeqf+MUAW+QIFKj/+q/wX/c/3n/i/6Qd/bx943z/Q/K1SBI1D9fKv/AhCn/Wf5L5EHdFGKw39OqAIXoPpOMziX4T9/DFBBnuN/HqhAEtCKCNf/XDA/rZRyAmrpsvrPDVUw3wrkqCiLaewg6TohX1d7X0ffs5r/OaAKfinmgt3t4ulr4+Xg4ANip3j+l/zPArNT4LNOD0pAgWCSOUIBy3+h/+pXbBa5tni0eMx23+/mB1YSYnENroT5Pw/QSOX/mkCo+l/jgo0v2KJA643s8PgAmsMBDCbu/5xALHPB2husxN9uCzsDOgAq5kAoaZVnYMCh5Ky1r88Eh/+iABM8jUk7ClYIAAAAAElFTkSuQmCC" alt="Search on Symfony website"/> <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAABUElEQVQoz2NgAIJ29iBdD0d7X2cPb+tY2f9MDMjgP2O2hKu7vS8CBlisZUNSMJ3fxRMkXO61wm2ue6I3iB1q8Z8ZriDZFCS03fm/wX+1/xp/TBo8QPxeqf+MUAW+QIFKj/+q/wX/c/3n/i/6Qd/bx943z/Q/K1SBI1D9fKv/AhCn/Wf5L5EHdFGKw39OqAIXoPpOMziX4T9/DFBBnuN/HqhAEtCKCNf/XDA/rZRyAmrpsvrPDVUw3wrkqCiLaewg6TohX1d7X0ffs5r/OaAKfinmgt3t4ulr4+Xg4ANip3j+l/zPArNT4LNOD0pAgWCSOUIBy3+h/+pXbBa5tni0eMx23+/mB1YSYnENroT5Pw/QSOX/mkCo+l/jgo0v2KJA643s8PgAmsMBDCbu/5xALHPB2husxN9uCzsDOgAq5kAoaZVnYMCh5Ky1r88Eh/+iABM8jUk7ClYIAAAAAElFTkSuQmCC" alt="Search on Symfony website"/>
</label> </label>
<input name="q" id="search_id" type="search" placeholder="Search on Symfony website"/> <input name="q" id="search-id" type="search" placeholder="Search on Symfony website"/>
<button type="submit"> <button type="submit">
<span class="border_l"> <span class="border-l">
<span class="border_r"> <span class="border-r">
<span class="btn_bg">OK</span> <span class="btn-bg">OK</span>
</span> </span>
</span> </span>
</button> </button>

6
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/info.html.twig
View File

@ -5,9 +5,9 @@
{% include '@WebProfiler/Profiler/header.html.twig' only %} {% include '@WebProfiler/Profiler/header.html.twig' only %}
<div id="main"> <div id="main">
<div class="clear_fix"> <div class="clear-fix">
<div id="collector_wrapper"> <div id="collector-wrapper">
<div id="collector_content"> <div id="collector-content">
{% block panel %} {% block panel %}
{% if about == 'purge' %} {% if about == 'purge' %}
<h2>The profiler database was purged successfully</h2> <h2>The profiler database was purged successfully</h2>

10
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/layout.html.twig
View File

@ -9,8 +9,8 @@
<div id="main"> <div id="main">
<div class="clear_fix"> <div class="clear-fix">
<div id="collector_wrapper"> <div id="collector-wrapper">
{% if profile %} {% if profile %}
<div id="resume"> <div id="resume">
<a id="resume-view-all" href="{{ path('_profiler_search', {limit: 10}) }}">View all</a> <a id="resume-view-all" href="{{ path('_profiler_search', {limit: 10}) }}">View all</a>
@ -27,14 +27,14 @@
</div> </div>
{% endif %} {% endif %}
<div id="collector_content"> <div id="collector-content">
{% include '@WebProfiler/Profiler/base_js.html.twig' %} {% include '@WebProfiler/Profiler/base_js.html.twig' %}
{% block panel '' %} {% block panel '' %}
</div> </div>
</div> </div>
<div id="navigation"> <div id="navigation">
{% if templates is defined %} {% if templates is defined %}
<ul id="menu_profiler"> <ul id="menu-profiler">
{% for name, template in templates %} {% for name, template in templates %}
{% set menu %}{{ template.renderBlock('menu', { 'collector': profile.getcollector(name)}) }}{% endset %} {% set menu %}{{ template.renderBlock('menu', { 'collector': profile.getcollector(name)}) }}{% endset %}
{% if menu != '' %} {% if menu != '' %}
@ -107,7 +107,7 @@
} }
window.setTimeout(function() { window.setTimeout(function() {
var menuItems = document.getElementById('menu_profiler').getElementsByTagName('LI'), var menuItems = document.getElementById('menu-profiler').getElementsByTagName('LI'),
elem, value, child, displayState = Sfjs.getPreference('menu/displayState'); elem, value, child, displayState = Sfjs.getPreference('menu/displayState');
if (displayState == 'none') { if (displayState == 'none') {

46
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/profiler_style.html.twig
View File

@ -77,7 +77,7 @@ abbr {
font-size: 0; font-size: 0;
line-height: 0; line-height: 0;
} }
.clear_fix:after .clear-fix:after
{ {
content: "\0020"; content: "\0020";
display: block; display: block;
@ -85,11 +85,11 @@ abbr {
clear: both; clear: both;
visibility: hidden; visibility: hidden;
} }
* html .clear_fix * html .clear-fix
{ {
height: 1%; height: 1%;
} }
.clear_fix .clear-fix
{ {
display: block; display: block;
} }
@ -108,10 +108,10 @@ abbr {
.search { .search {
float: right; float: right;
} }
#menu_profiler { #menu-profiler {
border-right: 1px solid #dfdfdf; border-right: 1px solid #dfdfdf;
} }
#menu_profiler li { #menu-profiler li {
border-bottom: 1px solid #dfdfdf; border-bottom: 1px solid #dfdfdf;
position: relative; position: relative;
padding-bottom: 0; padding-bottom: 0;
@ -119,7 +119,7 @@ abbr {
background-color: #f6f6f6; background-color: #f6f6f6;
z-index: 10000; z-index: 10000;
} }
#menu_profiler li a { #menu-profiler li a {
color: #404040; color: #404040;
display: block; display: block;
font-size: 13px; font-size: 13px;
@ -127,13 +127,13 @@ abbr {
text-decoration: none; text-decoration: none;
cursor: pointer; cursor: pointer;
} }
#menu_profiler li a span.label { #menu-profiler li a span.label {
display: block; display: block;
padding: 20px 0px 16px 65px; padding: 20px 0px 16px 65px;
min-height: 16px; min-height: 16px;
overflow: hidden; overflow: hidden;
} }
#menu_profiler li a span.icon { #menu-profiler li a span.icon {
display: block; display: block;
position: absolute; position: absolute;
left: 0; left: 0;
@ -141,29 +141,29 @@ abbr {
width: 60px; width: 60px;
text-align: center; text-align: center;
} }
#menu_profiler li.selected a, #menu-profiler li.selected a,
#menu_profiler li a:hover { #menu-profiler li a:hover {
background: #d1d1d1 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA7CAAAAACfn7+eAAAACXZwQWcAAAABAAAAOwDiPIGUAAAAJElEQVQIW2N4y8TA9B+KGZDYEP5/FD4Eo7IgNLJqZDUIMRRTAcmVHUZf/1g/AAAAAElFTkSuQmCC) repeat-x 0 0; background: #d1d1d1 url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAA7CAAAAACfn7+eAAAACXZwQWcAAAABAAAAOwDiPIGUAAAAJElEQVQIW2N4y8TA9B+KGZDYEP5/FD4Eo7IgNLJqZDUIMRRTAcmVHUZf/1g/AAAAAElFTkSuQmCC) repeat-x 0 0;
} }
#navigation div:first-child, #navigation div:first-child,
#menu_profiler li:first-child, #menu-profiler li:first-child,
#menu_profiler li:first-child a, #menu-profiler li:first-child a,
#menu_profiler li:first-child a span.label { #menu-profiler li:first-child a span.label {
-moz-border-radius: 16px 0 0 0; -moz-border-radius: 16px 0 0 0;
-webkit-border-radius: 16px 0 0 0; -webkit-border-radius: 16px 0 0 0;
border-radius: 16px 0 0 0; border-radius: 16px 0 0 0;
} }
#menu_profiler li a span.count { #menu-profiler li a span.count {
padding: 0; padding: 0;
position: absolute; position: absolute;
right: 10px; right: 10px;
top: 20px; top: 20px;
} }
#collector_wrapper { #collector-wrapper {
float: left; float: left;
width: 100%; width: 100%;
} }
#collector_content { #collector-content {
margin-left: 250px; margin-left: 250px;
padding: 30px 40px 40px; padding: 30px 40px 40px;
} }
@ -172,7 +172,7 @@ abbr {
width: 250px; width: 250px;
margin-left: -100%; margin-left: -100%;
} }
#collector_content table td { #collector-content table td {
background-color: white; background-color: white;
} }
h1 { h1 {
@ -192,7 +192,7 @@ li {
border-radius: 16px; border-radius: 16px;
margin-bottom: 20px; margin-bottom: 20px;
} }
#menu_profiler span.count span { #menu-profiler span.count span {
display: inline-block; display: inline-block;
background-color: #aacd4e; background-color: #aacd4e;
-moz-border-radius: 6px; -moz-border-radius: 6px;
@ -248,12 +248,12 @@ table th.value {
border-top: 0; border-top: 0;
padding: 0; padding: 0;
} }
.sf-reset .block_exception_detected .text_exception { .sf-reset .block-exception-detected .text-exception {
left: 10px; left: 10px;
right: 10px; right: 10px;
width: 95%; width: 95%;
} }
.sf-reset .block_exception_detected .illustration_exception { .sf-reset .block-exception-detected .illustration-exception {
display: none; display: none;
} }
ul.alt { ul.alt {
@ -396,10 +396,10 @@ td.main, td.menu {
margin-bottom: 15px; margin-bottom: 15px;
margin-top: 5px; margin-top: 5px;
} }
#collector_content .routing tr.matches td { #collector-content .routing tr.matches td {
background-color: #0e0; background-color: #0e0;
} }
#collector_content .routing tr.almost td { #collector-content .routing tr.almost td {
background-color: #fa0; background-color: #fa0;
} }
.loading { .loading {
@ -421,7 +421,7 @@ td.main, td.menu {
border-width: 1px 0; border-width: 1px 0;
} }
.collapsed-menu-parents #resume, .collapsed-menu-parents #resume,
.collapsed-menu-parents #collector_content { .collapsed-menu-parents #collector-content {
margin-left: 60px !important; margin-left: 60px !important;
} }
.collapsed-menu { .collapsed-menu {

16
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.html.twig
View File

@ -6,20 +6,20 @@
<form action="{{ path('_profiler_search') }}" method="get"> <form action="{{ path('_profiler_search') }}" method="get">
<label for="ip">IP</label> <label for="ip">IP</label>
<input type="text" name="ip" id="ip" value="{{ ip }}" /> <input type="text" name="ip" id="ip" value="{{ ip }}" />
<div class="clear_fix"></div> <div class="clear-fix"></div>
<label for="method">Method</label> <label for="method">Method</label>
<select name="method" id="method"> <select name="method" id="method">
{% for m in ['', 'DELETE', 'GET', 'HEAD', 'PATCH', 'POST', 'PUT'] %} {% for m in ['', 'DELETE', 'GET', 'HEAD', 'PATCH', 'POST', 'PUT'] %}
<option{{ m == method ? ' selected="selected"' : '' }}>{{ m }}</option> <option{{ m == method ? ' selected="selected"' : '' }}>{{ m }}</option>
{% endfor %} {% endfor %}
</select> </select>
<div class="clear_fix"></div> <div class="clear-fix"></div>
<label for="url">URL</label> <label for="url">URL</label>
<input type="text" name="url" id="url" value="{{ url }}" /> <input type="text" name="url" id="url" value="{{ url }}" />
<div class="clear_fix"></div> <div class="clear-fix"></div>
<label for="token">Token</label> <label for="token">Token</label>
<input type="text" name="token" id="token" value="{{ token }}" /> <input type="text" name="token" id="token" value="{{ token }}" />
<div class="clear_fix"></div> <div class="clear-fix"></div>
<label for="limit">Limit</label> <label for="limit">Limit</label>
<select name="limit" id="limit"> <select name="limit" id="limit">
{% for l in [10, 50, 100] %} {% for l in [10, 50, 100] %}
@ -28,12 +28,12 @@
</select> </select>
<button type="submit"> <button type="submit">
<span class="border_l"> <span class="border-l">
<span class="border_r"> <span class="border-r">
<span class="btn_bg">SEARCH</span> <span class="btn-bg">SEARCH</span>
</span> </span>
</span> </span>
</button> </button>
<div class="clear_fix"></div> <div class="clear-fix"></div>
</form> </form>
</div> </div>

16
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.html.twig
View File

@ -1,16 +1,16 @@
<!-- START of Symfony2 Web Debug Toolbar --> <!-- START of Symfony2 Web Debug Toolbar -->
{% if 'normal' != position %} {% if 'normal' != position %}
{% include '@WebProfiler/Profiler/toolbar_style.html.twig' with { 'position': position, 'floatable': true } %} {% include '@WebProfiler/Profiler/toolbar_style.html.twig' with { 'position': position, 'floatable': true } %}
<div id="sfMiniToolbar_{{ token }}" class="sf-minitoolbar"> <div id="sfMiniToolbar-{{ token }}" class="sf-minitoolbar">
<a href="javascript:void(0);" title="Show Symfony toolbar" onclick=" <a href="javascript:void(0);" title="Show Symfony toolbar" onclick="
var elem = this.parentNode; var elem = this.parentNode;
if (elem.style.display == 'none') { if (elem.style.display == 'none') {
document.getElementById('sfToolbarMainContent_{{ token }}').style.display = 'none'; document.getElementById('sfToolbarMainContent-{{ token }}').style.display = 'none';
document.getElementById('sfToolbarClearer_{{ token }}').style.display = 'none'; document.getElementById('sfToolbarClearer-{{ token }}').style.display = 'none';
elem.style.display = 'block'; elem.style.display = 'block';
} else { } else {
document.getElementById('sfToolbarMainContent_{{ token }}').style.display = 'block'; document.getElementById('sfToolbarMainContent-{{ token }}').style.display = 'block';
document.getElementById('sfToolbarClearer_{{ token }}').style.display = 'block'; document.getElementById('sfToolbarClearer-{{ token }}').style.display = 'block';
elem.style.display = 'none' elem.style.display = 'none'
} }
@ -19,10 +19,10 @@
<img width="26" height="28" alt="Symfony" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAcCAMAAABIzV/hAAACZFBMVEUwLjL///////////////////////////////////////////////////////////////////+Eg4b///+Ni46Xlpj///////////+op6n///////////////////////////////////////////////////////////9ZWFv///////9qaWz///////+mpaf///////////////9ZWFv///////////////9PTVH///91dHb////////////////////g4OD///9NTE+Ih4r///////+Ni47///////92dHeRkJLk5OTLy8xlY2b///////+cm53///////+5ubr////o6Oj////////U1NT///9DQURsa22rq6ysq61hX2L///+LioxTUVVBP0NEQkZpZ2rGxsf///9ram3////s7O2SkZNfXmFxcHKmpae4uLnKysuXlpiop6l3dXiIh4pYVlmrq6ycm52trK7Nzc48Oj5dW158e36dnJ49Oz/Pz9BiYGPAv8BDQUTQz9BVU1aioaNHRUnBwcJXVVk6ODxJR0t3dnmko6U8Oj6lpKY9Oz+0tLXDwsRQTlF7en1QTlHi4eJhX2LFxcZTUVViYGNwb3J+fX83NTlFQ0dUUlW4t7icm524uLk8Oj5YVlmPjpBLSU2enZ9aWVw/PkFBP0NdW153dnk0MjZQTlE1MzdQT1JdXF9ram15eHqGhYdDQkV5eHo2NThEQkZRUFNFQ0dta244NjpGREhTUVU5NztUUlVhX2JubG9HRUlVU1ZiYGM7OTxIRkk7OT1IR0o8Oj4wLjI9Oz8YdG13AAAAynRSTlMAAAEDBAUGCgsMDQ4QEhMUGRobGx0gISIkJiYnKCktLi8wMjM0NTk6Ozw+P0NFSEpLTE5PUFBTWlteXmBiZGVmaWxtcHBxc3R0dnl5fX+BgoOGi46Pj5CRmZqanZ6eoKeoq6ytsLCwsrO0tbe5urq8vL+/wsTFx8jJycvLy8vM0NHR0tLU1NfX2NnZ2trc3N3d3eHh4uLl5ebm5ubn5+fo6urt7e3u7vDx8/Pz9PT19fX19fX29vf39/j4+fn5+vr6+vv7+/z8/f3+yR5EtwAAAbVJREFUeNpl0mVXVFEYhuF3zhkOFqMjYmCi2MUYYKGIYiJ2YCd2t4IBFqgoKjZ2jg3igI2KyO2f8sTMngGvj/te71r7wyMuk4jofZccAihcMzJKXDYnuYcVotyeYKiktV5LA0faaE7S4s7TyMsBupnMcoH/vO6gmanJaiLV1Py+Xwn5zc0fjCbSi2LI2QdkGdLyFBG+rHwMzz4BD7wyGEfFk8pfsD2TkGmyFNvFHfDj55v02VD6DcteOYylatY8oG7boA2QV4vlklzB8tU3/DIwo+dWv58guY5tRcLMtwSGdi1DkTvAn9Jqsgbu4kafRBqlV4sDFCWuIjdhMsp7yQU49rB28/QPLOu2DuWqLMfmfw6M716GskdGVRMSGDKRsEzpvZ+Qs0lFKDd94s2oArh2F7K3oNQt6ChGr5x6+Dx3J7d2E3Ygqam4PCkngRNnngYIO5cWq4lLb5t+vJ6GiifFR1nbMNqP3fSOCN8PZnQynEW5W/nmHy0PXv79eHpRSjsjtEOtWZcRc9YXlNx7VFKwceGYHjG6s0Ob3iK+X3LqlKnjkvt39rjD6w3W6BhvrCdaVw//ADrWicJIvtkmAAAAAElFTkSuQmCC"/> <img width="26" height="28" alt="Symfony" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAcCAMAAABIzV/hAAACZFBMVEUwLjL///////////////////////////////////////////////////////////////////+Eg4b///+Ni46Xlpj///////////+op6n///////////////////////////////////////////////////////////9ZWFv///////9qaWz///////+mpaf///////////////9ZWFv///////////////9PTVH///91dHb////////////////////g4OD///9NTE+Ih4r///////+Ni47///////92dHeRkJLk5OTLy8xlY2b///////+cm53///////+5ubr////o6Oj////////U1NT///9DQURsa22rq6ysq61hX2L///+LioxTUVVBP0NEQkZpZ2rGxsf///9ram3////s7O2SkZNfXmFxcHKmpae4uLnKysuXlpiop6l3dXiIh4pYVlmrq6ycm52trK7Nzc48Oj5dW158e36dnJ49Oz/Pz9BiYGPAv8BDQUTQz9BVU1aioaNHRUnBwcJXVVk6ODxJR0t3dnmko6U8Oj6lpKY9Oz+0tLXDwsRQTlF7en1QTlHi4eJhX2LFxcZTUVViYGNwb3J+fX83NTlFQ0dUUlW4t7icm524uLk8Oj5YVlmPjpBLSU2enZ9aWVw/PkFBP0NdW153dnk0MjZQTlE1MzdQT1JdXF9ram15eHqGhYdDQkV5eHo2NThEQkZRUFNFQ0dta244NjpGREhTUVU5NztUUlVhX2JubG9HRUlVU1ZiYGM7OTxIRkk7OT1IR0o8Oj4wLjI9Oz8YdG13AAAAynRSTlMAAAEDBAUGCgsMDQ4QEhMUGRobGx0gISIkJiYnKCktLi8wMjM0NTk6Ozw+P0NFSEpLTE5PUFBTWlteXmBiZGVmaWxtcHBxc3R0dnl5fX+BgoOGi46Pj5CRmZqanZ6eoKeoq6ytsLCwsrO0tbe5urq8vL+/wsTFx8jJycvLy8vM0NHR0tLU1NfX2NnZ2trc3N3d3eHh4uLl5ebm5ubn5+fo6urt7e3u7vDx8/Pz9PT19fX19fX29vf39/j4+fn5+vr6+vv7+/z8/f3+yR5EtwAAAbVJREFUeNpl0mVXVFEYhuF3zhkOFqMjYmCi2MUYYKGIYiJ2YCd2t4IBFqgoKjZ2jg3igI2KyO2f8sTMngGvj/te71r7wyMuk4jofZccAihcMzJKXDYnuYcVotyeYKiktV5LA0faaE7S4s7TyMsBupnMcoH/vO6gmanJaiLV1Py+Xwn5zc0fjCbSi2LI2QdkGdLyFBG+rHwMzz4BD7wyGEfFk8pfsD2TkGmyFNvFHfDj55v02VD6DcteOYylatY8oG7boA2QV4vlklzB8tU3/DIwo+dWv58guY5tRcLMtwSGdi1DkTvAn9Jqsgbu4kafRBqlV4sDFCWuIjdhMsp7yQU49rB28/QPLOu2DuWqLMfmfw6M716GskdGVRMSGDKRsEzpvZ+Qs0lFKDd94s2oArh2F7K3oNQt6ChGr5x6+Dx3J7d2E3Ygqam4PCkngRNnngYIO5cWq4lLb5t+vJ6GiifFR1nbMNqP3fSOCN8PZnQynEW5W/nmHy0PXv79eHpRSjsjtEOtWZcRc9YXlNx7VFKwceGYHjG6s0Ob3iK+X3LqlKnjkvt39rjD6w3W6BhvrCdaVw//ADrWicJIvtkmAAAAAElFTkSuQmCC"/>
</a> </a>
</div> </div>
<div id="sfToolbarClearer_{{ token }}" style="clear: both; height: 38px;"></div> <div id="sfToolbarClearer-{{ token }}" style="clear: both; height: 38px;"></div>
{% endif %} {% endif %}
<div id="sfToolbarMainContent_{{ token }}" class="sf-toolbarreset"> <div id="sfToolbarMainContent-{{ token }}" class="sf-toolbarreset">
{% for name, template in templates %} {% for name, template in templates %}
{{ template.renderblock('toolbar', { {{ template.renderblock('toolbar', {
'collector': profile.getcollector(name), 'collector': profile.getcollector(name),
@ -38,7 +38,7 @@
var p = this.parentNode; var p = this.parentNode;
p.style.display = 'none'; p.style.display = 'none';
(p.previousElementSibling || p.previousSibling).style.display = 'none'; (p.previousElementSibling || p.previousSibling).style.display = 'none';
document.getElementById('sfMiniToolbar_{{ token }}').style.display = 'block'; document.getElementById('sfMiniToolbar-{{ token }}').style.display = 'block';
Sfjs.setPreference('toolbar/displayState', 'none'); Sfjs.setPreference('toolbar/displayState', 'none');
"></a> "></a>
{% endif %} {% endif %}

12
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_js.html.twig
View File

@ -21,13 +21,13 @@
} }
if (Sfjs.getPreference('toolbar/displayState') == 'none') { if (Sfjs.getPreference('toolbar/displayState') == 'none') {
document.getElementById('sfToolbarMainContent_{{ token }}').style.display = 'none'; document.getElementById('sfToolbarMainContent-{{ token }}').style.display = 'none';
document.getElementById('sfToolbarClearer_{{ token }}').style.display = 'none'; document.getElementById('sfToolbarClearer-{{ token }}').style.display = 'none';
document.getElementById('sfMiniToolbar_{{ token }}').style.display = 'block'; document.getElementById('sfMiniToolbar-{{ token }}').style.display = 'block';
} else { } else {
document.getElementById('sfToolbarMainContent_{{ token }}').style.display = 'block'; document.getElementById('sfToolbarMainContent-{{ token }}').style.display = 'block';
document.getElementById('sfToolbarClearer_{{ token }}').style.display = 'block'; document.getElementById('sfToolbarClearer-{{ token }}').style.display = 'block';
document.getElementById('sfMiniToolbar_{{ token }}').style.display = 'none'; document.getElementById('sfMiniToolbar-{{ token }}').style.display = 'none';
} }
}, },
function(xhr) { function(xhr) {

2
src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig
View File

@ -4,7 +4,7 @@
{% block body %} {% block body %}
<div class="sf-reset"> <div class="sf-reset">
<div class="block_exception"> <div class="block-exception">
<h1>This request redirects to <a href="{{ location }}">{{ location }}</a>.</h1> <h1>This request redirects to <a href="{{ location }}">{{ location }}</a>.</h1>
<p> <p>