jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Release 2.0.34 (#4281)

Browse Source
This commit is contained in:
Kevin Papst
2023-09-17 22:32:01 +02:00
committed by GitHub
parent a6b237936e
commit de419350b2
29 changed files with 383 additions and 482 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
templates/calendar/user.html.twig
View File

@@ -10,7 +10,10 @@
{% embed '@theme/embeds/card.html.twig' %}
{% block box_body %}
{{ form_start(form) }}
{{ form_widget(form) }}
{% if form.user is defined %}
{{ form_row(form.user) }}
{% endif %}
{{ form_rest(form) }}
{{ form_end(form) }}
{% endblock %}
{% endembed %}
@@ -132,7 +135,7 @@
{
id: 'kimaiUserTimeSource',
type: 'timesheet',
url: '{{ path('get_timesheets') }}?user={{ user.id }}&size=1000&full=true&begin={from}&end={to}',
url: '{{ path('get_timesheets', {'user': user.id, 'size': 1000, 'full': 'true', 'begin': '__FROM__', 'end': '__TO__'})|raw }}',
options: {
color: '{{ config('theme.calendar.background_color') }}',
},
@@ -157,7 +160,7 @@
{
id: '{{ source.id }}{{ loop.index }}',
type: '{{ source.typeName }}',
url: '{{ source.uri }}',
url: '{{ source.uri|raw }}',
options: {...{{ source.options|json_encode|raw }}, ...{
color: '{{ source.color }}',
textColor: '{{ source.color|font_contrast }}',

2
templates/macros/datatables.html.twig
View File

@@ -253,7 +253,7 @@
</table>
</div>
</div>
{% if (route is not empty and entries is not null) or multi_update_form is not null%}
{% if (route is not empty and entries is not null) or multi_update_form is not null %}
<div class="card-footer d-flex align-items-center">
{% if multi_update_form is not null %}
{{ form_start(multi_update_form, {'attr': {'id': 'multi_update_form', 'style': 'display:none', 'data-question': 'update_multiple'|trans}}) }}

2
templates/macros/widgets.html.twig
View File

@@ -246,7 +246,7 @@
{% macro alert(type, description, title, icon, dismissible) %}
{% from '@theme/components/alert.html.twig' import alert %}
{{ alert({type: type, description: description|trans, title: title|trans, icon: icon, dismissible: dismissible}) }}
{{ alert({type: type, description: description|trans, title: title|trans, icon: icon, dismissible: dismissible, important: true}) }}
{% endmacro %}
{% macro callout(type, description, title, icon) %}