extracted common layout for internal/core pages

CSS styles should probably be renamed at some point.
symfony · Apr 12, 2011 · 55a8f8d · henrikbjorn · Apr 12, 2011 · 55a8f8d
1 parent e6fd8de
commit 55a8f8d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 14 deletions.
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
@@ -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/...esources/views/Exception/layout.html.twig → ...rkBundle/Resources/views/layout.html.twig b/...esources/views/Exception/layout.html.twig → ...rkBundle/Resources/views/layout.html.twig
@@ -2,8 +2,7 @@
 <html>
     <head>
         <meta http-equiv="Content-Type" content="text/html; charset={{ _charset }}"/>
-        <title>{{ exception.message }} ({{ status_code }} {{ status_text }})</title>
-
+        <title>{% block title '' %}</title>
         <link href="{{ asset('bundles/framework/css/exception_layout.css') }}" rel="stylesheet" type="text/css" media="all" />
         <link href="{{ asset('bundles/framework/css/exception.css') }}" rel="stylesheet" type="text/css" media="all" />
     </head>
@@ -37,7 +36,6 @@
             </div>
 
             {% block body '' %}
-
         </div>
     </body>
 </html>
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
@@ -1,10 +1,18 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <title>Redirection Intercepted</title>
-</head>
-<body>
-    <h1>This Request redirects to<br /><a href="{{ location }}">{{ location }}</a>.</h1>
-    <h4>The redirect was intercepted by the web debug toolbar to help debugging.<br/>For more information, see the "intercept-redirects" option of the Profiler.</h4>
-</body>
-</html>
+{% extends 'FrameworkBundle::layout.html.twig' %}
+
+{% block title 'Redirection Intercepted' %}
+
+{% block body %}
+    <div class="sf-exceptionreset">
+        <div class="block_exception">
+            <h1>This request redirects to <a href="{{ location }}">{{ location }}</a>.</h1>
+
+            <p>
+                <small>
+                    The redirect was intercepted by the web debug toolbar to help debugging.
+                    For more information, see the "intercept-redirects" option of the Profiler.
+                </small>
+            </p>
+        </div>
+    </div>
+{% endblock %}