From dc863d4e9e291fa4c5f764155398f0eff0961821 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Fri, 30 Sep 2022 16:00:11 +0200 Subject: [PATCH 1/6] Add wizard "template" --- templates/wizard.html.twig | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 templates/wizard.html.twig diff --git a/templates/wizard.html.twig b/templates/wizard.html.twig new file mode 100644 index 0000000..a1607cd --- /dev/null +++ b/templates/wizard.html.twig @@ -0,0 +1,47 @@ +{% extends '@Tabler/fullpage.html.twig' %} + +{% block page_content %} + +
+ {% block wizzard_before %}{% endblock %} + + {% block wizzard_logo %} +
+

+ + {% if tabler_bundle.getLogoUrl() is not empty %} + Logo + {% else %} + + {% endif %} + +

+
+ {% endblock %} + + {% block wizzard_header_before %}{% endblock %} + {% block wizzard_header %}{% endblock %} + {% block wizzard_header_after %}{% endblock %} + +
+ {% block wizzard_content_before %}{% endblock %} + {% block wizzard_content %}{% endblock %} + {% block wizzard_content_after %}{% endblock %} +
+ + {% block wizzard_footer_before %}{% endblock %} + {% block wizzard_footer %}{% endblock %} + {% block wizzard_footer_after %}{% endblock %} + + {% block wizzard_after %}{% endblock %} +
+ +{% endblock %} + From 0297221a8631a2cc830a774cd1eb7a6fe16bf8d7 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Mon, 3 Oct 2022 08:48:11 +0200 Subject: [PATCH 2/6] WiZard with only ONE `z` --- templates/wizard.html.twig | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/templates/wizard.html.twig b/templates/wizard.html.twig index a1607cd..815e4a8 100644 --- a/templates/wizard.html.twig +++ b/templates/wizard.html.twig @@ -6,9 +6,9 @@ class="container {% block container_size %}container-narrow{% endblock %} {% block container_class %}py-4{% endblock %}" {% block container_attr %}{% endblock %} > - {% block wizzard_before %}{% endblock %} + {% block wizard_before %}{% endblock %} - {% block wizzard_logo %} + {% block wizard_logo %}

@@ -23,24 +23,24 @@

{% endblock %} - {% block wizzard_header_before %}{% endblock %} - {% block wizzard_header %}{% endblock %} - {% block wizzard_header_after %}{% endblock %} + {% block wizard_header_before %}{% endblock %} + {% block wizard_header %}{% endblock %} + {% block wizard_header_after %}{% endblock %}
- {% block wizzard_content_before %}{% endblock %} - {% block wizzard_content %}{% endblock %} - {% block wizzard_content_after %}{% endblock %} + {% block wizard_content_before %}{% endblock %} + {% block wizard_content %}{% endblock %} + {% block wizard_content_after %}{% endblock %}
- {% block wizzard_footer_before %}{% endblock %} - {% block wizzard_footer %}{% endblock %} - {% block wizzard_footer_after %}{% endblock %} + {% block wizard_footer_before %}{% endblock %} + {% block wizard_footer %}{% endblock %} + {% block wizard_footer_after %}{% endblock %} - {% block wizzard_after %}{% endblock %} + {% block wizard_after %}{% endblock %} {% endblock %} From d4b72c8df1a6c0f7f345f63a53b21e636fe0e2eb Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Mon, 3 Oct 2022 12:25:48 +0200 Subject: [PATCH 3/6] Join logo code into one embed --- templates/embeds/logo.html.twig | 14 ++++++++++++++ templates/layout-horizontal.html.twig | 12 +++--------- templates/layout-vertical.html.twig | 10 +--------- templates/wizard.html.twig | 11 +---------- 4 files changed, 19 insertions(+), 28 deletions(-) create mode 100644 templates/embeds/logo.html.twig diff --git a/templates/embeds/logo.html.twig b/templates/embeds/logo.html.twig new file mode 100644 index 0000000..2264d1c --- /dev/null +++ b/templates/embeds/logo.html.twig @@ -0,0 +1,14 @@ +

+ + {% if tabler_bundle.getLogoUrl() is not empty %} + + {% else %} + + {% endif %} + +

diff --git a/templates/layout-horizontal.html.twig b/templates/layout-horizontal.html.twig index 1adb3f0..3af872b 100644 --- a/templates/layout-horizontal.html.twig +++ b/templates/layout-horizontal.html.twig @@ -35,15 +35,9 @@ Enjoy your theme! {% block app_logo %} -

- - {% if tabler_bundle.getLogoUrl() is not empty %} - Logo - {% else %} - - {% endif %} - -

+ {% embed '@Tabler/embeds/logo.html.twig' %} + {% block navbar_brand_classes %}navbar-brand d-none-navbar-horizontal pe-0 pe-md-3 {% block navbar_brand_class %}navbar-brand-autodark{% endblock %}{% endblock %} + {% endembed %} {% endblock %}
{% block navbar_start %}{% endblock %} diff --git a/templates/layout-vertical.html.twig b/templates/layout-vertical.html.twig index beabf23..bfd2069 100644 --- a/templates/layout-vertical.html.twig +++ b/templates/layout-vertical.html.twig @@ -39,15 +39,7 @@ Enjoy your theme! {% block app_logo %} -

- - {% if tabler_bundle.getLogoUrl() is not empty %} - Logo - {% else %} - - {% endif %} - -

+ {% include '@Tabler/embeds/logo.html.twig' %} {% endblock %}
{{ _self.navbar(navbarStartContent, navbarNotificationsContent, navbarUserContent, navbarEndContent) }} diff --git a/templates/wizard.html.twig b/templates/wizard.html.twig index 815e4a8..d171f15 100644 --- a/templates/wizard.html.twig +++ b/templates/wizard.html.twig @@ -10,16 +10,7 @@ {% block wizard_logo %}
-

- - {% if tabler_bundle.getLogoUrl() is not empty %} - Logo - {% else %} - - {% endif %} - -

+ {% include '@Tabler/embeds/logo.html.twig' %}
{% endblock %} From 6efbed821d5a3e8deb6690d14ed443628f4a521a Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Tue, 4 Oct 2022 09:37:56 +0200 Subject: [PATCH 4/6] Switch logo embed to include --- templates/embeds/logo.html.twig | 14 -------------- templates/includes/logo.html.twig | 12 ++++++++++++ templates/layout-horizontal.html.twig | 8 ++++---- templates/layout-vertical.html.twig | 4 +++- templates/wizard.html.twig | 4 +++- 5 files changed, 22 insertions(+), 20 deletions(-) delete mode 100644 templates/embeds/logo.html.twig create mode 100644 templates/includes/logo.html.twig diff --git a/templates/embeds/logo.html.twig b/templates/embeds/logo.html.twig deleted file mode 100644 index 2264d1c..0000000 --- a/templates/embeds/logo.html.twig +++ /dev/null @@ -1,14 +0,0 @@ -

- - {% if tabler_bundle.getLogoUrl() is not empty %} - - {% else %} - - {% endif %} - -

diff --git a/templates/includes/logo.html.twig b/templates/includes/logo.html.twig new file mode 100644 index 0000000..d9d600c --- /dev/null +++ b/templates/includes/logo.html.twig @@ -0,0 +1,12 @@ + + {% if tabler_bundle.getLogoUrl() is not empty %} + + {% else %} + + {% endif %} + diff --git a/templates/layout-horizontal.html.twig b/templates/layout-horizontal.html.twig index 3af872b..832af58 100644 --- a/templates/layout-horizontal.html.twig +++ b/templates/layout-horizontal.html.twig @@ -35,9 +35,9 @@ Enjoy your theme! {% block app_logo %} - {% embed '@Tabler/embeds/logo.html.twig' %} - {% block navbar_brand_classes %}navbar-brand d-none-navbar-horizontal pe-0 pe-md-3 {% block navbar_brand_class %}navbar-brand-autodark{% endblock %}{% endblock %} - {% endembed %} +

+ {% include '@Tabler/includes/logo.html.twig' %} +

{% endblock %}
{% block navbar_start %}{% endblock %} @@ -152,4 +152,4 @@ Enjoy your theme! {% endblock %} - \ No newline at end of file + diff --git a/templates/layout-vertical.html.twig b/templates/layout-vertical.html.twig index bfd2069..4a21558 100644 --- a/templates/layout-vertical.html.twig +++ b/templates/layout-vertical.html.twig @@ -39,7 +39,9 @@ Enjoy your theme! {% block app_logo %} - {% include '@Tabler/embeds/logo.html.twig' %} +

+ {% include '@Tabler/includes/logo.html.twig' %} +

{% endblock %}
{{ _self.navbar(navbarStartContent, navbarNotificationsContent, navbarUserContent, navbarEndContent) }} diff --git a/templates/wizard.html.twig b/templates/wizard.html.twig index d171f15..4118e9e 100644 --- a/templates/wizard.html.twig +++ b/templates/wizard.html.twig @@ -10,7 +10,9 @@ {% block wizard_logo %}
- {% include '@Tabler/embeds/logo.html.twig' %} +

+ {% include '@Tabler/includes/logo.html.twig' %} +

{% endblock %} From 893a2eec4dd768a8bee883a9b9213f932494a423 Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Tue, 4 Oct 2022 15:26:58 +0200 Subject: [PATCH 5/6] Add default wizard footer --- templates/wizard.html.twig | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/templates/wizard.html.twig b/templates/wizard.html.twig index 4118e9e..d5476aa 100644 --- a/templates/wizard.html.twig +++ b/templates/wizard.html.twig @@ -1,5 +1,9 @@ {% extends '@Tabler/fullpage.html.twig' %} +{% from '@Tabler/components/progress_bar.html.twig' import progress_bar %} +{% from '@Tabler/components/button.html.twig' import button %} +{% from '@Tabler/components/buttons.html.twig' import submit_button %} + {% block page_content %}
{% block wizard_footer_before %}{% endblock %} - {% block wizard_footer %}{% endblock %} + {% block wizard_footer %} +
+
+ {% block progress_bar %} + {{ progress_bar({current : 1, max : 3}) }} + {% endblock %} +
+
+
+ {% block back_button %} + {{ button(false, { title : 'Close'|trans({}, 'TablerBundle'), combined: true, url : '#' }, 'link') }} + {% endblock %} + + {% block next_button %} + {{ submit_button(false, { title : 'Show homepage'|trans({}, 'TablerBundle'), combined: true }, 'primary') }} + {% endblock %} +
+
+
+ {% endblock %} {% block wizard_footer_after %}{% endblock %} {% block wizard_after %}{% endblock %} From a04167784f9d4468e4bc151e08b827667343e47d Mon Sep 17 00:00:00 2001 From: Cavasin F Date: Mon, 10 Oct 2022 09:43:56 +0200 Subject: [PATCH 6/6] Add `prefix` wizard name + translations --- templates/wizard.html.twig | 12 ++++++------ translations/TablerBundle.en.xlf | 8 ++++++++ translations/TablerBundle.fr.xlf | 8 ++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/templates/wizard.html.twig b/templates/wizard.html.twig index d5476aa..7bf1a02 100644 --- a/templates/wizard.html.twig +++ b/templates/wizard.html.twig @@ -37,18 +37,18 @@ {% block wizard_footer %}
- {% block progress_bar %} - {{ progress_bar({current : 1, max : 3}) }} + {% block wizard_progress_bar %} + {{ progress_bar() }} {% endblock %}
- {% block back_button %} - {{ button(false, { title : 'Close'|trans({}, 'TablerBundle'), combined: true, url : '#' }, 'link') }} + {% block wizard_previous_button %} + {{ button(false, { title : 'Previous'|trans({}, 'TablerBundle'), combined: true, url : '#' }, 'link') }} {% endblock %} - {% block next_button %} - {{ submit_button(false, { title : 'Show homepage'|trans({}, 'TablerBundle'), combined: true }, 'primary') }} + {% block wizard_next_button %} + {{ submit_button(false, { title : 'Next'|trans({}, 'TablerBundle'), combined: true }, 'primary') }} {% endblock %}
diff --git a/translations/TablerBundle.en.xlf b/translations/TablerBundle.en.xlf index f2a213f..de2c1b5 100644 --- a/translations/TablerBundle.en.xlf +++ b/translations/TablerBundle.en.xlf @@ -138,6 +138,14 @@ http_error_403.suggestion Sorry, but you don't have sufficient permissions to see this page. Please talk to your administrator if you think this is an error. + + Previous + Previous + + + Next + Next + diff --git a/translations/TablerBundle.fr.xlf b/translations/TablerBundle.fr.xlf index 14050e9..03e56bf 100644 --- a/translations/TablerBundle.fr.xlf +++ b/translations/TablerBundle.fr.xlf @@ -130,6 +130,14 @@ http_error_403.suggestion Désolé, mais vous n'avez pas les autorisations suffisantes pour voir cette page. Si vous pensez qu'il s'agit d'une anomalie, veuillez contacter votre administrateur. + + Previous + Précédent + + + Next + Suivant +