From 1f48247474ef53e6213ae543cd115bfa176dae89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Fri, 8 May 2020 12:43:04 +0200 Subject: [PATCH] Added possibility to load profiles from label generator dialog. --- src/Controller/LabelController.php | 1 + templates/LabelSystem/dialog.html.twig | 57 ++++++++++++++++++++++++-- translations/messages.en.xlf | 36 ++++++++++++++++ 3 files changed, 91 insertions(+), 3 deletions(-) diff --git a/src/Controller/LabelController.php b/src/Controller/LabelController.php index 638b382d..29a564f5 100644 --- a/src/Controller/LabelController.php +++ b/src/Controller/LabelController.php @@ -140,6 +140,7 @@ class LabelController extends AbstractController 'form' => $form->createView(), 'pdf_data' => $pdf_data, 'filename' => $filename, + 'profile' => $profile, ]); } diff --git a/templates/LabelSystem/dialog.html.twig b/templates/LabelSystem/dialog.html.twig index a8dcedb5..e02bc099 100644 --- a/templates/LabelSystem/dialog.html.twig +++ b/templates/LabelSystem/dialog.html.twig @@ -1,16 +1,27 @@ {% extends 'main_card.html.twig' %} -{% block card_title %} {% trans %}label_generator.title{% endtrans %}{% endblock %} +{% block title %}{% trans %}label_generator.title{% endtrans %}{% endblock %} + +{%- block card_title -%} + {% trans %}label_generator.title{% endtrans %} + {% if profile %}({{ profile.name }}){% endif %} +{%- endblock -%} {% block card_content %} {{ form_start(form) }} @@ -41,8 +52,48 @@ {{ form_row(form.options.additional_css) }} {{ form_widget(form.options) }} + +
+
+ +
+ {{ profile.name ?? '-' }} + {% if profile %} + + {% endif %} + +
+
+ +
+
+ +
+
+
+ {{ form_end(form) }} {% if pdf_data %}
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf index 23197157..a2f117de 100644 --- a/translations/messages.en.xlf +++ b/translations/messages.en.xlf @@ -8436,5 +8436,41 @@ Element 3 Code 128 (recommended) + + + label_generator.common + Common + + + + + label_generator.profiles + Profiles + + + + + label_generator.advanced + Advanced + + + + + label_generator.selected_profile + Currently selected profile + + + + + label_generator.edit_profile + Edit profile + + + + + label_generator.load_profile + Load profile + +