Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[GeneratorBundle] stripped layout for error pages #971

Merged
merged 1 commit into from
Feb 3, 2016
Merged

[GeneratorBundle] stripped layout for error pages #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...esources/SensioGeneratorBundle/skeleton/defaultsite/Resources/views/Error/error.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends '<%= bundle.name %>:Layout:layout.html.twig' %}
{% extends '<%= bundle.name %>:Error:layout.html.twig' %}

{% block title %} - {{ status_code }} - {{ status_text }} - {{ websitetitle }}{% endblock %}

Expand Down
42 changes: 42 additions & 0 deletions ...le/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Error/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{% spaceless %}<!DOCTYPE html>
{% set htmlLocale = app.request.locale|default(defaultlocale)|slice(0,2) %}
<!--[if lte IE 9]> <html class="no-js lt-ie9" lang="{{ htmlLocale }}"> <![endif]-->
<!--[if gt IE 9]><!--> <html lang="{{ htmlLocale }}"> <!--<![endif]-->
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">

<title>
{{ websitetitle | trans }}{% block title %}{% endblock %}
</title>

{# Favicons #}
{% include '<%= bundle.getName() %>:Layout:_favicons.html.twig' %}

{# Webfonts #}
{% include '<%= bundle.getName() %>:Layout:_webfonts.html.twig' %}

{# CSS #}
{% include '<%= bundle.getName() %>:Layout:_css.html.twig' %}

{# JS #}
{% include '<%= bundle.getName() %>:Layout:_js_header.html.twig' %}
</head>

<body class="{% block extra_body_classes %}<% if demosite %>emulate-pulldown<% endif %>{% endblock %}" {% block extra_body_attributes %}{% endblock %}>

{# Google Tagmanager #}
{% include '<%= bundle.getName() %>:Layout:_googletagmanager.html.twig' %}

{# Outdated browser message #}
{% include '<%= bundle.getName() %>:Layout:_outdatedbrowser.html.twig' %}

{# Content #}
<main role="main">
{% block content %}{% endblock %}
</main>

</body>
</html>
{% endspaceless %}
3 changes: 3 additions & 0 deletions ...esources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/_webfonts.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{% block webfonts %}
<link href="http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900" rel="stylesheet">
{% endblock %}
2 changes: 1 addition & 1 deletion ...e/Resources/SensioGeneratorBundle/skeleton/layout/Resources/views/Layout/layout.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{% include '<%= bundle.getName() %>:Layout:_favicons.html.twig' %}

{# Webfonts #}
<link href="http://fonts.googleapis.com/css?family=Lato:100,300,400,700,900" rel="stylesheet">
{% include '<%= bundle.getName() %>:Layout:_webfonts.html.twig' %}

{# CSS #}
{% include '<%= bundle.getName() %>:Layout:_css.html.twig' %}
Expand Down