From 55a8f8d0980806e6a48ba7ca5434455ab6e950cb Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 12 Apr 2011 12:32:32 +0200 Subject: [PATCH] extracted common layout for internal/core pages CSS styles should probably be renamed at some point. --- .../views/Exception/exception_full.html.twig | 6 +++- .../views/{Exception => }/layout.html.twig | 4 +-- .../views/Profiler/toolbar_redirect.html.twig | 28 ++++++++++++------- 3 files changed, 24 insertions(+), 14 deletions(-) rename src/Symfony/Bundle/FrameworkBundle/Resources/views/{Exception => }/layout.html.twig (94%) diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.html.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.html.twig index 675e015fa9ca..0098e6268a8f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.html.twig +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/exception_full.html.twig @@ -1,4 +1,8 @@ -{% extends 'FrameworkBundle:Exception:layout.html.twig' %} +{% extends 'FrameworkBundle::layout.html.twig' %} + +{% block title %} + {{ exception.message }} ({{ status_code }} {{ status_text }}) +{% endblock %} {% block body %} {% include 'FrameworkBundle:Exception:exception.html.twig' %} diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.html.twig b/src/Symfony/Bundle/FrameworkBundle/Resources/views/layout.html.twig similarity index 94% rename from src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.html.twig rename to src/Symfony/Bundle/FrameworkBundle/Resources/views/layout.html.twig index 6f70a34a7479..dc1d4e1ada4d 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/views/Exception/layout.html.twig +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/views/layout.html.twig @@ -2,8 +2,7 @@ - {{ exception.message }} ({{ status_code }} {{ status_text }}) - + {% block title '' %} @@ -37,7 +36,6 @@ {% block body '' %} - diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig index e607b0934578..013723edf6dc 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_redirect.html.twig @@ -1,10 +1,18 @@ - - - - Redirection Intercepted - - -

This Request redirects to
{{ location }}.

-

The redirect was intercepted by the web debug toolbar to help debugging.
For more information, see the "intercept-redirects" option of the Profiler.

- - +{% extends 'FrameworkBundle::layout.html.twig' %} + +{% block title 'Redirection Intercepted' %} + +{% block body %} +
+
+

This request redirects to {{ location }}.

+ +

+ + The redirect was intercepted by the web debug toolbar to help debugging. + For more information, see the "intercept-redirects" option of the Profiler. + +

+
+
+{% endblock %}