diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig index c27cc56e6a078..25c84a6c9b5ec 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.atom.twig @@ -1 +1 @@ -{% include '@Twig/Exception/error.xml.twig' %} +{{ include('@Twig/Exception/error.xml.twig') }} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig index c27cc56e6a078..25c84a6c9b5ec 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/error.rdf.twig @@ -1 +1 @@ -{% include '@Twig/Exception/error.xml.twig' %} +{{ include('@Twig/Exception/error.xml.twig') }} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.atom.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.atom.twig index d507ce46f6949..2cdf03f2bcb59 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.atom.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.atom.twig @@ -1 +1 @@ -{% include '@Twig/Exception/exception.xml.twig' with { 'exception': exception } %} +{{ include('@Twig/Exception/exception.xml.twig', { exception: exception }) }} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.css.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.css.twig index bdf242b7f1998..593d490257e35 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.css.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.css.twig @@ -1,3 +1,3 @@ /* -{% include '@Twig/Exception/exception.txt.twig' with { 'exception': exception } %} +{{ include('@Twig/Exception/exception.txt.twig', { exception: exception }) }} */ diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig index b017420dd5c70..ca6e8d5be69af 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig @@ -1,120 +1,91 @@ -
-
-
- Need support? -
-
- {{ include('@Twig/Exception/exception.svg') }} +
+
+
+

+ {% for previousException in exception.allPrevious|reverse %} + {{ previousException.class|abbr_class }} + {{ include('@Twig/images/chevron-right.svg') }} + {% endfor %} + {{ exception.class|abbr_class }} +

+

+ HTTP {{ status_code }} {{ status_text }} +

-
-
“
- -

{{ exception.message|nl2br|format_file_from_text }}

- -
- {{ status_code }} {{ status_text }} - {{ exception.class|abbr_class }} +
+
+
+

+ {{- exception.message|nl2br|format_file_from_text -}} +

+ +
+ {{ include('@Twig/images/symfony-ghost.svg') }}
- - {% set previous_count = exception.allPrevious|length %} - {% if previous_count %} -
{{ previous_count }} linked Exception{{ previous_count > 1 ? 's' : '' }}: -
    - {% for i, previous in exception.allPrevious %} -
  • - {{ previous.class|abbr_class }} » -
    • - {% endfor %} -
-
- {% endif %} - -
”
-{% for position, e in exception.toarray %} - {% include '@Twig/Exception/traces.html.twig' with { 'exception': e, 'position': position, 'count': previous_count } only %} -{% endfor %} - -{% if logger %} -
-
- {% spaceless %} -

- Logs  - - - - - -

- {% endspaceless %} +
+
+
+ {% set exception_as_array = exception.toarray %} +

+ {% if exception_as_array|length > 1 %} + Exceptions {{ exception_as_array|length }} + {% else %} + Exception + {% endif %} +

+ +
+ {% for e in exception_as_array %} + {{ include('@Twig/Exception/traces.html.twig', { exception: e, index: loop.index }, with_context = false) }} + {% endfor %} +
+
- {% if logger.counterrors %} -
- - {{ logger.counterrors }} error{{ logger.counterrors > 1 ? 's' : ''}} - -
- {% endif %} +
+

+ Logs + {% if logger.counterrors ?? false %}{{ logger.counterrors }}{% endif %} +

+ +
+ {% if logger %} + {{ include('@Twig/Exception/logs.html.twig', { logs: logger.logs }, with_context = false) }} + {% else %} +
+

No log messages

+
+ {% endif %} +
-
- {% include '@Twig/Exception/logs.html.twig' with { 'logs': logger.logs } only %} +
+

+ {% if exception_as_array|length > 1 %} + Stack Traces {{ exception_as_array|length }} + {% else %} + Stack Trace + {% endif %} +

+ +
+ {% for e in exception_as_array %} + {{ include('@Twig/Exception/traces_text.html.twig', { exception: e, index: loop.index, num_exceptions: loop.length }, with_context = false) }} + {% endfor %} +
-
-{% endif %} -{% if currentContent %} -
- {% spaceless %} -

- Content of the Output  - - - + - -

- {% endspaceless %} + {% if currentContent is not empty %} +
+

Output content

- - -
+ {% endif %}
-{% endif %} - -{% include '@Twig/Exception/traces_text.html.twig' with { 'exception': exception } only %} - - +
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.js.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.js.twig index bdf242b7f1998..593d490257e35 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.js.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.js.twig @@ -1,3 +1,3 @@ /* -{% include '@Twig/Exception/exception.txt.twig' with { 'exception': exception } %} +{{ include('@Twig/Exception/exception.txt.twig', { exception: exception }) }} */ diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.rdf.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.rdf.twig index d507ce46f6949..2cdf03f2bcb59 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.rdf.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.rdf.twig @@ -1 +1 @@ -{% include '@Twig/Exception/exception.xml.twig' with { 'exception': exception } %} +{{ include('@Twig/Exception/exception.xml.twig', { exception: exception }) }} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.svg deleted file mode 100644 index a5ed696648bf1..0000000000000 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.txt.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.txt.twig index ae297c5745948..cb17fb149f9ab 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.txt.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.txt.twig @@ -2,6 +2,6 @@ [message] {{ exception.message }} {% for i, e in exception.toarray %} [{{ i + 1 }}] {{ e.class }}: {{ e.message }} -{% include '@Twig/Exception/traces.txt.twig' with { 'exception': e } only %} +{{ include('@Twig/Exception/traces.txt.twig', { exception: e }, with_context = false) }} {% endfor %} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.xml.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.xml.twig index 2e3f30a10affd..36c9449b6c505 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.xml.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.xml.twig @@ -3,7 +3,7 @@ {% for e in exception.toarray %} -{% include '@Twig/Exception/traces.xml.twig' with { 'exception': e } only %} +{{ include('@Twig/Exception/traces.xml.twig', { exception: e }, with_context = false) }} {% endfor %} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig index d2c3ac6940194..c5c7c17c78ed7 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/logs.html.twig @@ -1,7 +1,28 @@ -
    +{% set channel_is_defined = (logs|first).channel is defined %} + + + + + + {% if channel_is_defined %}{% endif %} + + + + + {% for log in logs %} - = 400 %} class="error"{% elseif log.priority >= 300 %} class="warning"{% endif %}> - {{ log.priorityName }} - {{ log.message|format_log_message(log.context) }} - + + + {% if channel_is_defined %} + + {% endif %} + + {% endfor %} - + +
    LevelChannelMessage
    + {{ log.priorityName }} + {{ log.timestamp|date('H:i:s') }} + + {{ log.channel }} + {{ log.message }}
    diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig index d00a376a4589e..a6af5d0532242 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig @@ -1,22 +1,32 @@ +{% if trace.file|default(false) %} + {{ include('@Twig/images/icon-minus-square.svg') }} + {{ include('@Twig/images/icon-plus-square.svg') }} +{% endif %} + {% if trace.function %} - at - - {{ trace.short_class }} - {{ trace.type ~ trace.function }} - - ({{ trace.args|format_args }}) + {{ trace.class|abbr_class }}{% if trace.type is not empty %}{{ trace.type }}{% endif %}{{ trace.function }}({{ trace.args|format_args }}) +{% endif %} + +{% if trace.file|default(false) %} + {% set line_number = trace.line|default(1) %} + {% set file_link = trace.file|file_link(line_number) %} + {% set file_path = trace.file|format_file(line_number)|striptags|replace({ (' at line ' ~ line_number): '' }) %} + {% set file_path_parts = file_path|split(constant('DIRECTORY_SEPARATOR')) %} + + + in + {{ file_path_parts[:-1]|join(constant('DIRECTORY_SEPARATOR')) }}{{ constant('DIRECTORY_SEPARATOR') }}{{ file_path_parts|last }} + (line {{ line_number }}) + {% endif %} -{% if trace.file is defined and trace.file and trace.line is defined and trace.line %} - {{ trace.function ? '
    ' : '' }} - in {{ trace.file|format_file(trace.line) }}  - {% spaceless %} - - - - + - - {% endspaceless %} -
    - {{ trace.file|file_excerpt(trace.line) }} +{% if trace.file|default(false) %} +
    + {{ trace.file|file_excerpt(trace.line)|replace({ + '#DD0000': '#183691', + '#007700': '#a71d5d', + '#0000BB': '#222222', + '#FF8000': '#969896' + })|raw }}
    {% endif %} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.txt.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.txt.twig index ff20469bdbee8..689a85a5cada7 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.txt.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.txt.twig @@ -1,8 +1,9 @@ {% if trace.function %} - at {{ trace.class ~ trace.type ~ trace.function }}({{ trace.args|format_args_as_text }}) -{% else %} - at n/a -{% endif %} -{% if trace.file is defined and trace.line is defined %} - in {{ trace.file }} line {{ trace.line }} -{% endif %} + {{- trace.class ~ trace.type ~ trace.function }}({{ trace.args|format_args }}) +{%- else -%} + n/a +{%- endif -%} +{% if trace.file|default('') is not empty and trace.line|default('') is not empty %} + + ({{ trace.file|format_file(trace.line)|striptags|replace({ (' at line ' ~ trace.line): '' }) }}:{{ trace.line }}) +{%- endif -%} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig index e846f7a1c60c7..dc0096b115941 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig @@ -1,25 +1,37 @@ -
    - {% if count > 0 %} -

    - [{{ count - position + 1 }}/{{ count + 1 }}] - {{ exception.class|abbr_class }}: {{ exception.message|nl2br|format_file_from_text }}  - {% spaceless %} - - - - + - - {% endspaceless %} -

    - {% else %} -

    Stack Trace

    - {% endif %} +
    + + + + + + + + + {% set _is_first_user_code = true %} {% for i, trace in exception.trace %} -
  1. - {% include '@Twig/Exception/trace.html.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %} -
    2. + {% set _display_code_snippet = _is_first_user_code and ('/vendor/' not in trace.file) %} + {% if _display_code_snippet %}{% set _is_first_user_code = false %}{% endif %} + + + {% endfor %} - + +
    +

    + + {{ exception.class|split('\\')|slice(0, -1)|join('\\') }} + {{- exception.class|split('\\')|length > 1 ? '\\' }} + + {{ exception.class|split('\\')|last }} - -
      + {{ include('@Twig/images/icon-minus-square-o.svg') }} + {{ include('@Twig/images/icon-plus-square-o.svg') }} +

    + + {% if exception.message is not empty and index > 1 %} +

    {{ exception.message }}

    + {% endif %} +
    + {{ include('@Twig/Exception/trace.html.twig', { prefix: index, i: i, trace: trace }, with_context = false) }} +
    diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig index 906be78ca0a6f..7fbb573f632de 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.txt.twig @@ -1,6 +1,12 @@ {% if exception.trace|length %} -{% for trace in exception.trace %} -{% include '@Twig/Exception/trace.txt.twig' with { 'trace': trace } only %} +
    +{{ exception.class }}:
+{% if exception.message is not empty %}
+    {{- exception.message }}
+{% endif %}
 
+{% for trace in exception.trace %}
+  at {{ include('@Twig/Exception/trace.txt.twig', { trace: trace }, with_context = false) }}
 {% endfor %}
+
    {% endif %} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.xml.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.xml.twig index d04af93cf1aad..ae46775925c53 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.xml.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.xml.twig @@ -1,7 +1,7 @@ {% for trace in exception.trace %} -{% include '@Twig/Exception/trace.txt.twig' with { 'trace': trace } only %} +{{ include('@Twig/Exception/trace.txt.twig', { trace: trace }, with_context = false) }} {% endfor %} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig index 16b3579433197..ffe7f31ad5ec4 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig @@ -1,18 +1,24 @@ -
    -

    - Stack Trace (Plain Text)  - {% spaceless %} - - - + - - {% endspaceless %} -

    + + + + + + - - + + + + + +
    +

    + {% if num_exceptions > 1 %} + [{{ num_exceptions - index + 1 }}/{{ num_exceptions }}] + {% endif %} + {{ exception.class|split('\\')|last }} + {{ include('@Twig/images/icon-minus-square-o.svg') }} + {{ include('@Twig/images/icon-plus-square-o.svg') }} +

    +
    + {{ include('@Twig/Exception/traces.txt.twig', { exception: exception }, with_context = false) }} +
    diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/chevron-right.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/images/chevron-right.svg new file mode 100644 index 0000000000000..6f07d1b5b0bbc --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/chevron-right.svg @@ -0,0 +1 @@ + diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/favicon.png.base64 b/src/Symfony/Bundle/TwigBundle/Resources/views/images/favicon.png.base64 new file mode 100644 index 0000000000000..fb076ed16d0ae --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/favicon.png.base64 @@ -0,0 +1 @@ +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAgCAYAAAABtRhCAAADVUlEQVRIx82XX0jTURTHLYPyqZdefQx66CEo80+aYpoIkqzUikz6Z5klQoWUWYRIJYEUGpQ+lIr9U5dOTLdCtkmWZis3rbnC5fw/neYW002307mX/cZvP3/7o1PwwOdh95x7vnf39zvnd29AgBer2xO6DclAXiMqZAqxIiNIN/IYSUS2BPhjmGATchUxI+ADWiRhpWK7HKuHFVBFdmU5YvnI4grFGCaReF/EBH4KsZlGgj2JBTuCYBWRIYF8YoEOJ6wBt/gEs7mBbyOjQXruPLSdOgPCiEiPSUUHDoL8Ug5IUo9B/d5wrt+G7OAKNrODPuVdB6vRCIzN6SdBlpW9RIgk/1FeAXabzRlrUPVCS/JhbmwudztnGeeH9AyXBIwtmM3wLinZJZHifjHw2V+NBoRh+9ixQrbgbnaSIcl7cGea6hoXQbNe7za241oeO5Z0p42M4BV2EqP2D50wo+6HzvwC6C4sApNOR8cmOrtcnhtj2kYRyC9eBvXzKrBZrXSs72kFd1t3MoKVbMekQkEnSNKOO8fac3LpmK6l1TlGtsxmsdKFsecPYgwxst0cwROMYDXboSotg0WLBRqjY51jLYcENElXwW2XJKPydvoI2GN9T8rBtrAArYIUruBJXkFheCQYlCpQP6uk5dAQFQNaUROMSGVQFxLmkoQsxDJrhLbTZ+nvVsERME9MgPJRKV/58AsyomTSzE813WLFvWK++qI0xSfQl8k8Pg46sYRuv5t6dS+4RqxDwaa4BGjYH+NTQvKScIp9+YL/hoZh3jDtLRHtt2C3g6bmhX+CpsFBWg7ilDSPgj0lD2ncr5ev/BP8VvyAJhqVyZeUhPOrEhEFxgEtjft846Z/guQTNT89Q5P9flMLoth4F7808wKtWWKzAwNQHxrh/1vaid2F+XpYTSbQf1XA2McOmOpROnvpvMEA4tSjq1cW0sws2gCYxswY6TKkvzYnJq1NHZLnRU4BX+4U0uburvusu8Kv8iHY7qefkM4IFngJHEOUXmLEPgiGsI8YnlZILit3vSSLRTQe/MPIZva5pshNIEmyFQlCvruJKXPkCEfmePzkphXHdzZNQdoRI9KPlBAxlj/I8U97ERPS5bjGbWDFbEdqHVe5caTBeZZx2H/IMvzeN15yoQAAAABJRU5ErkJggg== diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-book.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-book.svg new file mode 100644 index 0000000000000..498a74f401e32 --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-book.svg @@ -0,0 +1 @@ + diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-minus-square-o.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-minus-square-o.svg new file mode 100644 index 0000000000000..be534ad44037c --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-minus-square-o.svg @@ -0,0 +1 @@ + diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-minus-square.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-minus-square.svg new file mode 100644 index 0000000000000..471c2741c7fd7 --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-minus-square.svg @@ -0,0 +1 @@ + diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-plus-square-o.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-plus-square-o.svg new file mode 100644 index 0000000000000..b2593a9fe79e9 --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-plus-square-o.svg @@ -0,0 +1 @@ + diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-plus-square.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-plus-square.svg new file mode 100644 index 0000000000000..8fbf7c4608d90 --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-plus-square.svg @@ -0,0 +1 @@ + diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-support.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-support.svg new file mode 100644 index 0000000000000..03fd8e7678baf --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-support.svg @@ -0,0 +1 @@ + diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/symfony-ghost.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/images/symfony-ghost.svg new file mode 100644 index 0000000000000..08234346851b0 --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/symfony-ghost.svg @@ -0,0 +1 @@ + diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/images/symfony-logo.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/images/symfony-logo.svg new file mode 100644 index 0000000000000..785341864d00b --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/symfony-logo.svg @@ -0,0 +1 @@ + diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig index 32b1e716bf337..ab11df22188ea 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig @@ -3,249 +3,158 @@ + {% block title %}{% endblock %} + {% block head %}{% endblock %} -
    -
    - + {% block body %}{% endblock %} diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/symfony.svg b/src/Symfony/Bundle/TwigBundle/Resources/views/symfony.svg deleted file mode 100644 index ad58736b5f1b3..0000000000000 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/symfony.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig index ca69e371df281..d93daf05c4eb5 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/base_js.html.twig @@ -455,8 +455,10 @@ addClass(element, 'sf-toggle-content'); if (toggles[i].hasAttribute('data-toggle-initial') && toggles[i].getAttribute('data-toggle-initial') == 'display') { + addClass(toggles[i], 'sf-toggle-on'); addClass(element, 'sf-toggle-visible'); } else { + addClass(toggles[i], 'sf-toggle-off'); addClass(element, 'sf-toggle-hidden'); } @@ -473,6 +475,8 @@ var element = document.querySelector(toggle.getAttribute('data-toggle-selector')); + toggleClass(toggle, 'sf-toggle-on'); + toggleClass(toggle, 'sf-toggle-off'); toggleClass(element, 'sf-toggle-hidden'); toggleClass(element, 'sf-toggle-visible');