added search modal for timesheet export (#2728)

templates/base.html.twig

@@ -4,6 +4,8 @@
     data-title="{{- get_title()|e('html_attr') -}}"
 {% endblock %}
 
+{% block page_title %}{{- get_title() -}}{% endblock %}
+
 {% block after_body_start %}
     {% embed 'embeds/modal.html.twig' %}
         {% block modal_id %}remote_form_modal{% endblock %}

templates/default/_form.html.twig

@@ -5,7 +5,7 @@
 {% set _reset = reset is defined and reset is same as (false) ? false : true %}
 <div class="box box-primary">
     {% block form_before %}{% endblock %}
-    {{ form_start(form) }}
+    {{ form_start(form, formStartOptions|default({})) }}
     <div class="box-header with-border">
         <h3 class="box-title">
             {{ title }}
@@ -20,7 +20,9 @@
         {% endblock %}
     </div>
     <div class="box-footer">
-        <input type="submit" value="{{ 'action.save'|trans }}" class="btn btn-primary" />
+        {% block submit_button %}
+            <input type="submit" data-loading-text="{{ (submit_button|default('action.save'))|trans }}…" value="{{ (submit_button|default('action.save'))|trans }}" class="btn btn-primary" />
+        {% endblock %}
         {% if _back is not same as (false) %}
             <a href="{{ _back }}" class="btn btn-link">{{ 'action.back'|trans }}</a>
         {% endif %}

templates/default/_form_modal.html.twig

@@ -4,10 +4,10 @@ REQUIRED CHANGES NEED TO BE DONE IN THESE FILES:
  - default/_form_modal.html.twig 
  #}
 <div class="modal {% block modal_class %}{% endblock %}" id="{% block modal_id %}form_modal{% endblock %}" tabindex="-1" role="dialog" aria-labelledby="{{ block('modal_id') }}_label">
-    <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-dialog {% block modal_size %}modal-lg{% endblock %}" role="document">
         <div class="modal-content">
             {% block form_before %}{% endblock %}
-            {% block modal_before %}{{ form_start(form) }}{% endblock %}
+            {% block modal_before %}{{ form_start(form, formStartOptions|default({})) }}{% endblock %}
             <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="{{ block('modal_id') }}_label">
@@ -28,7 +28,9 @@ REQUIRED CHANGES NEED TO BE DONE IN THESE FILES:
             </div>
             <div class="modal-footer">
                 {% block modal_footer %}
-                    <button type="submit" class="btn btn-primary pull-left modal-form-save" data-loading-text="{{ 'action.save'|trans }}..." id="{{ block('modal_id') }}_save">{{ 'action.save'|trans }}</button>
+                    {% block submit_button %}
+                        <button type="submit" class="btn btn-primary pull-left modal-form-save" data-loading-text="{{ (submit_button|default('action.save'))|trans }}…" id="{{ block('modal_id') }}_save">{{ (submit_button|default('action.save'))|trans }}</button>
+                    {% endblock %}
                     <button type="button" class="btn btn-default btn-cancel" data-dismiss="modal">{{ 'action.close'|trans }}</button>
                 {% endblock %}
             </div>

templates/embeds/modal.html.twig

@@ -4,7 +4,7 @@ REQUIRED CHANGES NEED TO BE DONE IN THESE FILES:
  - default/_form_modal.html.twig 
  #}
 <div class="modal{% if block('modal_class') is defined %} {{ block('modal_class') }}{% endif %}" id="{{ block('modal_id') }}" tabindex="-1" role="dialog" aria-labelledby="{{ block('modal_id') }}_label">
-    <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-dialog {% block modal_size %}modal-lg{% endblock %}" role="document">
         <div class="modal-content">
             {% if block('modal_before') is defined %}{{ block('modal_before') }}{% endif %}
             <div class="modal-header">

templates/macros/widgets.html.twig

@@ -211,7 +211,7 @@
             <h4><i class="icon {{ icon|icon(icon) }}"></i> {{ title|trans }}</h4>
             {{ description|trans }}
         {% elseif icon %}
-            <h4><i class="icon {{ icon|icon(icon) }}"></i> {{ description|trans }}</h4>
+            <i class="icon {{ icon|icon(icon) }}"></i> {{ description|trans }}
         {% else %}
             {{ description|trans }}
         {% endif %}

templates/timesheet/layout-export.html.twig

@@ -0,0 +1,31 @@
+{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
+{% import "macros/widgets.html.twig" as widgets %}
+
+{% block page_title %}{{ 'menu.export'|trans }}{% endblock %}
+
+{% block main %}
+    {% if stats.count > 1000 %}
+        {{ widgets.alert('warning', ('export.warn_result_amount'|trans({'%count%': stats.count})), null, 'warning') }}
+    {% endif %}
+    {% set formEditTemplate = app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
+    {% set formOptions = {
+        'title': 'menu.export'|trans,
+        'form': form,
+        'back': path(route_back),
+        'formStartOptions': {'attr': {'class': 'form-narrow searchform', 'target': '_blank'}},
+    } %}
+    {% embed formEditTemplate with formOptions %}
+        {% form_theme form 'form/search-form.html.twig' %}
+        {% block modal_size %}{% endblock %}
+        {% block form_body %}
+            {{ form_widget(form) }}
+        {% endblock %}
+        {% block submit_button %}
+            <div class="btn-group pull-left" role="group">
+            {% for exp in exporter %}
+                <button id="export-btn-{{ exp.id }}" formtarget="_blank" type="submit" name="exporter" value="{{ exp.id }}" class="btn btn-primary" data-loading-text="{{ ('button.' ~ exp.id)|trans }}…">{{ ('button.' ~ exp.id)|trans }}</button>
+            {% endfor %}
+            </div>
+        {% endblock %}
+    {% endembed %}
+{% endblock %}