Fix criteria filter button UI (#19743)

* fix criteria filter button UI

* more spacing

* force change search button style

* use parameter to indicate context

Author: cconard96

src/Glpi/Search/Input/QueryBuilder.php

@@ -85,6 +85,7 @@ public static function showGenericSearch($itemtype, array $params)
         $p['showmassiveactions']            = true;
         $p['extra_actions_templates']       = [];
         $p['hide_criteria']                 = $params['hide_criteria'] ?? false;
+        $p['is_criteria_filter']            = $params['is_criteria_filter'] ?? false;
 
         foreach ($params as $key => $val) {
             $p[$key] = $val;

templates/components/search/criteria_filter.html.twig

@@ -44,7 +44,7 @@
         <div id="manage_filter_ux" class="{{ filter_enabled ? "" : "d-none" }}">
 
             {# Display search UX #}
-            {% do call('Glpi\\Search\\Input\\QueryBuilder::showGenericSearch', [itemtype, params]) %}
+            {% do call('Glpi\\Search\\Input\\QueryBuilder::showGenericSearch', [itemtype, params + {is_criteria_filter: true}]) %}
 
             {# Display search results, hidden until a search is executed #}
             <div id="criteria_filter_preview" class="d-none">

templates/components/search/criteria_filter_actions.html.twig

@@ -30,9 +30,9 @@
  # ---------------------------------------------------------------------
  #}
 
-<div>
+<div class="ms-2">
     <button
-        class="btn btn-sm btn-primary me-1 {{ show_save ? "" : "d-none" }}"
+        class="btn btn-primary me-1 {{ show_save ? "" : "d-none" }}"
         type="submit"
         name="save_filters"
     >
@@ -42,7 +42,7 @@
     </button>
 
     <button
-        class="btn btn-sm btn-outline-danger me-1 {{ show_delete ? "" : "d-none" }}"
+        class="btn btn-outline-danger me-1 {{ show_delete ? "" : "d-none" }}"
         name="delete_filters"
     >
         <i class="ti ti-trash"></i>

templates/components/search/query_builder/main.html.twig

@@ -116,10 +116,11 @@
             <span class="d-none d-sm-block">{{ __('group') }}</span>
          </button>
          {% if mainform %}
-            <span class="ms-auto btn-group">
+            {% set action_count = showaction + p['showbookmark'] + p['showreset'] %}
+            <span class="ms-auto {{ action_count > 1 ? 'btn-group' : '' }}">
                 {% if (showaction) %}
                 {# Display submit button #}
-                <button class="btn btn-sm btn-primary" type="button" name="{{ p['actionname'] }}">
+                <button class="btn {{ p['is_criteria_filter'] ? 'btn-ghost-secondary' : 'btn-sm btn-primary' }}" type="button" name="{{ p['actionname'] }}">
                     <i class="ti ti-search"></i>
                     <span class="d-none d-sm-block">{{ p['actionvalue'] }}</span>
                 </button>