Release 2.37 (#5546)

templates/export/index.html.twig

@@ -147,7 +147,7 @@
                                                 {% if btnTitle == id %}
                                                     {% set btnTitle = title|trans %}
                                                 {% endif %}
-                                                {% if btnTitle == id%}
+                                                {% if btnTitle == id %}
                                                     {% set btnTitle = id|split('.')|first|replace({'-': ' ', '_': ' '})|split(' ')|map(t => t|capitalize)|join(' ') %}
                                                 {% endif %}
                                                 <a href="#" class="dropdown-item startExportBtn" data-type="{{ id }}">

templates/export/template.html.twig

@@ -14,11 +14,30 @@
                         {{ form_row(form.title) }}
                     </div>
                     <div class="col-md-3">
-                        {{ form_row(form.renderer) }}
+                        {{ form_row(form.renderer, {attr: {onchange: "changeExportTemplateType(this)"}}) }}
                     </div>
                 </div>
                 {{ form_row(form.language) }}
+                {{ form_row(form.separator, {row_attr: {class: 'mb-3 export-type csv'}}) }}
+                {{ form_row(form.columns) }}
                 {{ form_rest(form) }}
             {% endblock %}
+            {% block form_after %}
+                <script>
+                    function changeExportTemplateType(typeElement)
+                    {
+                        typeElement.form.querySelectorAll('.export-type').forEach(
+                            element => {
+                                if (element.classList.contains(typeElement.value)) {
+                                    element.classList.remove('d-none');
+                                } else {
+                                    element.classList.add('d-none');
+                                }
+                            }
+                        );
+                    }
+                    changeExportTemplateType(document.getElementById('{{ form.renderer.vars.id }}'));
+                </script>
+            {% endblock %}
         {% endembed %}
 {% endblock %}

templates/macros/widgets.html.twig

@@ -338,7 +338,7 @@
         {% endif %}
     {% elseif 'DurationType' in type %}
         {{ value|duration }}
-    {% elseif 'YesNoType' in type or 'CheckBoxType' in type %}
+    {% elseif 'YesNoType' in type or 'CheckboxType' in type %}
         {{ _self.label_boolean(value) }}
     {% elseif 'DatePickerType' in type %}
         {{ value|date_short }}

templates/quick-entry/index.html.twig

@@ -54,9 +54,9 @@
                             <td></td>
                         {% endfor %}
                         {% for id, week in days %}
-                            <td class="text-center" id="qe-totals-day-{{ loop.index0 }}"></td>
+                            <td class="text-center total" id="qe-totals-day-{{ loop.index0 }}"></td>
                         {% endfor %}
-                        <td class="text-center" id="qe-totals-week"></td>
+                        <td class="text-center total" id="qe-totals-week"></td>
                     </tr>
                 </tfoot>
             </table>
@@ -66,25 +66,15 @@
 
 {% block javascripts %}
     {{ parent() }}
-    <script type="text/javascript">
+    <script>
         document.addEventListener('kimai.initialized', function(event) {
             const kimai = event.detail.kimai;
             const DATES = kimai.getPlugin('date');
             /** @type {KimaiFormSelect} FORM_SELECT */
             const FORM_SELECT = kimai.getPlugin('form-select');
 
-            if (window.matchMedia("(max-width: 1000px)").matches) {
-                for (let dropdowns of document.querySelectorAll('tr.qe-entry-week-row .btn-duration-preset')) {
-                    dropdowns.style.display = 'none';
-                }
 
-                for (let tmp of document.querySelectorAll('tr.qe-entry-week-row .duration-widget .input-group')) {
-                    tmp.style.maxWidth = '50px';
-                    tmp.style.minWidth = '50px';
-                }
-                for (let input of document.querySelectorAll('tr.qe-entry-week-row input.duration-input')) {
-                    input.style.maxWidth = '50px';
-                }
+            if (window.matchMedia("(max-width: 1360px)").matches) {
                 document.querySelector('form[name=quick_entry_form] div.maybe-table-responsive').classList.replace('maybe-table-responsive', 'table-responsive');
             }
 
@@ -139,7 +129,6 @@
 
                 collectionHolder.appendChild(node);
 
-
                 [].slice.call(node.querySelectorAll('.selectpicker')).map((element) => {
                     FORM_SELECT.activateSelectPickerByElement(element);
                 });

templates/user/2fa.html.twig

@@ -24,7 +24,7 @@
     <div class="card-footer">
         {% if user.totpAuthenticationEnabled %}
             {{ form_start(deactivate, {'attr': {'id': 'user_two_factor_form'}}) }}
-                <input type="submit" value="{{ 'deactivate'|trans }}" class="btn btn-warning" id="user_two_factor_button" />
+                <input type="submit" value="{{ 'deactivate'|trans }}" class="btn btn-warning confirmation-link" id="user_two_factor_button" data-question="{{ 'deactivate'|trans }}?"  />
             {{ form_end(deactivate) }}
         {% else %}
             <input type="submit" value="{{ 'action.save'|trans }}" class="btn btn-primary" id="user_two_factor_button" />