Release 2.38.0 (#5563)

templates/export/index.html.twig

@@ -19,6 +19,8 @@
 {% set columns = {
     'avatar': {'class': 'text-nowrap w-avatar d-none d-md-table-cell', 'title': false, 'orderBy': false},
     'date': {'class': 'alwaysVisible text-nowrap', 'orderBy': false},
+    'begin': {'class': 'd-none', 'orderBy': false},
+    'end': {'class': 'd-none', 'orderBy': false},
     'user': {'class': 'd-none', 'orderBy': false},
     'project': {'class': 'd-none d-sm-table-cell', 'orderBy': false},
     'activity': {'class': 'd-none', 'orderBy': false},
@@ -234,6 +236,16 @@
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'date') }}">
                         {{ entry.begin|date_short }}
                     </td>
+                    <td class="{{ tables.data_table_column_class(tableName, columns, 'begin') }}">
+                        {{ entry.begin|time }}
+                    </td>
+                    <td class="{{ tables.data_table_column_class(tableName, columns, 'begin') }}">
+                        {% if entry.end %}
+                            {{ entry.end|time }}
+                        {% else %}
+                            &dash;
+                        {% endif %}
+                    </td>
                     <td class="{{ tables.data_table_column_class(tableName, columns, 'user') }}">
                         {{ widgets.label_user(entry.user) }}
                     </td>

templates/form/blocks.html.twig

@@ -154,7 +154,7 @@
     {%- set attr = attr|merge({'pattern': time_format|pattern, 'autocomplete': 'off', 'data-timepicker': 'on', 'data-format': js_format, 'placeholder': time_format}) -%}
     <div class="input-group">
         <div class="input-group-text">
-            <a href="#" data-form-widget="date-now" data-format="{{ js_format }}" data-target="{{ id }}">{{ icon('calendar') }}</a>
+            <a href="#" data-form-widget="date-now" data-format="{{ js_format }}" data-target="{{ id }}">{{ icon('clock') }}</a>
         </div>
         {{ block('form_widget_simple') }}
         {% set time_presets = form_time_presets(app.user.timezone) %}

templates/permission/permissions.html.twig

@@ -59,7 +59,6 @@
     {% endfor %}
     </div>
 
-
     {% set tableName = 'user_admin_permissions' %}
 
     {{ tables.datatable_header(tableName, columns, null, {'reload': 'kimai.userRoleUpdate'}) }}