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

allow to configure the amount of recent activity rows in an empty week (#3026)

Browse Source
This commit is contained in:
Kevin Papst
2021-12-16 16:58:10 +01:00
committed by GitHub
parent 3621b8c27c
commit 04fc954769
74 changed files with 270 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,7 @@
{% import "macros/widgets.html.twig" as widgets %}
{% import "macros/widgets.html.twig" as widgets %}
{% block page_title %}{{ 'calendar.title'|trans }}{% endblock %}
{% block page_title %}{{ 'calendar'|trans }}{% endblock %}
{% block page_actions %}
{% set event = actions(app.user, 'calendar', 'index') %}
{{ widgets.page_actions(event.actions) }}

4
templates/invoice/index.html.twig
View File

@@ -17,7 +17,7 @@
{% set tableName = 'invoice' %}
{% block page_title %}{{ 'invoice.title'|trans }}{% endblock %}
{% block page_title %}{{ 'invoices'|trans }}{% endblock %}
{% block page_actions %}{{ actions.invoices('index') }}{% endblock %}
{% block main_before %}
@@ -81,7 +81,7 @@
{% import "macros/widgets.html.twig" as widgets %}
{% import '@AdminLTE/Macros/buttons.html.twig' as button %}
{% block box_title %}
{{ 'button.preview'|trans }}: {{ 'invoice.title'|trans }}
{{ 'button.preview'|trans }}: {{ 'invoices'|trans }}
{% endblock %}
{% block box_body_class %}no-padding{% endblock %}
{% block box_footer %}

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

@@ -21,7 +21,7 @@
{% set tableName = 'invoices' %}
{% block page_title %}{{ 'invoice.title'|trans }}{% endblock %}
{% block page_title %}{{ 'invoices'|trans }}{% endblock %}
{% block page_actions %}{{ actions.invoice_listing('index', query) }}{% endblock %}
{% block page_search %}{{ search.searchModal(toolbarForm) }}{% endblock %}

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

@@ -1,6 +1,6 @@
{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
{% block page_title %}{{ 'invoice.title'|trans }}{% endblock %}
{% block page_title %}{{ 'invoices'|trans }}{% endblock %}
{% block main %}
{% set formEditTemplate = app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}

6
templates/system-configuration/index.html.twig
View File

@@ -1,7 +1,7 @@
{% extends app.request.xmlHttpRequest ? 'form.html.twig' : 'base.html.twig' %}
{% import "system-configuration/actions.html.twig" as actions %}
{% block page_title %}{{ 'title'|trans({}, 'system-configuration') }}{% endblock %}
{% block page_title %}{{ 'menu.system_configuration'|trans }}{% endblock %}
{% block page_actions %}{{ actions.system_configuration('index') }}{% endblock %}
{% block main %}
@@ -9,8 +9,8 @@
{% set formEditTemplate = app.request.xmlHttpRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}
{% for section in sections %}
{% set title = section.model.section|trans({}, 'system-configuration') %}
{% if title == section.model.section %}
{% set title = section.model.translation|trans({}, section.model.translationDomain) %}
{% if title == section.model.translation %}
{% set title = ('label.' ~ section.model.section)|trans %}
{% endif %}
{{ include(formEditTemplate, {