save default search options (#2445)

* set default times for daterange objects
* allow to show order and order by fields
* move search to modal
* more options for page size
* save export visibility in cookie

templates/activity/index.html.twig

@@ -1,7 +1,7 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "macros/datatables.html.twig" as tables %}
-{% import "macros/toolbar.html.twig" as toolbar %}
+{% import "macros/search.html.twig" as search %}
 {% import "activity/actions.html.twig" as actions %}
 
 {% set columns = {
@@ -25,7 +25,7 @@
 {% set tableName = 'activity_admin' %}
 
 {% block page_title %}{{ 'admin_activity.title'|trans }}{% endblock %}
-{% block page_search %}{{ toolbar.dropDownSearch(toolbarForm) }}{% endblock %}
+{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.activities('index') }}{% endblock %}
 
 {% block main_before %}

templates/base.html.twig

@@ -11,6 +11,7 @@
         {% block modal_body %}{% endblock %}
         {% block modal_footer %}{% endblock %}
     {% endembed %}
+    {% block page_search %}{% endblock %}
 {% endblock %}
 
 {% block page_content_start %}
@@ -251,7 +252,6 @@
 {% endblock %}
 
 {% block breadcrumb %}
-    {% block page_search %}{% endblock %}
     {% block page_actions %}{% endblock %}
 {% endblock %}
 
@@ -280,7 +280,6 @@
                     locale: '{{ app.request.locale }}',
                     first_dow_iso: {{ iso_day_by_name(app.user.firstDayOfWeek) }},
                     twentyFourHours: {{ 'true'|hour24('false') }},
-                    autoReloadDatatable: {% if theme_config('auto_reload_datatable') %}true{% else %}false{% endif %},
                     autoComplete: {{ theme_config('autocomplete_chars') }},
                     defaultColor: '{{ constant('App\\Constants::DEFAULT_COLOR') }}',
                     updateBrowserTitle: {% if app.user.preferenceValue('theme.update_browser_title') %}true{% else %}false{% endif %}

templates/customer/index.html.twig

@@ -1,7 +1,7 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "macros/datatables.html.twig" as tables %}
-{% import "macros/toolbar.html.twig" as toolbar %}
+{% import "macros/search.html.twig" as search %}
 {% import "customer/actions.html.twig" as actions %}
 
 {% set columns = {
@@ -9,7 +9,7 @@
     'comment': {'class': 'hidden-xs hidden-sm', 'title': 'label.description'|trans},
     'number': {'class': 'hidden-xs hidden-sm hidden'},
     'company': {'class': 'hidden-xs hidden-sm hidden'},
-    'vat_id': {'class': 'hidden-xs hidden-sm hidden', 'orderBy': 'vatId'},
+    'vat_id': {'class': 'hidden-xs hidden-sm hidden'},
     'contact': {'class': 'hidden-xs hidden-sm hidden'},
     'address': {'class': 'hidden-xs hidden-sm hidden'},
     'country': {'class': 'hidden-xs hidden-sm hidden'},
@@ -26,8 +26,8 @@
     }) %}
 {% endfor %}
 {% set columns = columns|merge({
-    'budget': {'class': 'hidden-xs hidden-sm hidden text-center w-min', 'title': 'label.budget'|trans},
-    'timeBudget': {'class': 'hidden-xs hidden-sm hidden text-center w-min', 'title': 'label.timeBudget'|trans},
+    'budget': {'class': 'hidden-xs hidden-sm hidden text-center w-min'},
+    'timeBudget': {'class': 'hidden-xs hidden-sm hidden text-center w-min'},
     'team': {'class': 'text-center w-min', 'orderBy': false},
     'visible': {'class': 'text-center hidden w-min'},
     'actions': {'class': 'actions alwaysVisible'},
@@ -36,7 +36,7 @@
 {% set tableName = 'customer_admin' %}
 
 {% block page_title %}{{ 'admin_customer.title'|trans }}{% endblock %}
-{% block page_search %}{{ toolbar.dropDownSearch(toolbarForm) }}{% endblock %}
+{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.customers('index') }}{% endblock %}
 
 {% block main_before %}

templates/export/layout.html.twig

@@ -7,6 +7,9 @@
     {{ encore_entry_link_tags('app') }}
     {{ encore_entry_script_tags('app') }}
     {% block styles %}{% endblock %}
+    {% if block('document_title') is defined %}
+        <title>{{ block('document_title') }}</title>
+    {% endif %}
 </head>
 <body class="pad export_print">
 <div class="wrapper">

templates/export/renderer/default.html.twig

@@ -2,6 +2,8 @@
 {% import "macros/datatables.html.twig" as tables %}
 {% extends 'export/layout.html.twig' %}
 
+{% block document_title %}{{ 'export.title'|trans }}{% endblock %}
+
 {% set showRateBudget = false %}
 {% set showTimeBudget = false %}
 {% for budget in budgets %}
@@ -57,12 +59,51 @@
 
 {% block javascripts %}
     <script type="text/javascript">
+        let initialized = false;
+
+        window.addEventListener('load', function() {
+            let config = KimaiCookies.get('kimai_html_export');
+            if (config !== undefined && config !== null) {
+                console.log(config);
+                for (const key in config) {
+                    let elName = key;
+                    let checked = config[key];
+                    let el = document.getElementById(elName);
+                    if (el === undefined || el === null) {
+                        el = document.getElementById('records-column-' + elName);
+                        if (el === undefined || el === null) {
+                            continue;
+                        }
+                    }
+                    if (checked !== el.checked) {
+                        el.click();
+                    }
+                }
+            }
+            initialized = true;
+        });
+
+        function saveVisibility()
+        {
+            if (!initialized) {
+                return;
+            }
+
+            const form = document.getElementsByTagName('form')[0];
+            let settings = {};
+            for (let checkbox of form.querySelectorAll('input[type=checkbox]')) {
+                settings[checkbox.getAttribute('name')] = checkbox.checked;
+            }
+            KimaiCookies.set('kimai_html_export', settings, {expires: 365, SameSite: 'Strict'});
+        }
         document.getElementById('summary-by-activities').addEventListener('click', function(event) {
             document.getElementById('summary-project').style.display = event.target.checked ? 'none' : 'table';
             document.getElementById('summary-activity').style.display = event.target.checked ? 'table' : 'none';
+            saveVisibility();
         });
         document.getElementById('summary-show').addEventListener('click', function(event) {
             document.getElementById('export-summary').style.display = event.target.checked ? 'block' : 'none';
+            saveVisibility();
         });
         {% if showTimeBudget %}
         document.getElementById('summary-timeBudget').addEventListener('click', function(event) {
@@ -70,6 +111,7 @@
             for (var columnCell of cells) {
                 columnCell.style.display = event.target.checked ? 'table-cell' : 'none';
             }
+            saveVisibility();
         });
         {% endif %}
         {% if showRateBudget %}
@@ -78,6 +120,7 @@
             for (var columnCell of cells) {
                 columnCell.style.display = event.target.checked ? 'table-cell' : 'none';
             }
+            saveVisibility();
         });
         {% endif %}
         document.getElementById('summary-duration').addEventListener('click', function(event) {
@@ -85,24 +128,29 @@
             for (var columnCell of cells) {
                 columnCell.style.display = event.target.checked ? 'table-cell' : 'none';
             }
+            saveVisibility();
         });
         document.getElementById('summary-rate').addEventListener('click', function(event) {
             var cells = document.getElementsByClassName('summary-rate');
             for (var columnCell of cells) {
                 columnCell.style.display = event.target.checked ? 'table-cell' : 'none';
             }
+            saveVisibility();
         });
         document.getElementById('summary-rate-internal').addEventListener('click', function(event) {
             var cells = document.getElementsByClassName('summary-rate-internal');
             for (var columnCell of cells) {
                 columnCell.style.display = event.target.checked ? 'table-cell' : 'none';
             }
+            saveVisibility();
         });
         document.getElementById('summary-show').addEventListener('click', function(event) {
             document.getElementById('export-summary').style.display = event.target.checked ? 'block' : 'none';
+            saveVisibility();
         });
         document.getElementById('records-show').addEventListener('click', function(event) {
             document.getElementById('export-records').style.display = event.target.checked ? 'block' : 'none';
+            saveVisibility();
         });
         var columnCheckboxes = document.getElementsByClassName('column-visibility-changer');
         for (var checkbox of columnCheckboxes) {
@@ -111,6 +159,7 @@
                 for (var columnCell of cells) {
                     columnCell.style.display = event.target.checked ? 'table-cell' : 'none';
                 }
+                saveVisibility();
             });
         }
     </script>
@@ -118,8 +167,6 @@
 
 {% block styles %}
     <style>
-        .items tr.summary {
-        }
         .items td.totals {
             font-weight: bold;
             text-align: right;
@@ -141,77 +188,81 @@
 {% block export %}
     <div class="row no-print toolbar">
         <div class="col-xs-12">
-            <form class="navbar-form">
-                <div class="form-group">
-                    {{ 'export.summary'|trans }}:
-                </div>
-                <div class="form-group">
-                    <label class="control-label" for="summary-show">
-                        <input type="checkbox" id="summary-show" name="summary-show" checked="checked">
-                        {{ 'label.visible'|trans }}
-                    </label>
-                </div>
-                <div class="form-group">
-                    <label class="control-label" for="summary-by-activities">
-                        <input type="checkbox" id="summary-by-activities" name="summary-by-activities">
-                        {{ 'label.activity'|trans }}
-                    </label>
-                </div>
-                {% if showTimeBudget %}
-                <div class="form-group">
-                    <label class="control-label" for="summary-timeBudget">
-                        <input type="checkbox" id="summary-timeBudget" name="summary-timeBudget" checked>
-                        {{ 'label.timeBudget'|trans }}
-                    </label>
-                </div>
-                {% endif %}
-                {% if showRateBudget %}
-                <div class="form-group">
-                    <label class="control-label" for="summary-budget">
-                        <input type="checkbox" id="summary-budget" name="summary-budget" checked>
-                        {{ 'label.budget'|trans }}
-                    </label>
-                </div>
-                {% endif %}
-
-                <div class="form-group">
-                    <label class="control-label" for="summary-duration">
-                        <input type="checkbox" id="summary-duration" name="summary-duration" checked>
-                        {{ 'label.duration'|trans }}
-                    </label>
-                </div>
-                <div class="form-group">
-                    <label class="control-label" for="summary-rate-internal">
-                        <input type="checkbox" id="summary-rate-internal" name="summary-rate-internal" checked>
-                        {{ 'label.rate_internal'|trans }}
-                    </label>
-                </div>
-                <div class="form-group">
-                    <label class="control-label" for="summary-rate">
-                        <input type="checkbox" id="summary-rate" name="summary-rate" checked>
-                        {{ 'label.rate'|trans }}
-                    </label>
-                </div>
-            </form>
-
-            <form class="navbar-form">
-                <div class="form-group">
-                    {{ 'export.full_list'|trans }}:
-                </div>
-                <div class="form-group">
-                    <label class="control-label" for="records-show">
-                        <input type="checkbox" id="records-show" name="records-show" checked="checked">
-                        {{ 'label.visible'|trans }}
-                    </label>
-                </div>
-                {% for columnId, visibility in columns %}
-                    <div class="form-group">
-                        <label class="control-label" for="records-column-{{ columnId }}">
-                            <input type="checkbox" class="column-visibility-changer" id="records-column-{{ columnId }}" name="{{ columnId }}" {% if visibility %}checked="checked"{% endif %}>
-                            {{ columnTitles[columnId]|default('label.'~columnId)|trans }}
-                        </label>
+            <form class="form-inline">
+                <div class="row">
+                    <div class="col-xs-1">
+                        <div class="form-group">
+                            <label class="control-label" for="summary-show">
+                                <input type="checkbox" id="summary-show" name="summary-show" checked="checked">
+                                {{ 'export.summary'|trans }}
+                            </label>
+                        </div>
                     </div>
-                {% endfor %}
+                    <div class="col-xs-11">
+                        <div class="form-group">
+                            <label class="control-label" for="summary-by-activities">
+                                <input type="checkbox" id="summary-by-activities" name="summary-by-activities">
+                                {{ 'label.activity'|trans }}
+                            </label>
+                        </div>
+                        {% if showTimeBudget %}
+                        <div class="form-group">
+                            <label class="control-label" for="summary-timeBudget">
+                                <input type="checkbox" id="summary-timeBudget" name="summary-timeBudget" checked>
+                                {{ 'label.timeBudget'|trans }}
+                            </label>
+                        </div>
+                        {% endif %}
+                        {% if showRateBudget %}
+                        <div class="form-group">
+                            <label class="control-label" for="summary-budget">
+                                <input type="checkbox" id="summary-budget" name="summary-budget" checked>
+                                {{ 'label.budget'|trans }}
+                            </label>
+                        </div>
+                        {% endif %}
+
+                        <div class="form-group">
+                            <label class="control-label" for="summary-duration">
+                                <input type="checkbox" id="summary-duration" name="summary-duration" checked>
+                                {{ 'label.duration'|trans }}
+                            </label>
+                        </div>
+                        <div class="form-group">
+                            <label class="control-label" for="summary-rate-internal">
+                                <input type="checkbox" id="summary-rate-internal" name="summary-rate-internal" checked>
+                                {{ 'label.rate_internal'|trans }}
+                            </label>
+                        </div>
+                        <div class="form-group">
+                            <label class="control-label" for="summary-rate">
+                                <input type="checkbox" id="summary-rate" name="summary-rate" checked>
+                                {{ 'label.rate'|trans }}
+                            </label>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="row">
+                    <div class="col-xs-1">
+                        <div class="form-group">
+                            <label class="control-label" for="records-show">
+                                <input type="checkbox" id="records-show" name="records-show" checked="checked">
+                                {{ 'export.full_list'|trans }}
+                            </label>
+                        </div>
+                    </div>
+                    <div class="col-xs-11">
+                        {% for columnId, visibility in columns %}
+                            <div class="form-group">
+                                <label class="control-label" for="records-column-{{ columnId }}">
+                                    <input type="checkbox" class="column-visibility-changer" id="records-column-{{ columnId }}" name="{{ columnId }}" {% if visibility %}checked="checked"{% endif %}>
+                                    {{ columnTitles[columnId]|default('label.'~columnId)|trans }}
+                                </label>
+                            </div>
+                        {% endfor %}
+                    </div>
+                </div>
             </form>
         </div>
     </div>

templates/macros/search.html.twig

@@ -0,0 +1,54 @@
+{% macro searchModal(form) %}
+    {% form_theme form 'form/search-form.html.twig' %}
+    <div class="modal fade" id="modal_search" tabindex="-1" role="dialog" aria-labelledby="modal_search_label">
+        <div class="modal-dialog" role="document">
+            {{ form_start(form, {'attr': {'class': 'form-narrow searchform'}}) }}
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'action.close'|trans }}"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title" id="modal_search_label">
+                        {{ 'search'|trans }}
+                    </h4>
+                </div>
+                <div class="modal-body">
+                    {% set orderBy = form_widget(form.orderBy) %}
+                    {% set order = form_widget(form.order) %}
+                    {{ form(form) }}
+                    <div class="form-group">
+                        {{ form_label(form.orderBy) }}
+                        <div class="col-sm-5 col-xs-5">
+                            {{ orderBy|raw }}
+                        </div>
+                        <div class="col-sm-4 col-xs-3">
+                            {{ order|raw }}
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <div class="btn-toolbar pull-left" role="toolbar">
+                        <div class="btn-group">
+                            <button type="submit" name="performSearch" value="performSearch" class="btn btn-primary pull-left" data-type="submit">{{ 'search'|trans }}</button>
+                        </div>
+                        <div class="btn-group">
+                            {% if form.vars.data.bookmark %}
+                                <button type="submit" id="setDefaultQuery" name="setDefaultQuery" class="btn btn-default" title="{{ 'label.set_as_default'|trans }}"><i class="{{ 'bookmarked'|icon }}"></i></button>
+                                <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                    <span class="caret"></span>
+                                </button>
+                                <ul class="dropdown-menu">
+                                    <li>
+                                        <a href="?removeDefaultQuery={{ form.vars.data.bookmark.name }}" id="removeDefaultQuery">{{ 'action.delete'|trans }}</a>
+                                    </li>
+                                </ul>
+                            {% else %}
+                                <button type="submit" id="setDefaultQuery" name="setDefaultQuery" class="btn btn-default" title="{{ 'label.set_as_default'|trans }}"><i class="{{ 'bookmark'|icon }}"></i></button>
+                            {% endif %}
+                        </div>
+                    </div>
+                    <button type="button" class="btn btn-default btn-cancel" data-dismiss="modal">{{ 'action.close'|trans }}</button>
+                </div>
+            </div>
+            {{ form_end(form) }}
+        </div>
+    </div>
+{% endmacro %}

templates/macros/toolbar.html.twig

@@ -1,5 +1,5 @@
 {% macro toolbar(form, collapsible, displayInitial) %}
-    {% deprecated 'The macro "toolbar" is deprecated since 1.2 and will be removed with 2.0, use dropDownSearch() instead' %}
+    {% deprecated 'The macro "toolbar" is deprecated since 1.2 and will be removed with 2.0, use search.searchModal() instead' %}
     <div class="toolbar no-print">
         {% if collapsible %}<div class="collapse{% if displayInitial %} collapse.show in{% endif %}" id="{{ collapsible }}">{% endif %}
             {{ form_start(form, { 'attr': {'class': 'navbar-form'}}) }}
@@ -10,45 +10,27 @@
 {% endmacro %}
 
 {% macro dropDownSearch(form) %}
-    {% form_theme form 'form/search-form.html.twig' %}
-    {{ form_start(form, { 'attr': {'class': 'form-horizontal header-search hidden-xs'}}) }}
-    {% set searchTermClass = 'dropdown-toggle input-sm' %}
-    {% if not form.searchTerm.vars.valid %}
-        {% set searchTermClass = searchTermClass ~ ' search-has-error' %}
-    {% endif %}
-    {% if not form.vars.valid %}
-        {% set searchTermClass = searchTermClass ~ ' has-error' %}
-    {% endif %}
-    <div class="dropdown">
-        <div class="form-group">
-            <div class="input-group">
-                <div class="input-group-addon {% if not form.vars.valid %} has-error{% endif %}">
-                    <i class="{{ 'search'|icon }}"></i>
+    {% deprecated 'The macro "dropDownSearch" is deprecated since 1.4 and will be removed with 2.0, use search.searchModal() instead' %}
+    <div class="modal fade" id="modal_search" tabindex="-1" role="dialog" aria-labelledby="modal_search_label">
+        <div class="modal-dialog" role="document">
+            {% form_theme form 'form/search-form.html.twig' %}
+            {{ form_start(form, {'attr': {'class': 'form-narrow searchform'}}) }}
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="{{ 'action.close'|trans }}"><span aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title" id="modal_search_label">
+                        {{ 'search'|trans }}
+                    </h4>
+                </div>
+                <div class="modal-body">
+                    {{ form(form) }}
+                </div>
+                <div class="modal-footer">
+                    <button type="submit" class="btn btn-primary pull-left" data-type="submit">{{ 'search'|trans }}</button>
+                    <button type="button" class="btn btn-default btn-cancel" data-dismiss="modal">{{ 'action.close'|trans }}</button>
                 </div>
-                {{ form_widget(form.searchTerm, {'attr': {'placeholder': 'search'|trans, 'autocomplete': 'off', 'data-toggle': 'dropdown', 'class': searchTermClass, 'aria-haspopup': 'true', 'aria-expanded': 'true'}}) }}
-                <ul class="dropdown-menu pre-scrollable" role="menu" aria-labelledby="searchTerm">
-                    <li>
-                        <div class="container-fluid">
-                            {% if not form.searchTerm.vars.valid %}
-                                {{ form_errors(form.searchTerm) }}
-                                <br>
-                            {% endif %}
-                            {{ form_widget(form) }}
-                            <div class="form-group">
-                                <div class="col-sm-3 col-xs-4"></div>
-                                <div class="col-sm-9 col-xs-8">
-                                    {% if not theme_config('auto_reload_datatable') %}
-                                        {# FIXME this should trigger the datatable reload and not "really" submit the form #}
-                                    <input type="submit" value="{{ 'search'|trans }}" class="btn btn-primary" />
-                                    {% endif %}
-                                    <a href="#" class="search-cancel pull-right">{{ 'action.close'|trans }}</a>
-                                </div>
-                            </div>
-                        </div>
-                    </li>
-                </ul>
             </div>
+            {{ form_end(form) }}
         </div>
     </div>
-    {{ form_end(form) }}
 {% endmacro %}

templates/project/index.html.twig

@@ -1,7 +1,7 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "macros/datatables.html.twig" as tables %}
-{% import "macros/toolbar.html.twig" as toolbar %}
+{% import "macros/search.html.twig" as search %}
 {% import "project/actions.html.twig" as actions %}
 
 {% set columns = {
@@ -10,8 +10,8 @@
     'comment': {'class': 'hidden-xs hidden-sm', 'title': 'label.description'|trans},
     'orderNumber': {'class': 'hidden-xs hidden-sm hidden'},
     'orderDate': {'class': 'hidden-xs hidden-sm hidden'},
-    'start': {'class': 'hidden-xs hidden-sm hidden', 'title': 'label.project_start'|trans},
-    'end': {'class': 'hidden-xs hidden-sm hidden', 'title': 'label.project_end'|trans},
+    'project_start': {'class': 'hidden-xs hidden-sm hidden'},
+    'project_end': {'class': 'hidden-xs hidden-sm hidden'},
 } %}
 {% for field in metaColumns %}
     {% set columns = columns|merge({
@@ -29,7 +29,7 @@
 {% set tableName = 'project_admin' %}
 
 {% block page_title %}{{ 'admin_project.title'|trans }}{% endblock %}
-{% block page_search %}{{ toolbar.dropDownSearch(toolbarForm) }}{% endblock %}
+{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.projects('index') }}{% endblock %}
 
 {% block main_before %}
@@ -50,8 +50,8 @@
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'comment') }}">{{ entry.comment|comment2html }}</td>
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'orderNumber') }}">{{ entry.orderNumber }}</td>
                 <td class="{{ tables.data_table_column_class(tableName, columns, 'orderDate') }}">{% if entry.orderDate is not null %}{{ entry.orderDate|date_full }}{% endif %}</td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'start') }}">{% if entry.start is not null %}{{ entry.start|date_full }}{% endif %}</td>
-                <td class="{{ tables.data_table_column_class(tableName, columns, 'end') }}">{% if entry.end is not null %}{{ entry.end|date_full }}{% endif %}</td>
+                <td class="{{ tables.data_table_column_class(tableName, columns, 'project_start') }}">{% if entry.start is not null %}{{ entry.start|date_full }}{% endif %}</td>
+                <td class="{{ tables.data_table_column_class(tableName, columns, 'project_end') }}">{% if entry.end is not null %}{{ entry.end|date_full }}{% endif %}</td>
                 {% for field in metaColumns %}
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'mf_' ~ field.name) }}">
                         {{ tables.datatable_meta_column(entry, field) }}

templates/tags/index.html.twig

@@ -1,11 +1,11 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
-{% import "tags/actions.html.twig" as actions %}
 {% import "macros/datatables.html.twig" as tables %}
-{% import "macros/toolbar.html.twig" as toolbar %}
+{% import "macros/search.html.twig" as search %}
+{% import "tags/actions.html.twig" as actions %}
 
 {% block page_title %}{{ 'menu.tags'|trans }}{% endblock %}
-{% block page_search %}{{ toolbar.dropDownSearch(toolbarForm) }}{% endblock %}
+{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.tags('index') }}{% endblock %}
 
 {% block main %}

templates/team/index.html.twig

@@ -1,11 +1,11 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
-{% import "team/actions.html.twig" as actions %}
 {% import "macros/datatables.html.twig" as tables %}
-{% import "macros/toolbar.html.twig" as toolbar %}
+{% import "macros/search.html.twig" as search %}
+{% import "team/actions.html.twig" as actions %}
 
 {% block page_title %}{{ 'teams.title'|trans({}, 'teams') }}{% endblock %}
-{% block page_search %}{{ toolbar.dropDownSearch(toolbarForm) }}{% endblock %}
+{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.teams('index') }}{% endblock %}
 
 {% block main %}

templates/timesheet/layout-listing.html.twig

@@ -1,7 +1,7 @@
 {% extends 'base.html.twig' %}
 {% import "macros/widgets.html.twig" as widgets %}
 {% import "macros/datatables.html.twig" as tables %}
-{% import "macros/toolbar.html.twig" as toolbar %}
+{% import "macros/search.html.twig" as search %}
 
 {% if not showSummary is defined %}
     {% set showSummary = false %}
@@ -48,7 +48,7 @@
     'actions': {'class': 'actions alwaysVisible'},
 }) %}
 
-{% block page_search %}{{ toolbar.dropDownSearch(toolbarForm) }}{% endblock %}
+{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 
 {% block main_before %}
     {{ tables.data_table_column_modal(tableName, columns) }}

templates/user/index.html.twig

@@ -1,7 +1,7 @@
 {% extends 'base.html.twig' %}
-{% import "macros/datatables.html.twig" as tables %}
 {% import "macros/widgets.html.twig" as widgets %}
-{% import "macros/toolbar.html.twig" as toolbar %}
+{% import "macros/datatables.html.twig" as tables %}
+{% import "macros/search.html.twig" as search %}
 {% import "user/actions.html.twig" as actions %}
 
 {% set columns = {
@@ -26,7 +26,7 @@
 {% set tableName = 'user_admin' %}
 
 {% block page_title %}{{ 'admin_user.title'|trans }}{% endblock %}
-{% block page_search %}{{ toolbar.dropDownSearch(toolbarForm) }}{% endblock %}
+{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}
 {% block page_actions %}{{ actions.users('index') }}{% endblock %}
 {% block page_icon %}{{ 'user'|icon }}{% endblock %}