If you see a warning icon in the list below, you should talk to your administrator. The path is either not readable or not writable and Kimai might not work as expected. @@ -51,16 +51,16 @@ {% endblock %} {% endembed %} - {% set extensionOpts = {collapsed: true, boxtype: 'success'} %} + {% set extensionOpts = {boxtype: 'success'} %} {% for name, value in extensions %} {% if value is same as (false) %} - {% set extensionOpts = {boxtype: 'danger'} %} + {% set extensionOpts = {boxtype: 'danger', open: true} %} {% endif %} {% endfor %} - {% embed '@theme/embeds/card.html.twig' with extensionOpts %} - {% block box_title %}PHP extensions{% endblock %} - {% block box_body %} + {% embed '@theme/embeds/collapsible.html.twig' with extensionOpts %} + {% block title %}PHP extensions{% endblock %} + {% block body %}
If you see a warning icon in the list below, you should talk to your administrator, as there is a missing PHP extension causing Kimai not to work as expected.
@@ -81,19 +81,14 @@ {% endblock %} {% endembed %} - {% set logOpts = {collapsed: true} %} + {% set logOpts = {} %} {% if logSize > 52428800 %} - {% set logOpts = {boxtype: 'danger'} %} + {% set logOpts = {boxtype: 'danger', open: true} %} {% endif %} - {% embed '@theme/embeds/card.html.twig' with logOpts %} - {% import "macros/widgets.html.twig" as widgets %} - {% block box_title %}Logfile (max. {{ logLines }} last lines){% endblock %} - {% block box_tools %} - {% if log_delete %} - {{ widgets.card_tool_button('delete', {'class': 'confirmation-link', 'title': 'delete', 'url': path('doctor_flush_log', {'token': csrf_token('doctor.flush_log')}), 'attr': {'data-question': 'confirm.delete'}}) }} - {% endif %} - {% endblock %} - {% block box_body %} + {% embed '@theme/embeds/collapsible.html.twig' with logOpts %} + {% from "@theme/components/button.html.twig" import button %} + {% block title %}Logfile (max. {{ logLines }} last lines){% endblock %} + {% block body %} {% if logSize > 52428800 %}Your logfile is larger than 50 MB, consider deleting it (it will be re-created automatically).
{% endif %} @@ -110,33 +105,32 @@ {%- endif -%} {{- logLine -}} {%- endfor %} - {% endblock %} - {% endembed %} - - {% embed '@theme/embeds/card.html.twig' with {collapsed: true} %} - {% import "macros/widgets.html.twig" as widgets %} - {% block box_title %}Composer{% endblock %} - {% block box_body_class %}{% if composer|length > 0 %}p-0{% endif %}{% endblock %} - {% block box_body %} - {% if composer|length == 0 %} - {{ widgets.alert('warning', 'Could not detect installed composer packages, please upgrade your Composer installation to version 2.x.') }} - {% else %} -| {{ name }} | -{{ value }} | -
|---|
| {{ name }} | +{{ value }} | +
|---|
| {{ 'version'|trans }} | diff --git a/templates/project/edit.html.twig b/templates/project/edit.html.twig index 6baf6621..8d5f49cd 100644 --- a/templates/project/edit.html.twig +++ b/templates/project/edit.html.twig @@ -73,11 +73,10 @@ {% if form.metaFields is defined and form.metaFields is not empty %} {{ form_row(form.metaFields) }} {% endif %} - {% embed '@theme/embeds/card.html.twig' with {collapsed: true} %} + {% embed '@theme/embeds/collapsible.html.twig' with {id: 'project_invoice_settings'} %} {% import "macros/widgets.html.twig" as widgets %} - {% block box_title %}{{ 'invoices'|trans }}{% endblock %} - {% block box_body_class %}{% endblock %} - {% block box_body %} + {% block title %}{{ 'invoices'|trans }}{% endblock %} + {% block body %} {% if form.invoiceText is defined %} {{ form_row(form.invoiceText) }} {% endif %} diff --git a/templates/timesheet/edit-default.html.twig b/templates/timesheet/edit-default.html.twig index ad8c36b0..c857b9b8 100644 --- a/templates/timesheet/edit-default.html.twig +++ b/templates/timesheet/edit-default.html.twig @@ -74,11 +74,10 @@ {{ form_row(form.metaFields) }} {% endif %} {% if form.fixedRate is defined or form.hourlyRate is defined or form.billable is defined or form.billableMode is defined or form.exported is defined %} - {% embed '@theme/embeds/card.html.twig' with {collapsed: true, id: 'timesheet_extended_settings'} %} + {% embed '@theme/embeds/collapsible.html.twig' with {id: 'timesheet_extended_settings'} %} {% import "macros/widgets.html.twig" as widgets %} - {% block box_title %}{{ 'extended_settings'|trans }}{% endblock %} - {% block box_body_class %}{% endblock %} - {% block box_body %} + {% block title %}{{ 'extended_settings'|trans }}{% endblock %} + {% block body %} {% if form.fixedRate is defined %} {{ form_row(form.fixedRate, {'row_attr': {'class': 'mb-3 ' ~ form.vars.name ~ '_row_' ~ form.fixedRate.vars.name}}) }} {% endif %} diff --git a/tests/Controller/DoctorControllerTest.php b/tests/Controller/DoctorControllerTest.php index 177ad263..20fa2f80 100644 --- a/tests/Controller/DoctorControllerTest.php +++ b/tests/Controller/DoctorControllerTest.php @@ -31,7 +31,7 @@ class DoctorControllerTest extends ControllerBaseTest $client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN); $this->assertAccessIsGranted($client, '/doctor'); - $result = $client->getCrawler()->filter('.content .card-header'); + $result = $client->getCrawler()->filter('.content .accordion-header'); $counter = \count($result); // this can contain a warning box, that a new release is available self::assertTrue($counter === 6 || $counter === 5);
|---|