Move all Twig templates to "legacy" subdirectory

Issue #116
TomaszGasior · Aug 22, 2020 · 05269d4 · 05269d4
1 parent 17ba68c
commit 05269d4
Show file tree

Hide file tree

Showing 30 changed files with 28 additions and 25 deletions.
diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml
@@ -1,5 +1,7 @@
 twig:
-    default_path: '%kernel.project_dir%/templates'
+    paths:
+        - '%kernel.project_dir%/templates'
+        - '%kernel.project_dir%/templates/legacy'
     debug: '%kernel.debug%'
     strict_variables: '%kernel.debug%'
     exception_controller: null

diff --git a/templates/admin/_admin_layout.html.twig → ...ates/legacy/admin/_admin_layout.html.twig b/templates/admin/_admin_layout.html.twig → ...ates/legacy/admin/_admin_layout.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block head_closing %}
     <link rel="stylesheet" href="{{ asset('admin.css') }}">

diff --git a/templates/admin/logs.html.twig → templates/legacy/admin/logs.html.twig b/templates/admin/logs.html.twig → templates/legacy/admin/logs.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/_admin_layout.html.twig' %}
+{% extends 'admin/_admin_legacy_layout.html.twig' %}
 
 {% block page_content %}
     <header>

diff --git a/templates/admin/radio_tables.html.twig → ...lates/legacy/admin/radio_tables.html.twig b/templates/admin/radio_tables.html.twig → ...lates/legacy/admin/radio_tables.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/_admin_layout.html.twig' %}
+{% extends 'admin/_admin_legacy_layout.html.twig' %}
 
 {% block page_content %}
     <header>

diff --git a/templates/admin/users.html.twig → templates/legacy/admin/users.html.twig b/templates/admin/users.html.twig → templates/legacy/admin/users.html.twig
@@ -1,4 +1,4 @@
-{% extends 'admin/_admin_layout.html.twig' %}
+{% extends 'admin/_admin_legacy_layout.html.twig' %}
 
 {% block page_content %}
     <header>

diff --git a/templates/general/about_service.html.twig → ...es/legacy/general/about_service.html.twig b/templates/general/about_service.html.twig → ...es/legacy/general/about_service.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.static_page.about_service'|trans }}{% endblock %}
 

diff --git a/templates/general/all_radio_tables.html.twig → ...legacy/general/all_radio_tables.html.twig b/templates/general/all_radio_tables.html.twig → ...legacy/general/all_radio_tables.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.all_radio_tables.title'|trans }}{% endblock %}
 

diff --git a/templates/general/contact.html.twig → templates/legacy/general/contact.html.twig b/templates/general/contact.html.twig → templates/legacy/general/contact.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.static_page.contact'|trans }}{% endblock %}
 

diff --git a/templates/general/homepage.html.twig → templates/legacy/general/homepage.html.twig b/templates/general/homepage.html.twig → templates/legacy/general/homepage.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% macro print_date(date) %}
     <time datetime="{{ date.format('Y-m-d') }}">

diff --git a/...tes/general/search_radio_tables.html.twig → ...acy/general/search_radio_tables.html.twig b/...tes/general/search_radio_tables.html.twig → ...acy/general/search_radio_tables.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.search_radio_tables.title'|trans }}{% endblock %}
 

diff --git a/templates/general/terms_of_service.html.twig → ...legacy/general/terms_of_service.html.twig b/templates/general/terms_of_service.html.twig → ...legacy/general/terms_of_service.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'general.static_page.terms_of_service'|trans }}{% endblock %}
 

diff --git a/templates/layout.html.twig → templates/legacy/legacy_layout.html.twig b/templates/layout.html.twig → templates/legacy/legacy_layout.html.twig
@@ -1,5 +1,7 @@
 <!doctype html>
 
+{% deprecated 'This page uses old layout which is deprecated. Page must be ported to new layout.' %}
+
 {% set current_locale = app.request.locale %}
 {% set route_name = app.request.attributes.get('_route') %}
 {% set route_params = app.request.attributes.get('_route_params') %}

diff --git a/...dio_station/_radio_station_tabs.html.twig → ...dio_station/_radio_station_tabs.html.twig b/...dio_station/_radio_station_tabs.html.twig → ...dio_station/_radio_station_tabs.html.twig
diff --git a/...ation/_radio_station_tabs_theme.html.twig → ...ation/_radio_station_tabs_theme.html.twig b/...ation/_radio_station_tabs_theme.html.twig → ...ation/_radio_station_tabs_theme.html.twig
@@ -1,4 +1,4 @@
-{% use 'form_div_layout.html.twig' %}
+{% use 'form_div_legacy_layout.html.twig' %}
 {% use 'common/form/overwritten_types.html.twig' %}
 {% use 'common/form/custom_types.html.twig' %}
 

diff --git a/templates/radio_station/add.html.twig → templates/legacy/radio_station/add.html.twig b/templates/radio_station/add.html.twig → templates/legacy/radio_station/add.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_station.add.title'|trans }}{% endblock %}
 

diff --git a/templates/radio_station/edit.html.twig → ...lates/legacy/radio_station/edit.html.twig b/templates/radio_station/edit.html.twig → ...lates/legacy/radio_station/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_station.edit.title'|trans }}{% endblock %}
 

diff --git a/templates/radio_table/create.html.twig → ...lates/legacy/radio_table/create.html.twig b/templates/radio_table/create.html.twig → ...lates/legacy/radio_table/create.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_table.create.title'|trans }}{% endblock %}
 

diff --git a/templates/radio_table/remove.html.twig → ...lates/legacy/radio_table/remove.html.twig b/templates/radio_table/remove.html.twig → ...lates/legacy/radio_table/remove.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_table.remove.title'|trans }}{% endblock %}
 

diff --git a/templates/radio_table/settings.html.twig → ...tes/legacy/radio_table/settings.html.twig b/templates/radio_table/settings.html.twig → ...tes/legacy/radio_table/settings.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'radio_table.settings.title'|trans }}{% endblock %}
 

diff --git a/templates/radio_table/show.html.twig → templates/legacy/radio_table/show.html.twig b/templates/radio_table/show.html.twig → templates/legacy/radio_table/show.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% set appearance = radio_table.appearance %}
 

diff --git a/templates/radio_table/standalone.html.twig → ...s/legacy/radio_table/standalone.html.twig b/templates/radio_table/standalone.html.twig → ...s/legacy/radio_table/standalone.html.twig
diff --git a/...es/radio_table/table/radio_table.csv.twig → ...cy/radio_table/table/radio_table.csv.twig b/...es/radio_table/table/radio_table.csv.twig → ...cy/radio_table/table/radio_table.csv.twig
diff --git a/...s/radio_table/table/radio_table.html.twig → ...y/radio_table/table/radio_table.html.twig b/...s/radio_table/table/radio_table.html.twig → ...y/radio_table/table/radio_table.html.twig
diff --git a/templates/radio_table/table/radio_table.twig → ...legacy/radio_table/table/radio_table.twig b/templates/radio_table/table/radio_table.twig → ...legacy/radio_table/table/radio_table.twig
diff --git a/templates/security/login.html.twig → templates/legacy/security/login.html.twig b/templates/security/login.html.twig → templates/legacy/security/login.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'session.login.title'|trans }}{% endblock %}
 

diff --git a/templates/user/_register_theme.html.twig → ...tes/legacy/user/_register_theme.html.twig b/templates/user/_register_theme.html.twig → ...tes/legacy/user/_register_theme.html.twig
@@ -1,4 +1,4 @@
-{# This ugly copy-paste from `form_label` in 'form_div_layout.html.twig' #}
+{# This ugly copy-paste from `form_label` in 'form_div_legacy_layout.html.twig' #}
 {# is needed to be able to use HTML code in `label_translation_parameters`. #}
 {% block _user_register_acceptServiceTerms_label %}
     {% set label_attr = label_attr|merge({'for': id}) %}

diff --git a/templates/user/my_account_settings.html.twig → ...legacy/user/my_account_settings.html.twig b/templates/user/my_account_settings.html.twig → ...legacy/user/my_account_settings.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'user.settings.title_long'|trans }}{% endblock %}
 

diff --git a/templates/user/my_radio_tables.html.twig → ...tes/legacy/user/my_radio_tables.html.twig b/templates/user/my_radio_tables.html.twig → ...tes/legacy/user/my_radio_tables.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'user.my_radio_tables.title'|trans }}{% endblock %}
 
@@ -25,4 +25,3 @@
         </p>
     {% endif %}
 {% endblock %}
-
diff --git a/templates/user/public_profile.html.twig → ...ates/legacy/user/public_profile.html.twig b/templates/user/public_profile.html.twig → ...ates/legacy/user/public_profile.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ user.name }}{% endblock %}
 

diff --git a/templates/user/register.html.twig → templates/legacy/user/register.html.twig b/templates/user/register.html.twig → templates/legacy/user/register.html.twig
@@ -1,6 +1,6 @@
 {% form_theme form 'user/_register_theme.html.twig' %}
 
-{% extends 'layout.html.twig' %}
+{% extends 'legacy_layout.html.twig' %}
 
 {% block page_title %}{{ 'user.register.title'|trans }}{% endblock %}