Skip to content

Commit

Permalink
Merge pull request #11 from GrandLTU/template-include-naming
Browse files Browse the repository at this point in the history
Change include naming to allow overriding
  • Loading branch information
GrandLTU authored Dec 5, 2019
2 parents ef98ee1 + e8c45cd commit e8dd088
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/Resources/views/Crud/create.html.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'PlatformAdminBundle::layout.html.twig' %}
{% extends '@PlatformAdmin/layout.html.twig' %}

{% set header = configuration.vars.header|default(metadata.applicationName~'.ui.new_'~metadata.name) %}

Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/Crud/index.html.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'PlatformAdminBundle::layout.html.twig' %}
{% extends '@PlatformAdmin/layout.html.twig' %}

{% set definition = resources.definition %}
{% set data = resources.data %}
Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/Crud/update.html.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'PlatformAdminBundle::layout.html.twig' %}
{% extends '@PlatformAdmin/layout.html.twig' %}

{% import 'SyliusUiBundle:Macro:buttons.html.twig' as buttons %}

Expand Down
2 changes: 1 addition & 1 deletion src/Resources/views/Dashboard/index.html.twig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% extends 'PlatformAdminBundle::layout.html.twig' %}
{% extends '@PlatformAdmin/layout.html.twig' %}

{% block title %}{{ parent() }}{{ 'sylius.ui.dashboard'|trans }}{% endblock %}

Expand Down
6 changes: 3 additions & 3 deletions src/Resources/views/layout.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
{% block title %}Admin platform | {% endblock %}

{% block stylesheets %}
{% include 'SyliusUiBundle::_stylesheets.html.twig' with {'path': 'assets/admin/css/style.css'} %}
{% include '@SyliusUi/_stylesheets.html.twig' with {'path': 'assets/admin/css/style.css'} %}
{% endblock %}

{% block topbar %}
<a class="icon item" id="sidebar-toggle" title="{{ 'sylius.ui.toggle_sidebar'|trans }}">
<i class="sidebar icon"></i>
</a>
{% include 'PlatformAdminBundle::_security.html.twig' %}
{% include '@PlatformAdmin/_security.html.twig' %}
{% endblock %}

{% block sidebar %}
Expand All @@ -23,5 +23,5 @@
{% endblock %}

{% block javascripts %}
{% include 'SyliusUiBundle::_javascripts.html.twig' with {'path': 'assets/admin/js/app.js'} %}
{% include '@SyliusUi/_javascripts.html.twig' with {'path': 'assets/admin/js/app.js'} %}
{% endblock %}

0 comments on commit e8dd088

Please sign in to comment.