glpi-project · cedric-anne · Sep 30, 2024 · Sep 24, 2024 · Sep 24, 2024 · Sep 30, 2024
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -86,6 +86,7 @@ The present file will list all changes made to the project; according to the
 - `status.php` and `bin/console system:status` no longer supports plain-text output.
 - `Glpi\System\Status\StatusChecker::getServiceStatus()` `as_array` parameter.
 - `Sylk` export of search results.
+- `full_width_adapt_column` option for fields macros has been removed.
 
 ### API changes
 

diff --git a/css/includes/_base.scss b/css/includes/_base.scss
@@ -429,6 +429,16 @@ body pre {
     color: var(--tblr-body-color);
 }
 
+.col-12.glpi-full-width {
+    .col-form-label {
+        width: calc(-4px + 20.8333%);
+    }
+
+    .field-container {
+        width: calc(-11px + 79.1666%);
+    }
+}
+
 // Needed as 'text-muted' may not always be readable depending on the menu
 // background color.
 .horizontal-layout  {

diff --git a/templates/components/form/fields_macros.html.twig b/templates/components/form/fields_macros.html.twig
@@ -811,7 +811,6 @@
 {% macro horizontalField(label, field, id, add_field_html = '', options = {}) %}
    {% set options = {
       'full_width': false,
-      'full_width_adapt_column': true,
       'align_label_right': true,
       'mb': 'mb-2',
       'field_class': 'col-12 col-sm-6',
@@ -832,15 +831,8 @@
 
    {% if options.full_width %}
       {% set options = options|merge({
-         field_class: 'col-12',
+         field_class: 'col-12 glpi-full-width',
       }) %}
-
-      {% if options.full_width_adapt_column %}
-         {% set options = {
-            label_class: 'col-xxl-4',
-            input_class: 'col-xxl-8',
-         }|merge(options) %}
-      {% endif %}
    {% endif %}
 
    {% set options = {

diff --git a/templates/components/itilobject/itilsatisfaction.html.twig b/templates/components/itilobject/itilsatisfaction.html.twig
@@ -94,7 +94,6 @@
                 __('Satisfaction with the resolution of the %s')|format(parent_item.getTypeName(1)),
                 {
                     'full_width': true,
-                    'full_width_adapt_column': false,
                     'label_class': 'col-xxl-4',
                     'input_class': 'col-xxl-8 text-start',
                 }

diff --git a/templates/components/itilobject/selfservice.html.twig b/templates/components/itilobject/selfservice.html.twig
@@ -37,7 +37,6 @@
 {% set base_field_options = {
     'is_horizontal': false,
     'full_width': true,
-    'full_width_adapt_column': false,
     'fields_template': itiltemplate,
     'rand': rand,
 } %}

diff --git a/templates/components/notepad/form.html.twig b/templates/components/notepad/form.html.twig
@@ -35,7 +35,6 @@
 
 {% set fields_options = {
     full_width: true,
-    full_width_adapt_column: false,
     is_horizontal: false,
 } %}
 

diff --git a/templates/components/search/query_builder/criteria.html.twig b/templates/components/search/query_builder/criteria.html.twig
@@ -76,7 +76,6 @@
                {{ fields.dropdownArrayField("criteria" ~ prefix ~ "[" ~ num ~ "][link]", value, operators, '', {
                   full_width: true,
                   input_class: 'col-12',
-                  full_width_adapt_column: false,
                   no_label: true,
                   mb: 'mb-0',
                }) }}
@@ -90,7 +89,6 @@
                rand: rand,
                full_width: true,
                input_class: 'col-12',
-               full_width_adapt_column: false,
                no_label: true,
                mb: 'mb-0',
             }) }}

diff --git a/templates/components/search/query_builder/criteria_group.html.twig b/templates/components/search/query_builder/criteria_group.html.twig
@@ -45,7 +45,6 @@
          {{ fields.dropdownArrayField("criteria" ~ prefix ~ "[" ~ num ~ "][link]", criteria["link"] ?? '', call('\\Glpi\\Search\\SearchEngine::getLogicalOperators'), '', {
             full_width: true,
             input_class: 'col-12',
-            full_width_adapt_column: false,
             mb: 'mb-0',
             no_label: true,
          }) }}

diff --git a/templates/components/search/query_builder/metacriteria.html.twig b/templates/components/search/query_builder/metacriteria.html.twig
@@ -47,7 +47,6 @@
          {{ fields.dropdownArrayField(dropdown_name, dropdown_value, call('Glpi\\Search\\SearchEngine::getLogicalOperators'), '', {
             full_width: true,
             input_class: 'col-12',
-            full_width_adapt_column: false,
             no_label: true,
             mb: 'mb-0',
          }) }}
@@ -61,7 +60,6 @@
             rand: rand,
             full_width: true,
             input_class: 'col-12',
-            full_width_adapt_column: false,
             no_label: true,
             mb: 'mb-0',
          }) }}

diff --git a/templates/components/search/query_builder/search_option.html.twig b/templates/components/search/query_builder/search_option.html.twig
@@ -41,7 +41,6 @@
          rand: rand,
          full_width: true,
          input_class: 'col-12',
-         full_width_adapt_column: false,
          no_label: true,
          mb: 'mb-0',
       }) }}

diff --git a/templates/components/search/query_builder/sort/criteria.html.twig b/templates/components/search/query_builder/sort/criteria.html.twig
@@ -38,7 +38,6 @@
     rand: rand,
     full_width: true,
     input_class: 'col-12',
-    full_width_adapt_column: false,
     no_label: true,
     mb: 'mb-0',
 } %}

diff --git a/templates/dropdown_form.html.twig b/templates/dropdown_form.html.twig
@@ -85,7 +85,6 @@
                             field['label'],
                             {
                                 full_width: true,
-                                full_width_adapt_column: false,
                                 is_horizontal: false,
                                 enable_richtext: field['enable_richtext'] is defined ? field['enable_richtext'] : true,
                             }

diff --git a/templates/pages/assets/cable.html.twig b/templates/pages/assets/cable.html.twig
@@ -56,7 +56,6 @@
          {% set rand_side = random() %}
          {% set side_options = field_options|merge({
             'full_width': true,
-            'full_width_adapt_column': false,
             'rand': rand_side,
          }) %}
          {% set html_side %}

diff --git a/templates/pages/setup/notification/translation.html.twig b/templates/pages/setup/notification/translation.html.twig
@@ -40,10 +40,7 @@
    {% set template_link %}
       <a href="{{ 'NotificationTemplate'|itemtype_form_path ~ '?id=' ~ template.fields['id'] }}">{{ template.fields['name'] }}</a>
    {% endset %}
-   {{ fields.htmlField('', template_link, 'NotificationTemplate'|itemtype_name(1), {
-      full_width_adapt_column: false,
-      label_class: 'col-xxl-4'
-   }) }}
+   {{ fields.htmlField('', template_link, 'NotificationTemplate'|itemtype_name(1)) }}
 
    {% do call('Ajax::createIframeModalWindow', ['tags' ~ rand, path('/front/notification.tags.php?sub_type=') ~ template.fields['itemtype']]) %}
    {% set show_tags %}
@@ -60,16 +57,12 @@
       emptylabel: __('Default translation'),
       display: false
    }]), __('Language'), {
-      full_width_adapt_column: false,
-      label_class: 'col-xxl-4'
+      full_width: true,
    }) }}
 
    {{ fields.nullField() }}
    {{ fields.textField('subject', item.fields['subject'], __('Subject'), {
       full_width: true,
-      full_width_adapt_column: false,
-      label_class: 'col-xxl-2',
-      input_class: 'col-xxl-10'
    }) }}
 
    {% set text_content_label %}
@@ -79,17 +72,11 @@
    {% endset %}
    {{ fields.textareaField('content_text', item.fields['content_text'], text_content_label, {
       full_width: true,
-      full_width_adapt_column: false,
-      label_class: 'col-xxl-2',
-      input_class: 'col-xxl-10',
       rows: 15
    }) }}
 
    {{ fields.textareaField('content_html', item.fields['content_html']|safe_html, __('Email HTML body'), {
       full_width: true,
-      full_width_adapt_column: false,
-      label_class: 'col-xxl-2',
-      input_class: 'col-xxl-10',
       rows: 15,
       enable_richtext: true,
       id: 'content' ~ rand

diff --git a/templates/pages/tools/reminder.html.twig b/templates/pages/tools/reminder.html.twig
@@ -49,7 +49,6 @@
 
     {{ fields.textField('name', item.fields['name'], __('Title'), field_options|merge({
         full_width: true,
-        full_width_adapt_column: false
     })) }}
 
     {% if params['from_planning_ajax'] is not defined %}
@@ -69,7 +68,6 @@
         {% endset %}
         {{ fields.htmlField('', visibility_fields, __('Visibility'), field_options|merge({
             full_width: true,
-            full_width_adapt_column: false,
             wrapper_class: 'd-flex',
         })) }}
     {% endif %}
@@ -83,7 +81,6 @@
     {% endset %}
     {{ fields.htmlField('', state_dropdown, __('Status'), field_options|merge({
         full_width: true,
-        full_width_adapt_column: false,
     })) }}
 
     {% set calendar_field %}
@@ -146,12 +143,10 @@
     {% endset %}
     {{ fields.htmlField('', calendar_field, _n('Calendar', 'Calendars', 1), field_options|merge({
         full_width: true,
-        full_width_adapt_column: false,
     })) }}
 
     {{ fields.textareaField('text', item.fields['text']|safe_html, __('Description'), field_options|merge({
         full_width: true,
-        full_width_adapt_column: false,
         enable_richtext: true,
         enable_fileupload: true,
     })) }}