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

Release 2.21.0 (#5014)

Browse Source
This commit is contained in:
Kevin Papst
2024-08-28 17:16:37 +02:00
committed by GitHub
parent 75fa7a20b8
commit b1903ba183
54 changed files with 284 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/contract/status.html.twig
View File

@@ -93,7 +93,7 @@
{% endif %}
{% if year is defined %}
{% embed '@theme/embeds/collapsible.html.twig' with {id: 'working_time_detail_box', border: false, item: {options: {bodyExtraClass: 'border-top', open: not box_configuration.collapsed}, bodyClasses: 'p-0 table-responsive'}} %}
{% embed '@theme/embeds/collapsible.html.twig' with {id: 'working_time_detail_box', border: false, item: {options: {bodyExtraClass: 'border-top', open: true}, bodyClasses: 'p-0 table-responsive'}} %}
{% set yearShould = 0 %}
{% set yearIs = 0 %}
{% set approved = 0 %}

6
templates/permission/permissions.html.twig
View File

@@ -34,7 +34,7 @@
{{ role.getName()|trans }}
{% if canEditPermissions and (role.name not in system_roles) %}
 
<a href="{{ path('admin_user_role_delete', {'id': role.id, 'csrfToken': token}) }}" class="confirmation-link" data-question="confirm.delete">{{ icon('trash') }}</a>
<a href="{{ path('admin_user_role_delete', {'role': role.id, 'csrfToken': token}) }}" class="confirmation-link" data-question="confirm.delete">{{ icon('trash') }}</a>
{% endif %}
</h4>
<div class="list-unstyled d-flex mb-0">
@@ -82,10 +82,10 @@
{% if value %}
{{ widgets.label('yes'|trans, 'warning') }}
{% else %}
<a class="togglePerm permOff" href="#" data-href="{{ path('admin_user_permission_save', {'id': role.id, 'name': permission, 'value': '1', 'csrfToken': '__TOKEN__'}) }}">{{ widgets.label('no'|trans, 'danger') }}</a>
<a class="togglePerm permOff" href="#" data-href="{{ path('admin_user_permission_save', {'role': role.id, 'name': permission, 'value': '1', 'csrfToken': '__TOKEN__'}) }}">{{ widgets.label('no'|trans, 'danger') }}</a>
{% endif %}
{% else %}
<a class="togglePerm {{ value ? 'permOn' : 'permOff' }}" href="#" data-href="{{ path('admin_user_permission_save', {'id': role.id, 'name': permission, 'value': '__VALUE__', 'csrfToken': '__TOKEN__'}) }}">{{ widgets.label_boolean(value) }}</a>
<a class="togglePerm {{ value ? 'permOn' : 'permOff' }}" href="#" data-href="{{ path('admin_user_permission_save', {'role': role.id, 'name': permission, 'value': '__VALUE__', 'csrfToken': '__TOKEN__'}) }}">{{ widgets.label_boolean(value) }}</a>
{% endif %}
</td>
{% endfor %}

2
templates/reporting/customer/monthly_projects.html.twig
View File

@@ -2,7 +2,7 @@
{% block report_form_layout %}
{{ form_widget(form.date) }}
{{ form_widget(form.customer, {'label': false, 'placeholder': 'please_choose'}) }}
{{ form_widget(form.customer, {'label': false, 'placeholder': 'customer'}) }}
{{ form_widget(form.sumType) }}
{% from '@theme/components/buttons.html.twig' import submit_button %}
{{ submit_button('download', {'attr': {'formaction': path(export_route)}, 'icon': 'download', 'combined': false}, 'primary') }}

2
templates/reporting/project_daterange.html.twig
View File

@@ -46,7 +46,7 @@
{% block report_form_layout %}
{{ form_widget(form.month, {'label': false}) }}
{{ form_widget(form.customer, {'label': false, 'placeholder': 'please_choose'}) }}
{{ form_widget(form.customer, {'label': false, 'placeholder': 'customer'}) }}
<div class="dropdown">
<button type="button" class="btn dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ icon('filter', true) }}

2
templates/reporting/project_details.html.twig
View File

@@ -55,7 +55,7 @@
{% endblock %}
{% block report_form_layout %}
{{ form_widget(form.project, {'label': false, 'placeholder': 'please_choose'}) }}
{{ form_widget(form.project, {'label': false, 'placeholder': 'project'}) }}
{% endblock %}
{% block report %}

2
templates/reporting/project_view.html.twig
View File

@@ -1,7 +1,7 @@
{% extends 'reporting/project_list_data.html.twig' %}
{% block report_form_layout %}
{{ form_widget(form.customer, {'label': false, 'placeholder': 'please_choose'}) }}
{{ form_widget(form.customer, {'label': false, 'placeholder': 'customer'}) }}
<div class="dropdown">
<button type="button" class="btn dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ icon('filter', true) }}

4
templates/reporting/report_user_list_layout.html.twig
View File

@@ -3,10 +3,10 @@
{% block report_form_layout %}
{{ form_widget(form.date) }}
{% if form.team is defined %}
{{ form_widget(form.team, {'label': false, 'placeholder': 'please_choose'}) }}
{{ form_widget(form.team, {'label': false, 'placeholder': 'team'}) }}
{% endif %}
{% if form.project is defined %}
{{ form_widget(form.project, {'label': false, 'placeholder': 'please_choose'}) }}
{{ form_widget(form.project, {'label': false, 'placeholder': 'project'}) }}
{% endif %}
{{ form_widget(form.sumType) }}
{% from '@theme/components/buttons.html.twig' import submit_button %}