From 5761b9477f61d96c030184158c481be137b2a2d1 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 16 Dec 2016 10:38:37 +0100 Subject: [PATCH 1/5] Redesigned the exception pages --- .../Resources/views/Exception/_images.twig | 42 ++ .../Resources/views/Exception/error.atom.twig | 2 +- .../Resources/views/Exception/error.rdf.twig | 2 +- .../views/Exception/exception.atom.twig | 2 +- .../views/Exception/exception.css.twig | 2 +- .../views/Exception/exception.html.twig | 185 ++++---- .../views/Exception/exception.js.twig | 2 +- .../views/Exception/exception.rdf.twig | 2 +- .../Resources/views/Exception/exception.svg | 7 - .../views/Exception/exception.txt.twig | 2 +- .../views/Exception/exception.xml.twig | 2 +- .../views/Exception/exception_full.html.twig | 1 + .../Resources/views/Exception/logs.html.twig | 31 +- .../Resources/views/Exception/trace.html.twig | 44 +- .../Resources/views/Exception/trace.txt.twig | 15 +- .../views/Exception/traces.html.twig | 51 ++- .../Resources/views/Exception/traces.txt.twig | 10 +- .../Resources/views/Exception/traces.xml.twig | 2 +- .../views/Exception/traces_text.html.twig | 40 +- .../Resources/views/layout.html.twig | 368 ++++++---------- .../TwigBundle/Resources/views/symfony.svg | 7 - .../views/Profiler/base_js.html.twig | 411 +++++++++--------- 22 files changed, 600 insertions(+), 630 deletions(-) create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/Exception/_images.twig delete mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.svg delete mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/symfony.svg diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/_images.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/_images.twig new file mode 100644 index 000000000000..ded308a12ae4 --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/_images.twig @@ -0,0 +1,42 @@ +{% block favicon_symfony_ghost %} +{# PNG file encoded as base64 #} +{% spaceless %} + 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== +{% endspaceless %} +{% endblock %} + +{% block icon_chevron_left %} + +{% endblock %} + +{% block icon_plus_square %} + +{% endblock %} + +{% block icon_plus_square_o %} + +{% endblock %} + +{% block icon_minus_square %} + +{% endblock %} + +{% block icon_minus_square_o %} + +{% endblock %} + +{% block icon_support %} + +{% endblock %} + +{% block icon_book %} + +{% endblock %} + +{% block symfony_ghost %} + +{% endblock %} + +{% block symfony_logo %} + +{% endblock %} 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 c27cc56e6a07..25c84a6c9b5e 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 c27cc56e6a07..25c84a6c9b5e 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 d507ce46f694..2cdf03f2bcb5 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 bdf242b7f199..593d490257e3 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 b017420dd5c7..a9126aa4ad95 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,93 @@ -
-
-
- Need support? -
-
- {{ include('@Twig/Exception/exception.svg') }} +
+
+
+

+ {{ exception.class|abbr_class }} + {% for previousException in exception.allPrevious %} + {{ block('icon_chevron_left', '@Twig/Exception/_images.twig') }} + {{ previousException.class|abbr_class }} + {% endfor %} +

+

+ 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 -}} +

+ +
+ {{ block('symfony_ghost', '@Twig/Exception/_images.twig') }}
- - {% 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 %}{{ 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 bdf242b7f199..593d490257e3 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 d507ce46f694..2cdf03f2bcb5 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 a5ed696648bf..000000000000 --- 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 ae297c574594..cb17fb149f9a 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 2e3f30a10aff..36c9449b6c50 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/exception_full.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig index e4f220896ecd..9571b6eb1559 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig @@ -139,4 +139,5 @@ {% block body %} {% include '@Twig/Exception/exception.html.twig' %} + {{ include('@WebProfiler/Profiler/base_js.html.twig') }} {% endblock %} 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 d2c3ac694019..c5c7c17c78ed 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 d00a376a4589..3a0941b77cab 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) %} + {{ block('icon_minus_square', '@Twig/Exception/_images.twig') }} + {{ block('icon_plus_square', '@Twig/Exception/_images.twig') }} +{% 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 ff20469bdbee..6003b7c77d0a 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 }}() +{%- 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 e846f7a1c60c..6a566368a0b5 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,34 @@ -
    - {% 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 %} +
    + + + + + + + + {% for i, trace in exception.trace %} -
  1. - {% include '@Twig/Exception/trace.html.twig' with { 'prefix': position, 'i': i, 'trace': trace } only %} -
    2. + + + {% endfor %} - + +
    +

    + + {{ exception.class|split('\\')|slice(0, -1)|join('\\') }} + {{- exception.class|split('\\')|length > 1 ? '\\' }} + + {{ exception.class|split('\\')|last }} - -
      + {{ block('icon_minus_square_o', '@Twig/Exception/_images.twig') }} + {{ block('icon_plus_square_o', '@Twig/Exception/_images.twig') }} +

    + + {% 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 906be78ca0a6..7fbb573f632d 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 d04af93cf1aa..ae46775925c5 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 16b357943319..68cb0aeaf8bc 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 }} + {{ block('icon_minus_square_o', '@Twig/Exception/_images.twig') }} + {{ block('icon_plus_square_o', '@Twig/Exception/_images.twig') }} +

    +
    + {{ include('@Twig/Exception/traces.txt.twig', { exception: exception }, with_context = false) }} +
    diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig index 32b1e716bf33..cb8179695fe7 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig @@ -3,249 +3,159 @@ + {% 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 ad58736b5f1b..000000000000 --- 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 ca69e371df28..333d40d2e735 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 @@ -20,201 +20,210 @@ var toggleClass = function(el, cssClass) { hasClass(el, cssClass) ? removeClass(el, cssClass) : addClass(el, cssClass); }; } - var noop = function() {}; - - var profilerStorageKey = 'sf2/profiler/'; - - var request = function(url, onSuccess, onError, payload, options) { - var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP'); - options = options || {}; - options.maxTries = options.maxTries || 0; - xhr.open(options.method || 'GET', url, true); - xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); - xhr.onreadystatechange = function(state) { - if (4 !== xhr.readyState) { - return null; + var noop = function() {}, + + collectionToArray = function (collection) { + var length = collection.length || 0, + results = new Array(length); + + while (length--) { + results[length] = collection[length]; } - if (xhr.status == 404 && options.maxTries > 1) { - setTimeout(function(){ - options.maxTries--; - request(url, onSuccess, onError, payload, options); - }, 500); + return results; + }, + + profilerStorageKey = 'sf2/profiler/', + + request = function(url, onSuccess, onError, payload, options) { + var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP'); + options = options || {}; + options.maxTries = options.maxTries || 0; + xhr.open(options.method || 'GET', url, true); + xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); + xhr.onreadystatechange = function(state) { + if (4 !== xhr.readyState) { + return null; + } + + if (xhr.status == 404 && options.maxTries > 1) { + setTimeout(function(){ + options.maxTries--; + request(url, onSuccess, onError, payload, options); + }, 500); + + return null; + } + if (200 === xhr.status) { + (onSuccess || noop)(xhr); + } else { + (onError || noop)(xhr); + } + }; + xhr.send(payload || ''); + }, + + getPreference = function(name) { + if (!window.localStorage) { return null; } - if (200 === xhr.status) { - (onSuccess || noop)(xhr); - } else { - (onError || noop)(xhr); + return localStorage.getItem(profilerStorageKey + name); + }, + + setPreference = function(name, value) { + if (!window.localStorage) { + return null; } - }; - xhr.send(payload || ''); - }; - var getPreference = function(name) { - if (!window.localStorage) { - return null; - } + localStorage.setItem(profilerStorageKey + name, value); + }, - return localStorage.getItem(profilerStorageKey + name); - }; + requestStack = [], - var setPreference = function(name, value) { - if (!window.localStorage) { - return null; - } + extractHeaders = function(xhr, stackElement) { + /* Here we avoid to call xhr.getResponseHeader in order to */ + /* prevent polluting the console with CORS security errors */ + var allHeaders = xhr.getAllResponseHeaders(); + var ret; - localStorage.setItem(profilerStorageKey + name, value); - }; + if (ret = allHeaders.match(/^x-debug-token:\s+(.*)$/im)) { + stackElement.profile = ret[1]; + } + if (ret = allHeaders.match(/^x-debug-token-link:\s+(.*)$/im)) { + stackElement.profilerUrl = ret[1]; + } + }, - var requestStack = []; + renderAjaxRequests = function() { + var requestCounter = document.querySelectorAll('.sf-toolbar-ajax-requests'); + if (!requestCounter.length) { + return; + } - var extractHeaders = function(xhr, stackElement) { - /* Here we avoid to call xhr.getResponseHeader in order to */ - /* prevent polluting the console with CORS security errors */ - var allHeaders = xhr.getAllResponseHeaders(); - var ret; + var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax'); + var tbodies = document.querySelectorAll('.sf-toolbar-ajax-request-list'); + var state = 'ok'; + if (tbodies.length) { + var tbody = tbodies[0]; - if (ret = allHeaders.match(/^x-debug-token:\s+(.*)$/im)) { - stackElement.profile = ret[1]; - } - if (ret = allHeaders.match(/^x-debug-token-link:\s+(.*)$/im)) { - stackElement.profilerUrl = ret[1]; - } - }; + var rows = document.createDocumentFragment(); - var successStreak = 4; - var pendingRequests = 0; - var renderAjaxRequests = function() { - var requestCounter = document.querySelector('.sf-toolbar-ajax-requests'); - if (!requestCounter) { - return; - } - requestCounter.textContent = requestStack.length; - requestCounter.className = 'sf-toolbar-ajax-requests sf-toolbar-value'; + if (requestStack.length) { + for (var i = 0; i < requestStack.length; i++) { + var request = requestStack[i]; - var infoSpan = document.querySelector(".sf-toolbar-ajax-info"); - if (infoSpan) { - infoSpan.textContent = requestStack.length + ' AJAX request' + (requestStack.length > 1 ? 's' : ''); - } + var row = document.createElement('tr'); + rows.insertBefore(row, rows.firstChild); - var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax'); - if (requestStack.length) { - ajaxToolbarPanel.style.display = 'block'; - } else { - ajaxToolbarPanel.style.display = 'none'; - } - if (pendingRequests > 0) { - addClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); - } else if (successStreak < 4) { - addClass(ajaxToolbarPanel, 'sf-toolbar-status-red'); - removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); - } else { - removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); - removeClass(ajaxToolbarPanel, 'sf-toolbar-status-red'); - } - }; + var methodCell = document.createElement('td'); + if (request.error) { + methodCell.className = 'sf-ajax-request-error'; + } + methodCell.textContent = request.method; + row.appendChild(methodCell); + + var typeCell = document.createElement('td'); + typeCell.textContent = request.type; + row.appendChild(typeCell); + + var statusCodeCell = document.createElement('td'); + var statusCode = document.createElement('span'); + if (request.statusCode < 300) { + statusCode.setAttribute('class', 'sf-toolbar-status'); + } else if (request.statusCode < 400) { + statusCode.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-yellow'); + } else { + statusCode.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-red'); + } + statusCode.textContent = request.statusCode || '-'; + statusCodeCell.appendChild(statusCode); + row.appendChild(statusCodeCell); + + var pathCell = document.createElement('td'); + pathCell.className = 'sf-ajax-request-url'; + if ('GET' === request.method) { + var pathLink = document.createElement('a'); + pathLink.setAttribute('href', request.url); + pathLink.textContent = request.url; + pathCell.appendChild(pathLink); + } else { + pathCell.textContent = request.url; + } + pathCell.setAttribute('title', request.url); + row.appendChild(pathCell); - var startAjaxRequest = function(index) { - var request = requestStack[index]; - pendingRequests++; - var row = document.createElement('tr'); - request.DOMNode = row; + var durationCell = document.createElement('td'); + durationCell.className = 'sf-ajax-request-duration'; - var tbody = document.querySelector('.sf-toolbar-ajax-request-list'); - if (!tbody) { - return; - } + if (request.duration) { + durationCell.textContent = request.duration + "ms"; + } else { + durationCell.textContent = '-'; + } + row.appendChild(durationCell); + + row.appendChild(document.createTextNode(' ')); + var profilerCell = document.createElement('td'); + + if (request.profilerUrl) { + var profilerLink = document.createElement('a'); + profilerLink.setAttribute('href', request.profilerUrl); + profilerLink.textContent = request.profile; + profilerCell.appendChild(profilerLink); + } else { + profilerCell.textContent = 'n/a'; + } - var methodCell = document.createElement('td'); - methodCell.textContent = request.method; - row.appendChild(methodCell); - - var typeCell = document.createElement('td'); - typeCell.textContent = request.type; - row.appendChild(typeCell); - - var statusCodeCell = document.createElement('td'); - var statusCode = document.createElement('span'); - statusCode.textContent = '-'; - statusCodeCell.appendChild(statusCode); - row.appendChild(statusCodeCell); - - var pathCell = document.createElement('td'); - pathCell.className = 'sf-ajax-request-url'; - if ('GET' === request.method) { - var pathLink = document.createElement('a'); - pathLink.setAttribute('href', request.url); - pathLink.textContent = request.url; - pathCell.appendChild(pathLink); - } else { - pathCell.textContent = request.url; - } - pathCell.setAttribute('title', request.url); - row.appendChild(pathCell); + row.appendChild(profilerCell); + + var requestState = 'ok'; + if (request.error) { + requestState = 'error'; + if (state != "loading" && i > requestStack.length - 4) { + state = 'error'; + } + } else if (request.loading) { + requestState = 'loading'; + state = 'loading'; + } + row.className = 'sf-ajax-request sf-ajax-request-' + requestState; + } - var durationCell = document.createElement('td'); - durationCell.className = 'sf-ajax-request-duration'; - durationCell.textContent = '-'; - row.appendChild(durationCell); + var infoSpan = document.querySelectorAll(".sf-toolbar-ajax-info")[0]; + var children = collectionToArray(tbody.children); + for (var i = 0; i < children.length; i++) { + tbody.removeChild(children[i]); + } + tbody.appendChild(rows); - var profilerCell = document.createElement('td'); - profilerCell.textContent = 'n/a'; - row.appendChild(profilerCell); + if (infoSpan) { + var text = requestStack.length + ' AJAX request' + (requestStack.length > 1 ? 's' : ''); + infoSpan.textContent = text; + } - row.className = 'sf-ajax-request sf-ajax-request-loading'; - tbody.insertBefore(row, tbody.firstChild); + ajaxToolbarPanel.style.display = 'block'; + } else { + ajaxToolbarPanel.style.display = 'none'; + } + } - renderAjaxRequests(); - }; + requestCounter[0].textContent = requestStack.length; - var finishAjaxRequest = function(index) { - var request = requestStack[index]; - pendingRequests--; - var row = request.DOMNode; - /* Unpack the children from the row */ - var methodCell = row.children[0]; - var statusCodeCell = row.children[2]; - var statusCodeElem = statusCodeCell.children[0]; - var durationCell = row.children[4]; - var profilerCell = row.children[5]; - - if (request.error) { - row.className = 'sf-ajax-request sf-ajax-request-error'; - methodCell.className = 'sf-ajax-request-error'; - successStreak = 0; - } else { - row.className = 'sf-ajax-request sf-ajax-request-ok'; - successStreak++; - } + var className = 'sf-toolbar-ajax-requests sf-toolbar-value'; + requestCounter[0].className = className; - if (request.statusCode) { - if (request.statusCode < 300) { - statusCodeElem.setAttribute('class', 'sf-toolbar-status'); - } else if (request.statusCode < 400) { - statusCodeElem.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-yellow'); + if (state == 'ok') { + Sfjs.removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); + Sfjs.removeClass(ajaxToolbarPanel, 'sf-toolbar-status-red'); + } else if (state == 'error') { + Sfjs.addClass(ajaxToolbarPanel, 'sf-toolbar-status-red'); + Sfjs.removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); } else { - statusCodeElem.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-red'); + Sfjs.addClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); } - statusCodeElem.textContent = request.statusCode; - } - - if (request.duration) { - durationCell.textContent = request.duration + 'ms'; - } - - if (request.profilerUrl) { - profilerCell.textContent = ''; - var profilerLink = document.createElement('a'); - profilerLink.setAttribute('href', request.profilerUrl); - profilerLink.textContent = request.profile; - profilerCell.appendChild(profilerLink); - } - - renderAjaxRequests(); - }; + }; var addEventListener; @@ -234,45 +243,35 @@ var oldFetch = window.fetch; window.fetch = function () { var promise = oldFetch.apply(this, arguments); - var url = arguments[0]; - var params = arguments[1]; - var paramType = Object.prototype.toString.call(arguments[0]); - if (paramType === '[object Request]') { - url = arguments[0].url; - params = { - method: arguments[0].method, - credentials: arguments[0].credentials, - headers: arguments[0].headers, - mode: arguments[0].mode, - redirect: arguments[0].redirect - }; - } - if (!url.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { + if (!arguments[0].match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { var method = 'GET'; - if (params && params.method !== undefined) { - method = params.method; + if (arguments[1] && arguments[1].method !== undefined) { + method = arguments[1].method; } var stackElement = { + loading: true, error: false, - url: url, + url: arguments[0], method: method, type: 'fetch', start: new Date() }; - var idx = requestStack.push(stackElement) - 1; + requestStack.push(stackElement); promise.then(function (r) { stackElement.duration = new Date() - stackElement.start; + stackElement.loading = false; stackElement.error = r.status < 200 || r.status >= 400; stackElement.statusCode = r.status; stackElement.profile = r.headers.get('x-debug-token'); stackElement.profilerUrl = r.headers.get('x-debug-token-link'); - finishAjaxRequest(idx); + Sfjs.renderAjaxRequests(); }, function (e){ + stackElement.loading = false; stackElement.error = true; }); - startAjaxRequest(idx); + Sfjs.renderAjaxRequests(); } return promise; @@ -297,6 +296,7 @@ if (!path.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { var stackElement = { + loading: true, error: false, url: url, method: method, @@ -304,20 +304,21 @@ start: new Date() }; - var idx = requestStack.push(stackElement) - 1; + requestStack.push(stackElement); this.addEventListener('readystatechange', function() { if (self.readyState == 4) { stackElement.duration = new Date() - stackElement.start; + stackElement.loading = false; stackElement.error = self.status < 200 || self.status >= 400; stackElement.statusCode = self.status; extractHeaders(self, stackElement); - finishAjaxRequest(idx); + Sfjs.renderAjaxRequests(); } }, false); - startAjaxRequest(idx); + Sfjs.renderAjaxRequests(); } proxied.apply(this, Array.prototype.slice.call(arguments)); @@ -394,8 +395,8 @@ var tabNavigationItem = document.createElement('li'); tabNavigationItem.setAttribute('data-tab-id', tabId); - if (j == 0) { addClass(tabNavigationItem, 'active'); } - if (hasClass(tabs[j], 'disabled')) { addClass(tabNavigationItem, 'disabled'); } + if (j == 0) { Sfjs.addClass(tabNavigationItem, 'active'); } + if (Sfjs.hasClass(tabs[j], 'disabled')) { Sfjs.addClass(tabNavigationItem, 'disabled'); } tabNavigationItem.innerHTML = tabTitle; tabNavigation.appendChild(tabNavigationItem); @@ -414,7 +415,7 @@ tabId = tabNavigation[j].getAttribute('data-tab-id'); document.getElementById(tabId).querySelector('.tab-title').className = 'hidden'; - if (hasClass(tabNavigation[j], 'active')) { + if (Sfjs.hasClass(tabNavigation[j], 'active')) { document.getElementById(tabId).className = 'block'; } else { document.getElementById(tabId).className = 'hidden'; @@ -434,10 +435,10 @@ for (var k = 0; k < tabNavigation.length; k++) { var tabId = tabNavigation[k].getAttribute('data-tab-id'); document.getElementById(tabId).className = 'hidden'; - removeClass(tabNavigation[k], 'active'); + Sfjs.removeClass(tabNavigation[k], 'active'); } - addClass(activeTab, 'active'); + Sfjs.addClass(activeTab, 'active'); var activeTabId = activeTab.getAttribute('data-tab-id'); document.getElementById(activeTabId).className = 'block'; }); @@ -452,29 +453,34 @@ var elementSelector = toggles[i].getAttribute('data-toggle-selector'); var element = document.querySelector(elementSelector); - addClass(element, 'sf-toggle-content'); + Sfjs.addClass(element, 'sf-toggle-content'); if (toggles[i].hasAttribute('data-toggle-initial') && toggles[i].getAttribute('data-toggle-initial') == 'display') { - addClass(element, 'sf-toggle-visible'); + Sfjs.addClass(toggles[i], 'sf-toggle-on'); + Sfjs.addClass(element, 'sf-toggle-visible'); } else { - addClass(element, 'sf-toggle-hidden'); + Sfjs.addClass(toggles[i], 'sf-toggle-off'); + Sfjs.addClass(element, 'sf-toggle-hidden'); } - addEventListener(toggles[i], 'click', function(e) { + Sfjs.addEventListener(toggles[i], 'click', function(e) { e.preventDefault(); var toggle = e.target || e.srcElement; /* needed because when the toggle contains HTML contents, user can click */ /* on any of those elements instead of their parent '.sf-toggle' element */ - while (!hasClass(toggle, 'sf-toggle')) { + while (!Sfjs.hasClass(toggle, 'sf-toggle')) { toggle = toggle.parentNode; } var element = document.querySelector(toggle.getAttribute('data-toggle-selector')); - toggleClass(element, 'sf-toggle-hidden'); - toggleClass(element, 'sf-toggle-visible'); + Sfjs.toggleClass(toggle, 'sf-toggle-on'); + Sfjs.toggleClass(toggle, 'sf-toggle-off'); + + Sfjs.toggleClass(element, 'sf-toggle-hidden'); + Sfjs.toggleClass(element, 'sf-toggle-visible'); /* the toggle doesn't change its contents when clicking on it */ if (!toggle.hasAttribute('data-toggle-alt-content')) { @@ -498,7 +504,6 @@ Sfjs.addEventListener(window, 'load', function() { Sfjs.createTabs(); Sfjs.createToggles(); - Sfjs.renderAjaxRequests(); }); /*]]>*/ From 55177343b6e8367c463e65bb0cd256b2371f9532 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Fri, 16 Dec 2016 10:51:08 +0100 Subject: [PATCH 2/5] Fixed some merge errors in base_js.html.twig --- .../views/Profiler/base_js.html.twig | 415 +++++++++--------- 1 file changed, 207 insertions(+), 208 deletions(-) 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 333d40d2e735..d93daf05c4eb 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 @@ -20,210 +20,201 @@ var toggleClass = function(el, cssClass) { hasClass(el, cssClass) ? removeClass(el, cssClass) : addClass(el, cssClass); }; } - var noop = function() {}, - - collectionToArray = function (collection) { - var length = collection.length || 0, - results = new Array(length); - - while (length--) { - results[length] = collection[length]; + var noop = function() {}; + + var profilerStorageKey = 'sf2/profiler/'; + + var request = function(url, onSuccess, onError, payload, options) { + var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP'); + options = options || {}; + options.maxTries = options.maxTries || 0; + xhr.open(options.method || 'GET', url, true); + xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); + xhr.onreadystatechange = function(state) { + if (4 !== xhr.readyState) { + return null; } - return results; - }, - - profilerStorageKey = 'sf2/profiler/', - - request = function(url, onSuccess, onError, payload, options) { - var xhr = window.XMLHttpRequest ? new XMLHttpRequest() : new ActiveXObject('Microsoft.XMLHTTP'); - options = options || {}; - options.maxTries = options.maxTries || 0; - xhr.open(options.method || 'GET', url, true); - xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest'); - xhr.onreadystatechange = function(state) { - if (4 !== xhr.readyState) { - return null; - } - - if (xhr.status == 404 && options.maxTries > 1) { - setTimeout(function(){ - options.maxTries--; - request(url, onSuccess, onError, payload, options); - }, 500); - - return null; - } + if (xhr.status == 404 && options.maxTries > 1) { + setTimeout(function(){ + options.maxTries--; + request(url, onSuccess, onError, payload, options); + }, 500); - if (200 === xhr.status) { - (onSuccess || noop)(xhr); - } else { - (onError || noop)(xhr); - } - }; - xhr.send(payload || ''); - }, - - getPreference = function(name) { - if (!window.localStorage) { return null; } - return localStorage.getItem(profilerStorageKey + name); - }, - - setPreference = function(name, value) { - if (!window.localStorage) { - return null; + if (200 === xhr.status) { + (onSuccess || noop)(xhr); + } else { + (onError || noop)(xhr); } + }; + xhr.send(payload || ''); + }; - localStorage.setItem(profilerStorageKey + name, value); - }, + var getPreference = function(name) { + if (!window.localStorage) { + return null; + } - requestStack = [], + return localStorage.getItem(profilerStorageKey + name); + }; - extractHeaders = function(xhr, stackElement) { - /* Here we avoid to call xhr.getResponseHeader in order to */ - /* prevent polluting the console with CORS security errors */ - var allHeaders = xhr.getAllResponseHeaders(); - var ret; + var setPreference = function(name, value) { + if (!window.localStorage) { + return null; + } - if (ret = allHeaders.match(/^x-debug-token:\s+(.*)$/im)) { - stackElement.profile = ret[1]; - } - if (ret = allHeaders.match(/^x-debug-token-link:\s+(.*)$/im)) { - stackElement.profilerUrl = ret[1]; - } - }, + localStorage.setItem(profilerStorageKey + name, value); + }; - renderAjaxRequests = function() { - var requestCounter = document.querySelectorAll('.sf-toolbar-ajax-requests'); - if (!requestCounter.length) { - return; - } + var requestStack = []; - var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax'); - var tbodies = document.querySelectorAll('.sf-toolbar-ajax-request-list'); - var state = 'ok'; - if (tbodies.length) { - var tbody = tbodies[0]; + var extractHeaders = function(xhr, stackElement) { + /* Here we avoid to call xhr.getResponseHeader in order to */ + /* prevent polluting the console with CORS security errors */ + var allHeaders = xhr.getAllResponseHeaders(); + var ret; - var rows = document.createDocumentFragment(); + if (ret = allHeaders.match(/^x-debug-token:\s+(.*)$/im)) { + stackElement.profile = ret[1]; + } + if (ret = allHeaders.match(/^x-debug-token-link:\s+(.*)$/im)) { + stackElement.profilerUrl = ret[1]; + } + }; - if (requestStack.length) { - for (var i = 0; i < requestStack.length; i++) { - var request = requestStack[i]; + var successStreak = 4; + var pendingRequests = 0; + var renderAjaxRequests = function() { + var requestCounter = document.querySelector('.sf-toolbar-ajax-requests'); + if (!requestCounter) { + return; + } + requestCounter.textContent = requestStack.length; + requestCounter.className = 'sf-toolbar-ajax-requests sf-toolbar-value'; - var row = document.createElement('tr'); - rows.insertBefore(row, rows.firstChild); + var infoSpan = document.querySelector(".sf-toolbar-ajax-info"); + if (infoSpan) { + infoSpan.textContent = requestStack.length + ' AJAX request' + (requestStack.length > 1 ? 's' : ''); + } - var methodCell = document.createElement('td'); - if (request.error) { - methodCell.className = 'sf-ajax-request-error'; - } - methodCell.textContent = request.method; - row.appendChild(methodCell); - - var typeCell = document.createElement('td'); - typeCell.textContent = request.type; - row.appendChild(typeCell); - - var statusCodeCell = document.createElement('td'); - var statusCode = document.createElement('span'); - if (request.statusCode < 300) { - statusCode.setAttribute('class', 'sf-toolbar-status'); - } else if (request.statusCode < 400) { - statusCode.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-yellow'); - } else { - statusCode.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-red'); - } - statusCode.textContent = request.statusCode || '-'; - statusCodeCell.appendChild(statusCode); - row.appendChild(statusCodeCell); - - var pathCell = document.createElement('td'); - pathCell.className = 'sf-ajax-request-url'; - if ('GET' === request.method) { - var pathLink = document.createElement('a'); - pathLink.setAttribute('href', request.url); - pathLink.textContent = request.url; - pathCell.appendChild(pathLink); - } else { - pathCell.textContent = request.url; - } - pathCell.setAttribute('title', request.url); - row.appendChild(pathCell); + var ajaxToolbarPanel = document.querySelector('.sf-toolbar-block-ajax'); + if (requestStack.length) { + ajaxToolbarPanel.style.display = 'block'; + } else { + ajaxToolbarPanel.style.display = 'none'; + } + if (pendingRequests > 0) { + addClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); + } else if (successStreak < 4) { + addClass(ajaxToolbarPanel, 'sf-toolbar-status-red'); + removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); + } else { + removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); + removeClass(ajaxToolbarPanel, 'sf-toolbar-status-red'); + } + }; - var durationCell = document.createElement('td'); - durationCell.className = 'sf-ajax-request-duration'; + var startAjaxRequest = function(index) { + var request = requestStack[index]; + pendingRequests++; + var row = document.createElement('tr'); + request.DOMNode = row; - if (request.duration) { - durationCell.textContent = request.duration + "ms"; - } else { - durationCell.textContent = '-'; - } - row.appendChild(durationCell); - - row.appendChild(document.createTextNode(' ')); - var profilerCell = document.createElement('td'); - - if (request.profilerUrl) { - var profilerLink = document.createElement('a'); - profilerLink.setAttribute('href', request.profilerUrl); - profilerLink.textContent = request.profile; - profilerCell.appendChild(profilerLink); - } else { - profilerCell.textContent = 'n/a'; - } + var tbody = document.querySelector('.sf-toolbar-ajax-request-list'); + if (!tbody) { + return; + } - row.appendChild(profilerCell); - - var requestState = 'ok'; - if (request.error) { - requestState = 'error'; - if (state != "loading" && i > requestStack.length - 4) { - state = 'error'; - } - } else if (request.loading) { - requestState = 'loading'; - state = 'loading'; - } - row.className = 'sf-ajax-request sf-ajax-request-' + requestState; - } + var methodCell = document.createElement('td'); + methodCell.textContent = request.method; + row.appendChild(methodCell); + + var typeCell = document.createElement('td'); + typeCell.textContent = request.type; + row.appendChild(typeCell); + + var statusCodeCell = document.createElement('td'); + var statusCode = document.createElement('span'); + statusCode.textContent = '-'; + statusCodeCell.appendChild(statusCode); + row.appendChild(statusCodeCell); + + var pathCell = document.createElement('td'); + pathCell.className = 'sf-ajax-request-url'; + if ('GET' === request.method) { + var pathLink = document.createElement('a'); + pathLink.setAttribute('href', request.url); + pathLink.textContent = request.url; + pathCell.appendChild(pathLink); + } else { + pathCell.textContent = request.url; + } + pathCell.setAttribute('title', request.url); + row.appendChild(pathCell); - var infoSpan = document.querySelectorAll(".sf-toolbar-ajax-info")[0]; - var children = collectionToArray(tbody.children); - for (var i = 0; i < children.length; i++) { - tbody.removeChild(children[i]); - } - tbody.appendChild(rows); + var durationCell = document.createElement('td'); + durationCell.className = 'sf-ajax-request-duration'; + durationCell.textContent = '-'; + row.appendChild(durationCell); - if (infoSpan) { - var text = requestStack.length + ' AJAX request' + (requestStack.length > 1 ? 's' : ''); - infoSpan.textContent = text; - } + var profilerCell = document.createElement('td'); + profilerCell.textContent = 'n/a'; + row.appendChild(profilerCell); - ajaxToolbarPanel.style.display = 'block'; - } else { - ajaxToolbarPanel.style.display = 'none'; - } - } + row.className = 'sf-ajax-request sf-ajax-request-loading'; + tbody.insertBefore(row, tbody.firstChild); - requestCounter[0].textContent = requestStack.length; + renderAjaxRequests(); + }; - var className = 'sf-toolbar-ajax-requests sf-toolbar-value'; - requestCounter[0].className = className; + var finishAjaxRequest = function(index) { + var request = requestStack[index]; + pendingRequests--; + var row = request.DOMNode; + /* Unpack the children from the row */ + var methodCell = row.children[0]; + var statusCodeCell = row.children[2]; + var statusCodeElem = statusCodeCell.children[0]; + var durationCell = row.children[4]; + var profilerCell = row.children[5]; + + if (request.error) { + row.className = 'sf-ajax-request sf-ajax-request-error'; + methodCell.className = 'sf-ajax-request-error'; + successStreak = 0; + } else { + row.className = 'sf-ajax-request sf-ajax-request-ok'; + successStreak++; + } - if (state == 'ok') { - Sfjs.removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); - Sfjs.removeClass(ajaxToolbarPanel, 'sf-toolbar-status-red'); - } else if (state == 'error') { - Sfjs.addClass(ajaxToolbarPanel, 'sf-toolbar-status-red'); - Sfjs.removeClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); + if (request.statusCode) { + if (request.statusCode < 300) { + statusCodeElem.setAttribute('class', 'sf-toolbar-status'); + } else if (request.statusCode < 400) { + statusCodeElem.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-yellow'); } else { - Sfjs.addClass(ajaxToolbarPanel, 'sf-ajax-request-loading'); + statusCodeElem.setAttribute('class', 'sf-toolbar-status sf-toolbar-status-red'); } - }; + statusCodeElem.textContent = request.statusCode; + } + + if (request.duration) { + durationCell.textContent = request.duration + 'ms'; + } + + if (request.profilerUrl) { + profilerCell.textContent = ''; + var profilerLink = document.createElement('a'); + profilerLink.setAttribute('href', request.profilerUrl); + profilerLink.textContent = request.profile; + profilerCell.appendChild(profilerLink); + } + + renderAjaxRequests(); + }; var addEventListener; @@ -243,35 +234,45 @@ var oldFetch = window.fetch; window.fetch = function () { var promise = oldFetch.apply(this, arguments); - if (!arguments[0].match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { + var url = arguments[0]; + var params = arguments[1]; + var paramType = Object.prototype.toString.call(arguments[0]); + if (paramType === '[object Request]') { + url = arguments[0].url; + params = { + method: arguments[0].method, + credentials: arguments[0].credentials, + headers: arguments[0].headers, + mode: arguments[0].mode, + redirect: arguments[0].redirect + }; + } + if (!url.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { var method = 'GET'; - if (arguments[1] && arguments[1].method !== undefined) { - method = arguments[1].method; + if (params && params.method !== undefined) { + method = params.method; } var stackElement = { - loading: true, error: false, - url: arguments[0], + url: url, method: method, type: 'fetch', start: new Date() }; - requestStack.push(stackElement); + var idx = requestStack.push(stackElement) - 1; promise.then(function (r) { stackElement.duration = new Date() - stackElement.start; - stackElement.loading = false; stackElement.error = r.status < 200 || r.status >= 400; stackElement.statusCode = r.status; stackElement.profile = r.headers.get('x-debug-token'); stackElement.profilerUrl = r.headers.get('x-debug-token-link'); - Sfjs.renderAjaxRequests(); + finishAjaxRequest(idx); }, function (e){ - stackElement.loading = false; stackElement.error = true; }); - Sfjs.renderAjaxRequests(); + startAjaxRequest(idx); } return promise; @@ -296,7 +297,6 @@ if (!path.match(new RegExp({{ excluded_ajax_paths|json_encode|raw }}))) { var stackElement = { - loading: true, error: false, url: url, method: method, @@ -304,21 +304,20 @@ start: new Date() }; - requestStack.push(stackElement); + var idx = requestStack.push(stackElement) - 1; this.addEventListener('readystatechange', function() { if (self.readyState == 4) { stackElement.duration = new Date() - stackElement.start; - stackElement.loading = false; stackElement.error = self.status < 200 || self.status >= 400; stackElement.statusCode = self.status; extractHeaders(self, stackElement); - Sfjs.renderAjaxRequests(); + finishAjaxRequest(idx); } }, false); - Sfjs.renderAjaxRequests(); + startAjaxRequest(idx); } proxied.apply(this, Array.prototype.slice.call(arguments)); @@ -395,8 +394,8 @@ var tabNavigationItem = document.createElement('li'); tabNavigationItem.setAttribute('data-tab-id', tabId); - if (j == 0) { Sfjs.addClass(tabNavigationItem, 'active'); } - if (Sfjs.hasClass(tabs[j], 'disabled')) { Sfjs.addClass(tabNavigationItem, 'disabled'); } + if (j == 0) { addClass(tabNavigationItem, 'active'); } + if (hasClass(tabs[j], 'disabled')) { addClass(tabNavigationItem, 'disabled'); } tabNavigationItem.innerHTML = tabTitle; tabNavigation.appendChild(tabNavigationItem); @@ -415,7 +414,7 @@ tabId = tabNavigation[j].getAttribute('data-tab-id'); document.getElementById(tabId).querySelector('.tab-title').className = 'hidden'; - if (Sfjs.hasClass(tabNavigation[j], 'active')) { + if (hasClass(tabNavigation[j], 'active')) { document.getElementById(tabId).className = 'block'; } else { document.getElementById(tabId).className = 'hidden'; @@ -435,10 +434,10 @@ for (var k = 0; k < tabNavigation.length; k++) { var tabId = tabNavigation[k].getAttribute('data-tab-id'); document.getElementById(tabId).className = 'hidden'; - Sfjs.removeClass(tabNavigation[k], 'active'); + removeClass(tabNavigation[k], 'active'); } - Sfjs.addClass(activeTab, 'active'); + addClass(activeTab, 'active'); var activeTabId = activeTab.getAttribute('data-tab-id'); document.getElementById(activeTabId).className = 'block'; }); @@ -453,34 +452,33 @@ var elementSelector = toggles[i].getAttribute('data-toggle-selector'); var element = document.querySelector(elementSelector); - Sfjs.addClass(element, 'sf-toggle-content'); + addClass(element, 'sf-toggle-content'); if (toggles[i].hasAttribute('data-toggle-initial') && toggles[i].getAttribute('data-toggle-initial') == 'display') { - Sfjs.addClass(toggles[i], 'sf-toggle-on'); - Sfjs.addClass(element, 'sf-toggle-visible'); + addClass(toggles[i], 'sf-toggle-on'); + addClass(element, 'sf-toggle-visible'); } else { - Sfjs.addClass(toggles[i], 'sf-toggle-off'); - Sfjs.addClass(element, 'sf-toggle-hidden'); + addClass(toggles[i], 'sf-toggle-off'); + addClass(element, 'sf-toggle-hidden'); } - Sfjs.addEventListener(toggles[i], 'click', function(e) { + addEventListener(toggles[i], 'click', function(e) { e.preventDefault(); var toggle = e.target || e.srcElement; /* needed because when the toggle contains HTML contents, user can click */ /* on any of those elements instead of their parent '.sf-toggle' element */ - while (!Sfjs.hasClass(toggle, 'sf-toggle')) { + while (!hasClass(toggle, 'sf-toggle')) { toggle = toggle.parentNode; } var element = document.querySelector(toggle.getAttribute('data-toggle-selector')); - Sfjs.toggleClass(toggle, 'sf-toggle-on'); - Sfjs.toggleClass(toggle, 'sf-toggle-off'); - - Sfjs.toggleClass(element, 'sf-toggle-hidden'); - Sfjs.toggleClass(element, 'sf-toggle-visible'); + toggleClass(toggle, 'sf-toggle-on'); + toggleClass(toggle, 'sf-toggle-off'); + toggleClass(element, 'sf-toggle-hidden'); + toggleClass(element, 'sf-toggle-visible'); /* the toggle doesn't change its contents when clicking on it */ if (!toggle.hasAttribute('data-toggle-alt-content')) { @@ -504,6 +502,7 @@ Sfjs.addEventListener(window, 'load', function() { Sfjs.createTabs(); Sfjs.createToggles(); + Sfjs.renderAjaxRequests(); }); /*]]>*/ From 9a5689bd4a4013dbc738aef455c4329ebb223bd1 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Thu, 30 Mar 2017 15:56:31 +0200 Subject: [PATCH 3/5] Made the changes requested by reviewers --- .../Resources/views/Exception/_images.twig | 42 ------------------- .../views/Exception/exception.html.twig | 14 +++---- .../views/Exception/exception_full.html.twig | 1 - .../Resources/views/Exception/trace.html.twig | 4 +- .../Resources/views/Exception/trace.txt.twig | 2 +- .../views/Exception/traces.html.twig | 9 ++-- .../views/Exception/traces_text.html.twig | 4 +- .../Resources/views/images/chevron-right.svg | 1 + .../Resources/views/images/favicon.png.base64 | 1 + .../Resources/views/images/icon-book.svg | 1 + .../views/images/icon-minus-square-o.svg | 1 + .../views/images/icon-minus-square.svg | 1 + .../views/images/icon-plus-square-o.svg | 1 + .../views/images/icon-plus-square.svg | 1 + .../Resources/views/images/icon-support.svg | 1 + .../Resources/views/images/symfony-ghost.svg | 1 + .../Resources/views/images/symfony-logo.svg | 1 + 17 files changed, 27 insertions(+), 59 deletions(-) delete mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/Exception/_images.twig create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/chevron-right.svg create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/favicon.png.base64 create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-book.svg create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-minus-square-o.svg create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-minus-square.svg create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-plus-square-o.svg create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-plus-square.svg create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/icon-support.svg create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/symfony-ghost.svg create mode 100644 src/Symfony/Bundle/TwigBundle/Resources/views/images/symfony-logo.svg diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/_images.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/_images.twig deleted file mode 100644 index ded308a12ae4..000000000000 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/_images.twig +++ /dev/null @@ -1,42 +0,0 @@ -{% block favicon_symfony_ghost %} -{# PNG file encoded as base64 #} -{% spaceless %} - 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== -{% endspaceless %} -{% endblock %} - -{% block icon_chevron_left %} - -{% endblock %} - -{% block icon_plus_square %} - -{% endblock %} - -{% block icon_plus_square_o %} - -{% endblock %} - -{% block icon_minus_square %} - -{% endblock %} - -{% block icon_minus_square_o %} - -{% endblock %} - -{% block icon_support %} - -{% endblock %} - -{% block icon_book %} - -{% endblock %} - -{% block symfony_ghost %} - -{% endblock %} - -{% block symfony_logo %} - -{% endblock %} 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 a9126aa4ad95..75e63045a357 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig @@ -2,32 +2,31 @@

    - {{ exception.class|abbr_class }} - {% for previousException in exception.allPrevious %} - {{ block('icon_chevron_left', '@Twig/Exception/_images.twig') }} + {% 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 }} + HTTP {{ status_code }} {{ status_text }}

    -

    +

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

    - {{ block('symfony_ghost', '@Twig/Exception/_images.twig') }} + {{ include('@Twig/images/symfony-ghost.svg') }}
    -
    {% set exception_as_array = exception.toarray %} @@ -90,4 +89,3 @@ {% endif %}
    -
    diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig index 9571b6eb1559..e4f220896ecd 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception_full.html.twig @@ -139,5 +139,4 @@ {% block body %} {% include '@Twig/Exception/exception.html.twig' %} - {{ include('@WebProfiler/Profiler/base_js.html.twig') }} {% endblock %} 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 3a0941b77cab..a6af5d053224 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig @@ -1,6 +1,6 @@ {% if trace.file|default(false) %} - {{ block('icon_minus_square', '@Twig/Exception/_images.twig') }} - {{ block('icon_plus_square', '@Twig/Exception/_images.twig') }} + {{ include('@Twig/images/icon-minus-square.svg') }} + {{ include('@Twig/images/icon-plus-square.svg') }} {% endif %} {% if trace.function %} 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 6003b7c77d0a..689a85a5cada 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.txt.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.txt.twig @@ -1,5 +1,5 @@ {% if trace.function %} - {{- trace.class ~ trace.type ~ trace.function }}() + {{- trace.class ~ trace.type ~ trace.function }}({{ trace.args|format_args }}) {%- else -%} n/a {%- 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 6a566368a0b5..dc0096b11594 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig @@ -10,8 +10,8 @@ {{ exception.class|split('\\')|last }} - {{ block('icon_minus_square_o', '@Twig/Exception/_images.twig') }} - {{ block('icon_plus_square_o', '@Twig/Exception/_images.twig') }} + {{ 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 %} @@ -22,9 +22,12 @@ + {% set _is_first_user_code = true %} {% for i, trace in exception.trace %} + {% 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 %} - + {{ 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_text.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces_text.html.twig index 68cb0aeaf8bc..ffe7f31ad5ec 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 @@ -7,8 +7,8 @@ [{{ num_exceptions - index + 1 }}/{{ num_exceptions }}] {% endif %} {{ exception.class|split('\\')|last }} - {{ block('icon_minus_square_o', '@Twig/Exception/_images.twig') }} - {{ block('icon_plus_square_o', '@Twig/Exception/_images.twig') }} + {{ include('@Twig/images/icon-minus-square-o.svg') }} + {{ include('@Twig/images/icon-plus-square-o.svg') }} 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 000000000000..6f07d1b5b0bb --- /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 000000000000..fb076ed16d0a --- /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 000000000000..498a74f401e3 --- /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 000000000000..be534ad44037 --- /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 000000000000..471c2741c7fd --- /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 000000000000..b2593a9fe79e --- /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 000000000000..8fbf7c4608d9 --- /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 000000000000..03fd8e7678ba --- /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 000000000000..08234346851b --- /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 000000000000..785341864d00 --- /dev/null +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/images/symfony-logo.svg @@ -0,0 +1 @@ + From afe48582fe11253408a9ff9c6a918ae4c173a728 Mon Sep 17 00:00:00 2001 From: Javier Eguiluz Date: Thu, 30 Mar 2017 16:09:18 +0200 Subject: [PATCH 4/5] Added some missing changes from the previous commit --- .../Resources/views/layout.html.twig | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig b/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig index cb8179695fe7..ab11df22188e 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig @@ -5,15 +5,15 @@ {% block title %}{% endblock %} - +