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

Release 2.25 (#5109)

Browse Source
This commit is contained in:
Kevin Papst
2024-11-21 22:44:49 +01:00
committed by GitHub
parent 49eb7068c9
commit 0c26a2678e
261 changed files with 6431 additions and 7426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/activity/edit.html.twig
View File

@@ -3,7 +3,7 @@
{% block main %}
{% set formEditTemplate = kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
{% set formOptions = {
'title': (activity.id is null ? 'create-activity'|trans({}, 'actions') : 'edit'|trans({}, 'actions')),
'title': (activity.id is null ? 'create-activity'|trans : 'edit'|trans),
'form': form,
'back': path('admin_activity')
} %}

2
templates/activity/permissions.html.twig
View File

@@ -2,7 +2,7 @@
{% block main %}
{{ include(kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
'title': ('permissions'|trans({}, 'actions')) ~ ': ' ~ activity.name,
'title': ('permissions'|trans) ~ ': ' ~ activity.name,
'form': form,
'back': path('activity_details', {'id': activity.id})
}) }}

2
templates/customer/edit.html.twig
View File

@@ -3,7 +3,7 @@
{% block main %}
{% set formEditTemplate = kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
{% set formOptions = {
'title': (customer.id is null ? 'create'|trans : 'edit'|trans({}, 'actions')),
'title': (customer.id is null ? 'create'|trans : 'edit'|trans),
'form': form,
'back': path('admin_customer')
} %}

2
templates/customer/permissions.html.twig
View File

@@ -2,7 +2,7 @@
{% block main %}
{{ include(kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
'title': ('permissions'|trans({}, 'actions')) ~ ': ' ~ customer.name,
'title': ('permissions'|trans) ~ ': ' ~ customer.name,
'form': form,
'back': path('customer_details', {'id': customer.id})
}) }}

4
templates/dashboard/grid.html.twig
View File

@@ -49,9 +49,9 @@
<h3 class="card-title">{{ widget.title|trans({}, widget.translationDomain) }}</h3>
<div class="card-actions">
{% if widget.hasForm() %}
{{ card_tool_button('configuration', {'title': 'settings', 'translation_domain': 'actions', 'class': 'modal-ajax-form', 'url': path('tasks_create')}) }}
{{ card_tool_button('configuration', {'title': 'settings', 'class': 'modal-ajax-form', 'url': path('tasks_create')}) }}
{% endif %}
{{ card_tool_button('delete', {'title': 'widget_remove', 'translation_domain': 'actions', 'url': '#', 'onclick': "removeWidget(this, '" ~ widget.id ~ "'); return false;"}) }}
{{ card_tool_button('delete', {'title': 'widget_remove', 'url': '#', 'onclick': "removeWidget(this, '" ~ widget.id ~ "'); return false;"}) }}
</div>
</div>
<div class="card-body p-0">

2
templates/default/_form.html.twig
View File

@@ -25,7 +25,7 @@
<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">{{ 'back'|trans({}, 'actions') }}</a>
<a href="{{ _back }}" class="btn btn-link">{{ 'back'|trans }}</a>
{% endif %}
{% if _reset is not same as (false) %}
<input type="reset" value="{{ 'action.reset'|trans }}" class="btn btn-link pull-right" />

2
templates/default/_form_delete.html.twig
View File

@@ -24,7 +24,7 @@
{% block box_footer %}
<input type="submit" value="{{ 'delete'|trans }}" class="btn btn-danger" />
{% if back %}
<a href="{{ back }}" class="btn btn-link">{{ 'back'|trans({}, 'actions') }}</a>
<a href="{{ back }}" class="btn btn-link">{{ 'back'|trans }}</a>
{% endif %}
{% endblock %}
{% block box_after %}

2
templates/embeds/teams.html.twig
View File

@@ -19,7 +19,7 @@
{% endblock %}
{% block box_attributes %}id="team_listing_box"{% endblock %}
{% block box_title %}
{{ 'permissions'|trans({}, 'actions') }}
{{ 'permissions'|trans }}
{% if teams|length > 0 %}<small class="text-body-secondary d-none d-sm-inline ms-1">{{ 'team.visibility_restricted'|trans({}, 'teams') }}</small>{% endif %}
{% endblock %}
{% block box_body_class %}{% if teams|length > 0 %}p-0{% endif %}{% endblock %}

2
templates/export/renderer/default.html.twig
View File

@@ -286,7 +286,7 @@
<form class="w-100 d-print-none row row-cards p-3">
<div class="card mb-1 p-0">
<div class="card-header">
{{ 'settings'|trans({}, 'actions') }}
{{ 'settings'|trans }}
</div>
<div class="card-body">
<label for="duration-decimal">

2
templates/invoice/document_upload.html.twig
View File

@@ -27,7 +27,7 @@
{% endblock %}
{% block box_footer %}
<button type="submit" class="btn btn-primary">{{ 'action.save'|trans }}</button>
<a href="{{ path('admin_invoice_template') }}" class="btn btn-link">{{ 'back'|trans({}, 'actions') }}</a>
<a href="{{ path('admin_invoice_template') }}" class="btn btn-link">{{ 'back'|trans }}</a>
{% endblock %}
{% endembed %}
{% elseif upload_error is not null %}

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

@@ -224,7 +224,7 @@
{% else %}
{% if headerOptions.batchUpdate is defined %}
<input type="checkbox" id="multi_update_all" class="multiupdater form-check-input m-0 align-middle" title="{{ 'batch_table_checkbox_all'|trans }}">
<input type="checkbox" id="multi_update_all_{{ tableName }}" class="multi_update_all multiupdater form-check-input m-0 align-middle" title="{{ 'batch_table_checkbox_all'|trans }}">
{% endif %}
{{ headerTitle }}
{% if headerOptions.html_after is defined %}
@@ -250,7 +250,7 @@
{% 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}}) }}
{{ form_start(multi_update_form, {'attr': {'class': 'multi_update_form', 'style': 'display:none', 'data-question': 'update_multiple'|trans}}) }}
{% for formChild in multi_update_form.children %}
{{ form_widget(formChild) }}
{% endfor %}

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

@@ -63,7 +63,7 @@
{% if values.children is defined and values.children|length > 0 %}
<div class="dropdown">
<button type="button" class="btn {{ btnClasses }} dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{{ icon(icon, true) }}{% if large %} {{ values.title is defined ? values.title|trans : icon|trans({}, 'actions') }}{% endif %}
{{ icon(icon, true) }}{% if large %} {{ values.title is defined ? values.title|trans : icon|trans }}{% endif %}
</button>
<div class="dropdown-menu">
{%- for icon, values in values.children %}

2
templates/project/edit.html.twig
View File

@@ -3,7 +3,7 @@
{% block main %}
{% set formEditTemplate = kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
{% set formOptions = {
'title': (project.id is null ? 'create-project'|trans({}, 'actions') : 'edit'|trans({}, 'actions')),
'title': (project.id is null ? 'create-project'|trans : 'edit'|trans),
'form': form,
'back': path('admin_project')
} %}

2
templates/project/permissions.html.twig
View File

@@ -2,7 +2,7 @@
{% block main %}
{{ include(kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig', {
'title': ('permissions'|trans({}, 'actions')) ~ ': ' ~ project.name,
'title': ('permissions'|trans) ~ ': ' ~ project.name,
'form': form,
'back': path('project_details', {'id': project.id})
}) }}

2
templates/tags/edit.html.twig
View File

@@ -4,7 +4,7 @@
{% block main %}
{% set formEditTemplate = kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
{% set formOptions = {
'title': (tag.id is null ? 'create'|trans : 'edit'|trans({}, 'actions')),
'title': (tag.id is null ? 'create'|trans : 'edit'|trans),
'form': form,
'back': path('tags')
} %}

6
templates/timesheet/index.html.twig
View File

@@ -91,9 +91,9 @@
{% block datatable_column %}
<td class="{{ tables.class(dataTable, column) }}{% if column == 'description' %} timesheet-description{% endif %}">
{% if column == 'id' %}
{% if is_granted('edit', entry) or is_granted('delete', entry) %}
{{ tables.datatable_multiupdate_row(entry.id) }}
{% endif %}
{% if is_granted('edit', entry) or is_granted('delete', entry) %}
{{ tables.datatable_multiupdate_row(entry.id) }}
{% endif %}
{% elseif column == 'date' %}
{{ entry.begin|date_short }}
{% elseif column == 'starttime' %}

2
templates/user/access-token.html.twig
View File

@@ -4,7 +4,7 @@
{% block main %}
{% set formEditTemplate = kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
{% set formOptions = {
'title': (access_token.id is null ? 'create'|trans : 'edit'|trans({}, 'actions')),
'title': (access_token.id is null ? 'create'|trans : 'edit'|trans),
'form': form,
'back': path('user_profile_access_token', {'username': user.userIdentifier})
} %}