diff --git a/src/Entity/LabelSystem/LabelOptions.php b/src/Entity/LabelSystem/LabelOptions.php index 10b3ab2b..c49896f8 100644 --- a/src/Entity/LabelSystem/LabelOptions.php +++ b/src/Entity/LabelSystem/LabelOptions.php @@ -195,6 +195,46 @@ class LabelOptions return $this; } + /** + * Gets additional CSS (it will simply be attached + * @return string + */ + public function getAdditionalCss(): string + { + return $this->additional_css; + } + + /** + * + * @param string $additional_css + * @return LabelOptions + */ + public function setAdditionalCss(string $additional_css): LabelOptions + { + $this->additional_css = $additional_css; + return $this; + } + + /** + * @return string + */ + public function getLinesMode(): string + { + return $this->lines_mode; + } + + /** + * @param string $lines_mode + * @return LabelOptions + */ + public function setLinesMode(string $lines_mode): LabelOptions + { + $this->lines_mode = $lines_mode; + return $this; + } + + + } \ No newline at end of file diff --git a/src/Form/LabelOptionsType.php b/src/Form/LabelOptionsType.php index 009f3e0a..7b34eed0 100644 --- a/src/Form/LabelOptionsType.php +++ b/src/Form/LabelOptionsType.php @@ -26,6 +26,7 @@ use FOS\CKEditorBundle\Form\Type\CKEditorType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\ChoiceType; use Symfony\Component\Form\Extension\Core\Type\NumberType; +use Symfony\Component\Form\Extension\Core\Type\TextareaType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolver; @@ -95,6 +96,15 @@ class LabelOptionsType extends AbstractType ], 'config_name' => 'label_config', ]); + + $builder->add('additional_css', TextareaType::class, [ + 'label' => 'label_options.additional_css.label', + 'empty_data' => '', + 'attr' => [ + 'rows' => 4, + ], + 'required' => false, + ]); } public function configureOptions(OptionsResolver $resolver) diff --git a/templates/AdminPages/LabelProfileAdmin.html.twig b/templates/AdminPages/LabelProfileAdmin.html.twig index 15177ee5..674f4f81 100644 --- a/templates/AdminPages/LabelProfileAdmin.html.twig +++ b/templates/AdminPages/LabelProfileAdmin.html.twig @@ -5,17 +5,41 @@ {% endblock %} {% block additional_pills %} -
  • {% trans %}admin.options{% endtrans %}
    • +
  • {% trans %}label_profile.advanced{% endtrans %}
    • +
  • {% trans %}label_profile.comment{% endtrans %}
    • {% endblock %} {% block additional_panes %} -
    +
    + {{ form_row(form.options.additional_css) }} {{ form_widget(form.options) }}
    + +
    + {{ form_widget(form.comment) }} +
    {% endblock %} +{% block comment %}{% endblock %} + {% block additional_controls %} {{ form_row(form.show_in_dropdown) }} + {{ form_row(form.options.supported_element) }} +
    + {{ form_label(form.options.width) }} +
    + {{ form_widget(form.options.width) }} +
    + x +
    + {{ form_widget(form.options.height) }} +
    + mm +
    +
    +
    + {{ form_row(form.options.barcode_type) }} + {{ form_row(form.options.lines) }} {% endblock %} {% block additional_content %} diff --git a/templates/Form/extendedBootstrap4_layout.html.twig b/templates/Form/extendedBootstrap4_layout.html.twig index 43a3b75d..08fda2a9 100644 --- a/templates/Form/extendedBootstrap4_layout.html.twig +++ b/templates/Form/extendedBootstrap4_layout.html.twig @@ -46,25 +46,6 @@ {{ form_errors(form.value) }} {% endblock %} -{% block label_options_widget %} - {{ form_row(form.supported_element) }} -
    - {{ form_label(form.width) }} -
    - {{ form_widget(form.width) }} -
    - x -
    - {{ form_widget(form.height) }} -
    - mm -
    -
    -
    - {{ form_row(form.barcode_type) }} - {{ form_row(form.lines) }} -{% endblock %} - {####################################################################################### # # Definitions for Tristate Checkbox Type (mostly based on bootstrap checkbox type) diff --git a/templates/LabelSystem/dialog.html.twig b/templates/LabelSystem/dialog.html.twig index efb62748..a093fc7d 100644 --- a/templates/LabelSystem/dialog.html.twig +++ b/templates/LabelSystem/dialog.html.twig @@ -4,8 +4,45 @@ {% block card_content %} {{ form_start(form) }} - {{ form_row(form.target_id) }} - {{ form_widget(form.options) }} + + + +
    + +
    + {{ form_row(form.target_id) }} + + {{ form_row(form.options.supported_element) }} +
    + {{ form_label(form.options.width) }} +
    + {{ form_widget(form.options.width) }} +
    + x +
    + {{ form_widget(form.options.height) }} +
    + mm +
    +
    +
    + {{ form_row(form.options.barcode_type) }} + {{ form_row(form.options.lines) }} +
    + +
    + {{ form_row(form.options.additional_css) }} + {{ form_widget(form.options) }} +
    +
    + {{ form_end(form) }} {% if pdf_data %}
    diff --git a/templates/LabelSystem/labels/base_label.html.twig b/templates/LabelSystem/labels/base_label.html.twig index d56ddff1..2e2f7e7e 100644 --- a/templates/LabelSystem/labels/base_label.html.twig +++ b/templates/LabelSystem/labels/base_label.html.twig @@ -8,6 +8,7 @@