From 0159358a0888b64527cee885ac532b0a37b4bbd4 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 13 Nov 2012 10:11:11 +0100 Subject: [PATCH] refactored CSS, images, templates included in the built-in bundles The goal is to make things more decoupled and more reusable across different bundles. There will be a PR for the distribution bundle too to simplify the code based on this PR. --- .../Resources/public/css/body.css | 150 +++++++++++++++++ .../Resources/public/css/exception.css | 102 ------------ .../Resources/public/css/exception_layout.css | 120 -------------- .../Resources/public/css/structure.css | 72 +++++++++ .../Resources/public/images/border_l.png | Bin 249 -> 361 bytes .../public/images/border_l_hover.png | Bin 0 -> 381 bytes .../Resources/public/images/border_r.png | Bin 253 -> 379 bytes .../public/images/border_r_hover.png | Bin 0 -> 412 bytes .../Resources/public/images/btn_bg.png | Bin 87 -> 135 bytes .../Resources/public/images/btn_bg_hover.png | Bin 0 -> 159 bytes .../public/images/exception_detected.gif | Bin 3996 -> 0 bytes .../Resources/public/images/logo_symfony.gif | Bin 1698 -> 0 bytes .../views/Exception/exception.html.twig | 152 +++++++++--------- .../views/Exception/exception_full.html.twig | 4 + .../Resources/views/layout.html.twig | 40 ++--- .../views/Collector/exception.html.twig | 4 +- .../Resources/views/Profiler/admin.html.twig | 2 +- .../Resources/views/Profiler/base.html.twig | 1 + .../Resources/views/Profiler/header.html.twig | 6 +- .../views/Profiler/profiler_style.html.twig | 45 +----- .../Resources/views/Profiler/search.html.twig | 2 +- 21 files changed, 331 insertions(+), 369 deletions(-) create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/public/css/body.css delete mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/public/css/exception_layout.css create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/public/css/structure.css create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_l_hover.png create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/public/images/border_r_hover.png create mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/public/images/btn_bg_hover.png delete mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/public/images/exception_detected.gif delete mode 100644 src/Symfony/Bundle/FrameworkBundle/Resources/public/images/logo_symfony.gif 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 df27713055121a905d1105f17c4e4c9ca48b9798..af273fbac1b80c659908288f217168ddff5d39eb 100644 GIT binary patch literal 361 zcmV-v0ha!WP)QxFF#29}fo z(k`N+qQ?LJ{X?;X1t?&zqM~9BWHZ5Zz$JkKx?Egb(&)NilA_Ga%slA2V8((JFkzJh z31Tynup~%=20CeEERA#mCI9^W`}ZFsBO?6-uz={XXgOAo|y$LdF%ksRt literal 249 zcmVNK0>rvd3;C00000NkvXXu0mjfS~+5n 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 0000000000000000000000000000000000000000..1d59ac5e273495bed4f947005aa0dde5c46300f0 GIT binary patch literal 381 zcmV-@0fPRCP)p8!(++hGqo;h=d4M=VL$aciz1N(l4-%PK;ioufq{{8Fvz<$u< z4f{HX5&s|*%gK``b%AuwYt{`6|No-e&jQqy{F;3o^WT5J8PEX>(6t_47_Tw>L(>J* zsrcjnYoL+;uu8K1{flWNOp@U*79)`)|KXAR^N$uf|NY0O6R+ey+PD^vwjUmPDbPuzhJ=vaH4+vb0g=cKX*_iL16y;`LOKZ b1Q1{V{8#op7@U3y00000NkvXXu0mjfSthHP literal 0 HcmV?d00001 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 fdd6dc6699d7418a90f22f706045fb40beb49cad..cb14c6d355cb6ee2ab1d384b6e68886e08c84446 100644 GIT binary patch literal 379 zcmV->0fhdEP)y^zYw424pNMDryAO;CB4@acL%yPGk%O%!-PN zWr zA0YmLRT7wFz5>PHVvRCjf_nxOzlxy~DERN;!-pq<%!3#@fhq7TP{W?Eu&^g^oqzuP z`TYL<`)e;>z62%BmEaWl^XJcZz=Zt*m>j{0IwB$ho~T)F-n=;tNM8eGhselClSk!+zrx!6>i2 ztY;=K!`pA2RRv{r!*zXL%pXT()lp(xgbN3a-0R9amHu`3X5BqX00000NkvXXu0mjf D?AT_F 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 0000000000000000000000000000000000000000..ecc24edfd8302bd6a1f936acf16bb76a82301b9c GIT binary patch literal 412 zcmV;N0b~A&P) z0}^0*%-v=DhJ9Vp|NsBb0~Hn_OENCMW%(b(VEre`An??;}GvF`Wy_wQdj*w}x6fs#o0HR~n@pcVNiPoC5Q>ioxmjQ{=vn!&n` z8OTn?&`5}ko@zH z7CQgo()k~sPDXroGU3z7LQp3zNoKGlX7DjFu!Fqv1*=!s82LexkFXlc&7uO5+|BY2 z%~(bTW(FCKfWN@Vo{N!8q*#1F^pxo6=*w`O>`WpI5^N3(Vl37>fV#>+Vk{gCQVe`R zJ7n4YzXSO-adB~dFe_NJxQZ?S>3u-evl0^%QL+O-fB^tD6Z3pl;qm|g0000-L1;Fyx1l&avFo0y&&l$w}QS$Hzl z2B=8W)5S5Q;#QJf<)vsbeSBrvoc4r&u! SelrcIiNVv=&t;ucLK6U++bj XLFV1LIc=AKDj7Uo{an^LB{Ts5ydxG1 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 0000000000000000000000000000000000000000..0b04deb7fb98ff7dc69e7c3c7bc40d5e532aaf63 GIT binary patch literal 159 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 C!j+l; 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 703cf45fc78e6d31d4a9af460252b536b1c9854e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1698 zcmV;T23`3_Nk%w1VYUE10K^&q%gfAUVr4x$Kl1YON=QuQ<>lDe*q4@=v9Pj!eSesj znO9X=ad2|Jy}yf!jHIKbv9Yp#e1F*3*>P`jS5;V~q@}*Tzl({C|Ns9mE;9fB{{R30 z000000000000000A^8LW000^QEC2ui0JZ==06+!*peBxFX^z0-1i_MJ3+p_pEh_&5dM^QH^o`2q?YC;|Y#eo6?SBFL~IkO9*W zUWrg(6a+6t1e9~gkzoUD0u)q?cL8IkHxMNMW_YDz4U&xn4G;-%fMrJwrreB*aD?3_ z1wa){Fo|t|jsdNTB$!ozNI7K6ROJ$p6pPVgF9`4wMB>|mt0D|wjG70m21m-KH6S4q zhKOfKG;JyM!j7010!F!0IkQPpts|OdaKxZQty_Z;XW06P@mIDOfgM&{!i#`0fD`e3 zQEdyS&0Nj2C9?Kr8lnz-R4p>0a~KE_K`S#&yS5Dk42ZH}fWWNn-@r{EpxZBi&EUv6 z8aN0#2?2n~qoYCA9N}^4*n51eZlv`Vo}$7KN0+^P4l3M z2>3zos9Q+@lo%19fEJ&v_eMl=Ver}i6~3L26fm|Wb=^(lB>@IXO1OprcmzanA$V+L zb^~<*z@))9>6GxyTD2hYPk$N-mINXQ^p_PtcqCwBVHzYQp9trqhK*03$jI3zp=`EL z4gk;<4l+DyFhEu)P)UL+z8NDzFH^jr%?TK>h?fa6iXfN(BusNv6&G%ik!z~7xy6*t zIl-j}Y9eFPWF!!y%L|M_g5H-VU{nL2eF8edifzfKN)iT20F<12yZv3FsjK z;Rr5efTm$DL^*<=i7qz6og;{q#A5}anraE7fn!1!py{+pbtXdbOp509;L?wY*qD(5 z06@@Q5uSu`O>_G}VTmEZ{vb*JgE&xUL1w2rpe-Fev@4h-90G~<(Y|8JzQl6785e#5UFuM(io2~!?FPxpW2UiiX#KE~* z@e34008|A3Hij{FaHUIu9SUF;&k<9N3>-uiQxHZ4U%WA%01CV85UvN?MKf#F{QQ#6 zwS{a20W27sMHohcl(Pv9{JSJU??&s;yP0%mi5&wxi^V4(W-tK+3tD074XPv%P67Jn zgWlPu)oR5^7&M*1$rz+WHy1@*`e+rU;lOHbgVTm}65KMKgaFOHA#`1H_0h5o&rIGb zE)5zmMj3GkP)KY67-azeT>((?w-JLB@U8#{nAQ0qC1>EkRbD)Is|#A0lK2~y79sN} zNG@y24sdXt_r~;iTHpx_=E*BaSP{$|$EWviZgdX{vBSluA zfC7ZqxHo|4cW)@0O6rG$hWUwSS3w4Z5G8{2&1zKz6h<&!@COo>P*Ep(L223&B{pG- z2y^&^Ds~qJqs^mjH~7XN@K6{!CC`PjdZDVeRKRC^iZLxrq7p~2JUof2D@uqT9E_kv z39)c17fSdz2oVk(|*9gP26mT@rLI(4sh?6#MCjsXOoCcz2gl2{9QVN>M zDBh=%)a0N50dPS1QV22^6&KcVi9jlXAybu*3hZqF zu;Jn-Qqr8K6@)kfNWj!GMXb&_vW`!zqp1P`D-sM~lX-ZeEsNm?6HFs{LTHX2-e5P0 zkjo5$5s}2!XM@Adqk=r!%(|SQh-ZjzVV3BW)ka{=J|u_>4l{-2o)9YhVN4aQ+W{Xl zVi%ZY#c|acCDCl7u_MR{1AEbx1k!1WaqiPJ^IWEzLb9vsZ1bQIlEVaoGL-Z@6r#YP s-o}b>F^nP~2bk%~rANzE00$7X3b6#@NZAEF2Ha}_46x5i%M$_sJDrx#NB{r; 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 %} +