refactor: improving collection

siganushka · Nov 14, 2024 · f35aa79 · f35aa79
1 parent 03bd5ca
commit f35aa79
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/templates/form_theme_bootstrap_5.html.twig → templates/bootstrap_5_layout.html.twig b/templates/form_theme_bootstrap_5.html.twig → templates/bootstrap_5_layout.html.twig
@@ -5,12 +5,13 @@
   {{- parent() -}}
 {%- endblock collection_widget -%}
 
-{%- block collection_add_button_widget -%}
+{%- block collection_add_button_row -%}
   {% set attr = attr|merge({class: (attr.class|default('btn-outline-primary') ~ ' text-nowrap w-100')|trim}) %}
   {{- parent() -}}
-{%- endblock collection_add_button_widget -%}
+{%- endblock collection_add_button_row -%}
 
-{%- block collection_delete_button_widget -%}
+{%- block collection_delete_button_row -%}
+  {% set row_attr = row_attr|merge({style: row_attr.style|default('width: 1px')}) %}
   {% set attr = attr|merge({class: (attr.class|default('btn-outline-danger') ~ ' text-nowrap')|trim}) %}
   {{- parent() -}}
-{%- endblock collection_delete_button_widget -%}
+{%- endblock collection_delete_button_row -%}
diff --git a/templates/form_theme.html.twig b/templates/form_theme.html.twig
@@ -19,7 +19,8 @@
 {%- block collection_entry_row -%}
   <tr{% with {attr: row_attr} %}{{ block('attributes') }}{% endwith %} style="vertical-align: top">
     {% for entry in compound ? form : [form] %}
-      <td class="{{ entry.vars.attr['data-collection-class']|default('col-auto') }}">
+      {% set collectionClass = entry.vars.attr['data-collection-class']|default('') %}
+      <td{% if collectionClass %} class="{{ collectionClass }}"{% endif %}>
         {{- form_widget(entry, {attr: {placeholder: entry.vars.label}}) -}}
         {{- form_errors(entry) -}}
         {{- form_help(entry) -}}

diff --git a/translations/messages.en.php b/translations/messages.en.php
@@ -21,7 +21,7 @@
     'generic.import' => 'Import',
     'generic.export' => 'Export',
     'generic.action' => 'Action',
-    'generic.choice' => 'Please Choose!',
+    'generic.choice' => 'Please Choose',
     'generic.choice_all' => 'All',
     'generic.yes' => 'Yes',
     'generic.no' => 'No',