diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css new file mode 100644 index 0000000000..e420c9b685 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css @@ -0,0 +1,150 @@ +/* +Copyright (c) 2010, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.com/yui/license.html +version: 3.1.2 +build: 56 +*/ +.sf-reset html{color:#000;background:#FFF;}.sf-reset body,.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{*font-size:100%;}.sf-reset legend{color:#000;} +.sf-reset html, +.sf-reset body { + width: 100%; + min-height: 100%; + _height: 100%; + margin: 0; + padding: 0; +} +.sf-reset body { + font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; + text-align: left; + background-color: #efefef; +} +.sf-reset abbr { + border-bottom: 1px dotted #000; + cursor: help; +} +.sf-reset p { + font-size: 14px; + line-height: 20px; + padding-bottom: 20px; +} +.sf-reset strong { + color: #313131; + font-weight: bold; +} +.sf-reset a { + color: #6c6159; +} +.sf-reset a img { + border: none; +} +.sf-reset a:hover { + text-decoration: underline; +} +.sf-reset em { + font-style: italic; +} +.sf-reset h2, +.sf-reset h3 { + font-weight: bold; +} +.sf-reset h1 { + font-family: Georgia, "Times New Roman", Times, serif; + font-size: 20px; + color: #313131; + word-break: break-all; +} +.sf-reset li { + padding-bottom: 10px; +} +.sf-reset .block { + -moz-border-radius: 16px; + -webkit-border-radius: 16px; + border-radius: 16px; + margin-bottom: 20px; + background-color: #FFFFFF; + border: 1px solid #dfdfdf; + padding: 40px 50px; +} +.sf-reset h2 { + font-size: 16px; + font-family: Arial, Helvetica, sans-serif; +} +.sf-reset li a { + background: none; + color: #868686; + text-decoration: none; +} +.sf-reset li a:hover { + background: none; + color: #313131; + text-decoration: underline; +} +.sf-reset ol { + padding: 10px 0; +} +.sf-reset ol li { + list-style: decimal; + margin-left: 20px; + padding: 2px; + padding-bottom: 20px; +} +.sf-reset ol ol li { + list-style-position: inside; + margin-left: 0; + white-space: nowrap; + font-size: 12px; + padding-bottom: 0; +} +.sf-reset li .selected { + background-color: #ffd; +} +.sf-button { + display: -moz-inline-box; + display: inline-block; + text-align: center; + vertical-align: middle; + border: 0; + background: transparent none; + text-transform: uppercase; + cursor: pointer; + font: bold 11px Arial, Helvetica, sans-serif; +} +.sf-button span { + text-decoration: none; + display: block; + height: 28px; + float: left; +} +.sf-button .border-l { + text-decoration: none; + display: block; + height: 28px; + float: left; + padding: 0 0 0 7px; + background: transparent url(../images/border_l.png) no-repeat top left; +} +.sf-button .border-r { + padding: 0 7px 0 0; + background: transparent url(../images/border_r.png) right top no-repeat; +} +.sf-button .btn-bg { + padding: 0px 14px; + color: #636363; + line-height: 28px; + background: transparent url(../images/btn_bg.png) repeat-x top left; +} +.sf-button:hover .border-l, +.sf-button-selected .border-l { + background: transparent url(../images/border_l_hover.png) no-repeat top left; +} +.sf-button:hover .border-r, +.sf-button-selected .border-r { + background: transparent url(../images/border_r_hover.png) right top no-repeat; +} +.sf-button:hover .btn-bg, +.sf-button-selected .btn-bg { + color: #FFFFFF; + text-shadow:0 1px 1px #6b9311; + background: transparent url(../images/btn_bg_hover.png) repeat-x top left; +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css index dfdaecf910..2b2094e903 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception.css @@ -1,63 +1,3 @@ -/* -Copyright (c) 2010, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.com/yui/license.html -version: 3.1.2 -build: 56 -*/ -.sf-reset html{color:#000;background:#FFF;}.sf-reset body,.sf-reset div,.sf-reset dl,.sf-reset dt,.sf-reset dd,.sf-reset ul,.sf-reset ol,.sf-reset li,.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6,.sf-reset pre,.sf-reset code,.sf-reset form,.sf-reset fieldset,.sf-reset legend,.sf-reset input,.sf-reset textarea,.sf-reset p,.sf-reset blockquote,.sf-reset th,.sf-reset td{margin:0;padding:0;}.sf-reset table{border-collapse:collapse;border-spacing:0;}.sf-reset fieldset,.sf-reset img{border:0;}.sf-reset address,.sf-reset caption,.sf-reset cite,.sf-reset code,.sf-reset dfn,.sf-reset em,.sf-reset strong,.sf-reset th,.sf-reset var{font-style:normal;font-weight:normal;}.sf-reset li{list-style:none;}.sf-reset caption,.sf-reset th{text-align:left;}.sf-reset h1,.sf-reset h2,.sf-reset h3,.sf-reset h4,.sf-reset h5,.sf-reset h6{font-size:100%;font-weight:normal;}.sf-reset q:before,.sf-reset q:after{content:'';}.sf-reset abbr,.sf-reset acronym{border:0;font-variant:normal;}.sf-reset sup{vertical-align:text-top;}.sf-reset sub{vertical-align:text-bottom;}.sf-reset input,.sf-reset textarea,.sf-reset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-reset input,.sf-reset textarea,.sf-reset select{*font-size:100%;}.sf-reset legend{color:#000;} -.sf-reset html, -.sf-reset body { - width: 100%; - min-height: 100%; - _height: 100%; - margin: 0; - padding: 0; -} -.sf-reset body { - font: 1em "Lucida Sans Unicode", "Lucida Grande", Verdana, Arial, Helvetica, sans-serif; - text-align: left; - background-color: #efefef; -} -.sf-reset abbr { - border-bottom: 1px dotted #000; - cursor: help; -} -.sf-reset p { - font-size: 14px; - line-height: 20px; - color: #868686; - padding-bottom: 20px; -} -.sf-reset strong { - color: #313131; - font-weight: bold; -} -.sf-reset a { - color: #6c6159; -} -.sf-reset a img { - border: none; -} -.sf-reset a:hover { - text-decoration: underline; -} -.sf-reset em { - font-style: italic; -} -.sf-reset h2, -.sf-reset h3 { - font-weight: bold; -} -.sf-reset h1 { - font-family: Georgia, "Times New Roman", Times, serif; - font-size: 20px; - color: #313131; - word-break: break-all; -} -.sf-reset li { - padding-bottom: 10px; -} .sf-reset .traces { padding-bottom: 14px; } @@ -88,19 +28,11 @@ build: 56 overflow: auto; margin: 10px 0 20px; } -.sf-reset .block, .sf-reset .block-exception { -moz-border-radius: 16px; -webkit-border-radius: 16px; border-radius: 16px; margin-bottom: 20px; -} -.sf-reset .block { - background-color: #FFFFFF; - border: 1px solid #dfdfdf; - padding: 40px 50px; -} -.sf-reset .block-exception { background-color: #f6f6f6; border: 1px solid #dfdfdf; padding: 30px 28px; @@ -140,21 +72,6 @@ build: 56 .sf-reset .block-exception p a:hover { color: #565656; } -.sf-reset h2 { - font-size: 16px; - font-family: Arial, Helvetica, sans-serif; - padding-bottom: 16px; -} -.sf-reset li a { - background: none; - color: #868686; - text-decoration: none; -} -.sf-reset li a:hover { - background: none; - color: #313131; - text-decoration: underline; -} .sf-reset .logs h2 { float: left; width: 654px; @@ -187,22 +104,3 @@ build: 56 color: #000; font-size: 12px; } -.sf-reset ol { - padding: 10px 0; -} -.sf-reset ol li { - list-style: decimal; - margin-left: 20px; - padding: 2px; - padding-bottom: 20px; -} -.sf-reset ol ol li { - list-style-position: inside; - margin-left: 0; - white-space: nowrap; - font-size: 12px; - padding-bottom: 0; -} -.sf-reset li .selected { - background-color: #ffd; -} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css deleted file mode 100644 index 5f26c54f2f..0000000000 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css +++ /dev/null @@ -1,120 +0,0 @@ -html { - background: #eee; -} -body { - font: 11px Verdana, Arial, sans-serif; - color: #333; -} -.sf-reset, .sf-reset .block, .sf-reset #message { - margin: auto; -} -img { - border: 0; -} -.clear { - clear: both; - height: 0; - font-size: 0; - line-height: 0; -} -.clear-fix:after { - content: "\0020"; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -.clear-fix { - display: inline-block; -} -* html .clear-fix { - height: 1%; -} -.clear-fix { - display: block; -} -.header { - padding: 30px 30px 20px 30px; -} -.header-logo { - float: left; -} -.search { - float: right; - padding-top: 20px; -} -.search label { - line-height: 28px; - vertical-align: middle; -} -.search input { - width: 188px; - margin-right: 10px; - font-size: 12px; - border: 1px solid #dadada; - background: #FFFFFF url(../images/input_bg.gif) repeat-x left top; - padding: 5px 6px; - color: #565656; -} -.search input[type="search"] { - -webkit-appearance: textfield; -} -.search button { - -webkit-appearance: button-bevel; - float: none; - padding: 0; - margin: 0; - overflow: visible; - width: auto; - text-decoration: none; - cursor: pointer; - white-space: nowrap; - display: inline-block; - text-align: center; - vertical-align: middle; - border: 0; - background: none; -} -.search button:-moz-focus-inner { - padding: 0; - border: none; -} -.search button:hover { - text-decoration: none; -} -.search button span span, -.search button span span span { - position: static; -} -.search button span { - position: relative; - text-decoration: none; - display: block; - height: 28px; - float: left; - padding: 0 0 0 8px; - background: transparent url(../images/border_l.png) no-repeat top left; -} -.search button span span { - padding: 0 8px 0 0; - background: transparent url(../images/border_r.png) right top no-repeat; -} -.search button span span span { - padding: 0 7px; - font: bold 11px Arial, Helvetica, sans-serif; - color: #6b6b6b; - line-height: 28px; - background: transparent url(../images/btn_bg.png) repeat-x top left; -} -#content { - width: 970px; - margin: 0 auto; -} -pre { - white-space: normal; - font-family: Arial, Helvetica, sans-serif; -} -pre.xdebug-var-dump{ - white-space: pre; - font-family: monospace; -} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/structure.css b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/structure.css new file mode 100644 index 0000000000..ef7d67ace7 --- /dev/null +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/public/css/structure.css @@ -0,0 +1,72 @@ +html { + background: #eee; +} +body { + font: 11px Verdana, Arial, sans-serif; + color: #333; +} +.sf-reset, .sf-reset .block, .sf-reset #message { + margin: auto; +} +img { + border: 0; +} +.clear { + clear: both; + height: 0; + font-size: 0; + line-height: 0; +} +.clear-fix:after { + content: "\0020"; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +.clear-fix { + display: inline-block; +} +* html .clear-fix { + height: 1%; +} +.clear-fix { + display: block; +} +.header { + padding: 30px 30px 20px 30px; +} +.header-logo { + float: left; +} +.search { + float: right; + padding-top: 20px; +} +.search label { + line-height: 28px; + vertical-align: middle; +} +.search input { + width: 195px; + font-size: 12px; + border: 1px solid #dadada; + background: #fff url(../images/input_bg.gif) repeat-x left top; + padding: 5px 6px; + color: #565656; +} +.search input[type="search"] { + -webkit-appearance: textfield; +} +#content { + width: 970px; + margin: 0 auto; +} +pre { + white-space: normal; + font-family: Arial, Helvetica, sans-serif; +} +pre.xdebug-var-dump{ + white-space: pre; + font-family: monospace; +} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l.png index df27713055..af273fbac1 100644 Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l.png and b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l.png differ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l_hover.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l_hover.png new file mode 100644 index 0000000000..1d59ac5e27 Binary files /dev/null and b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l_hover.png differ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r.png index fdd6dc6699..cb14c6d355 100644 Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r.png and b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r.png differ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r_hover.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r_hover.png new file mode 100644 index 0000000000..ecc24edfd8 Binary files /dev/null and b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r_hover.png differ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg.png index 303c129526..afb9368ec1 100644 Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg.png and b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg.png differ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg_hover.png b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg_hover.png new file mode 100644 index 0000000000..0b04deb7fb Binary files /dev/null and b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg_hover.png differ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/exception_detected.gif b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/exception_detected.gif deleted file mode 100644 index fc412874d6..0000000000 Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/exception_detected.gif and /dev/null differ diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/logo_symfony.gif b/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/logo_symfony.gif deleted file mode 100644 index 703cf45fc7..0000000000 Binary files a/src/Symfony/Bundle/FrameworkBundle/Resources/public/images/logo_symfony.gif and /dev/null differ 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 b4c9bc7955..e506ad92ce 100644 --- a/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig +++ b/src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig @@ -1,100 +1,94 @@ -
- -
-
-
- Exception detected! +
+
+
+ Exception detected! +
+
+
+
-
-
- -
- -

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

- -
- {{ status_code }} {{ status_text }} - {{ exception.class|abbr_class }} -
- - {% 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 %} - -
- +

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

+ +
+ {{ status_code }} {{ status_text }} - {{ exception.class|abbr_class }} +
+ + {% 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 'TwigBundle:Exception:traces.html.twig' with { 'exception': e, 'position': position, 'count': previous_count } only %} - {% endfor %} +{% for position, e in exception.toarray %} + {% include 'TwigBundle:Exception:traces.html.twig' with { 'exception': e, 'position': position, 'count': previous_count } only %} +{% endfor %} - {% if logger %} -
-
- {% spaceless %} -

- Logs  - - - - - -

- {% endspaceless %} - - {% if logger.counterrors %} -
- - {{ logger.counterrors }} error{{ logger.counterrors > 1 ? 's' : ''}} - -
- {% endif %} - -
- -
- {% include 'TwigBundle:Exception:logs.html.twig' with { 'logs': logger.logs } only %} -
- -
- {% endif %} - - {% if currentContent %} -
+{% if logger %} +
+
{% spaceless %}

- Content of the Output  - - - + + Logs  + + + -

{% endspaceless %} - + {% if logger.counterrors %} +
+ + {{ logger.counterrors }} error{{ logger.counterrors > 1 ? 's' : ''}} + +
+ {% endif %} -
- {% endif %} -
+
+ {% include 'TwigBundle:Exception:logs.html.twig' with { 'logs': logger.logs } only %} +
+
+{% endif %} + +{% if currentContent %} +
+ {% spaceless %} +

+ Content of the Output  + + + + + +

+ {% endspaceless %} + + + +
+
+{% endif %} +