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

use collapsible element instead of collapsible card (#4096)

Browse Source
This commit is contained in:
Kevin Papst
2023-06-09 18:17:32 +02:00
committed by GitHub
parent 2e2bf986a4
commit 053a1d9017
6 changed files with 52 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,11 +59,10 @@
{% if form.metaFields is defined and form.metaFields is not empty %} {% if form.metaFields is defined and form.metaFields is not empty %}
{{ form_row(form.metaFields) }} {{ form_row(form.metaFields) }}
{% endif %} {% endif %}
{% embed '@theme/embeds/card.html.twig' with {collapsed: true} %} {% embed '@theme/embeds/collapsible.html.twig' with {id: 'activity_invoice_settings'} %}
{% import "macros/widgets.html.twig" as widgets %} {% import "macros/widgets.html.twig" as widgets %}
{% block box_title %}{{ 'invoices'|trans }}{% endblock %} {% block title %}{{ 'invoices'|trans }}{% endblock %}
{% block box_body_class %}{% endblock %} {% block body %}
{% block box_body %}
{% if form.invoiceText is defined %} {% if form.invoiceText is defined %}
{{ form_row(form.invoiceText) }} {{ form_row(form.invoiceText) }}
{% endif %} {% endif %}

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

@@ -98,11 +98,10 @@
{% if form.metaFields is defined and form.metaFields is not empty %} {% if form.metaFields is defined and form.metaFields is not empty %}
{{ form_row(form.metaFields) }} {{ form_row(form.metaFields) }}
{% endif %} {% endif %}
{% embed '@theme/embeds/card.html.twig' with {collapsed: true} %} {% embed '@theme/embeds/collapsible.html.twig' with {id: 'customer_invoice_settings'} %}
{% import "macros/widgets.html.twig" as widgets %} {% import "macros/widgets.html.twig" as widgets %}
{% block box_title %}{{ 'invoices'|trans }}{% endblock %} {% block title %}{{ 'invoices'|trans }}{% endblock %}
{% block box_body_class %}{% endblock %} {% block body %}
{% block box_body %}
{% if form.invoiceTemplate is defined %} {% if form.invoiceTemplate is defined %}
{{ form_row(form.invoiceTemplate) }} {{ form_row(form.invoiceTemplate) }}
{% endif %} {% endif %}

84
templates/doctor/index.html.twig
View File

@@ -20,16 +20,16 @@
{% endembed %} {% endembed %}
{% endif %} {% endif %}
{% set permissionOpts = {collapsed: true, boxtype: 'success'} %} {% set permissionOpts = {boxtype: 'success'} %}
{% for name, value in directories %} {% for name, value in directories %}
{% if value is same as (false) %} {% if value is same as (false) %}
{% set permissionOpts = {boxtype: 'danger'} %} {% set permissionOpts = {boxtype: 'danger', open: true} %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% embed '@theme/embeds/card.html.twig' with permissionOpts %} {% embed '@theme/embeds/collapsible.html.twig' with permissionOpts %}
{% block box_title %}File permissions{% endblock %} {% block title %}File permissions{% endblock %}
{% block box_body %} {% block body %}
<p> <p>
If you see a warning icon <i class="{{ 'warning'|icon(false) }} text-red"></i> in the list below, you should talk to your administrator. If you see a warning icon <i class="{{ 'warning'|icon(false) }} text-red"></i> 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. The path is either not readable or not writable and Kimai might not work as expected.
@@ -51,16 +51,16 @@
{% endblock %} {% endblock %}
{% endembed %} {% endembed %}
{% set extensionOpts = {collapsed: true, boxtype: 'success'} %} {% set extensionOpts = {boxtype: 'success'} %}
{% for name, value in extensions %} {% for name, value in extensions %}
{% if value is same as (false) %} {% if value is same as (false) %}
{% set extensionOpts = {boxtype: 'danger'} %} {% set extensionOpts = {boxtype: 'danger', open: true} %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% embed '@theme/embeds/card.html.twig' with extensionOpts %} {% embed '@theme/embeds/collapsible.html.twig' with extensionOpts %}
{% block box_title %}PHP extensions{% endblock %} {% block title %}PHP extensions{% endblock %}
{% block box_body %} {% block body %}
<p> <p>
If you see a warning icon <i class="{{ 'warning'|icon(false) }} text-red"></i> in the list below, you should talk to your administrator, as there is a missing PHP extension causing Kimai not to work as expected. If you see a warning icon <i class="{{ 'warning'|icon(false) }} text-red"></i> in the list below, you should talk to your administrator, as there is a missing PHP extension causing Kimai not to work as expected.
</p> </p>
@@ -81,19 +81,14 @@
{% endblock %} {% endblock %}
{% endembed %} {% endembed %}
{% set logOpts = {collapsed: true} %} {% set logOpts = {} %}
{% if logSize > 52428800 %} {% if logSize > 52428800 %}
{% set logOpts = {boxtype: 'danger'} %} {% set logOpts = {boxtype: 'danger', open: true} %}
{% endif %} {% endif %}
{% embed '@theme/embeds/card.html.twig' with logOpts %} {% embed '@theme/embeds/collapsible.html.twig' with logOpts %}
{% import "macros/widgets.html.twig" as widgets %} {% from "@theme/components/button.html.twig" import button %}
{% block box_title %}Logfile (max. {{ logLines }} last lines){% endblock %} {% block title %}Logfile (max. {{ logLines }} last lines){% endblock %}
{% block box_tools %} {% block body %}
{% 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 %}
{% if logSize > 52428800 %} {% if logSize > 52428800 %}
<p>Your logfile is larger than 50 MB, consider deleting it (it will be re-created automatically).</p> <p>Your logfile is larger than 50 MB, consider deleting it (it will be re-created automatically).</p>
{% endif %} {% endif %}
@@ -110,33 +105,32 @@
{%- endif -%} {%- endif -%}
<span class="{{ logLineClass }}">{{- logLine -}}</span> <span class="{{ logLineClass }}">{{- logLine -}}</span>
{%- endfor %}</pre> {%- endfor %}</pre>
{% endblock %} {% if log_delete %}
{% endembed %} {{ button('delete', {combined: true, 'class': 'confirmation-link btn-danger', 'title': 'delete', 'url': path('doctor_flush_log', {'token': csrf_token('doctor.flush_log')}), 'attr': {'data-question': 'confirm.delete'}}) }}
{% 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 %}
<table class="table table-hover">
{% for name, value in composer %}
<tr>
<th class="text-nowrap w-min">{{ name }}</th>
<td class="text-break">{{ value }}</td>
</tr>
{% endfor %}
</table>
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% endembed %} {% endembed %}
{% embed '@theme/embeds/card.html.twig' with {collapsed: true} %} {% embed '@theme/embeds/collapsible.html.twig' %}
{% block box_title %}PHP{% endblock %} {% import "macros/widgets.html.twig" as widgets %}
{% block box_body_class %}p-0{% endblock %} {% block title %}Composer{% endblock %}
{% block box_body %} {% block body_class %}p-0{% endblock %}
{% block body %}
<table class="table table-hover">
{% for name, value in composer %}
<tr>
<th class="text-nowrap w-min">{{ name }}</th>
<td class="text-break">{{ value }}</td>
</tr>
{% endfor %}
</table>
{% endblock %}
{% endembed %}
{% embed '@theme/embeds/collapsible.html.twig' %}
{% block title %}PHP{% endblock %}
{% block body_class %}p-0{% endblock %}
{% block body %}
<table class="table table-hover"> <table class="table table-hover">
<tr> <tr>
<th class="text-nowrap w-min">{{ 'version'|trans }}</th> <th class="text-nowrap w-min">{{ 'version'|trans }}</th>

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

@@ -73,11 +73,10 @@
{% if form.metaFields is defined and form.metaFields is not empty %} {% if form.metaFields is defined and form.metaFields is not empty %}
{{ form_row(form.metaFields) }} {{ form_row(form.metaFields) }}
{% endif %} {% 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 %} {% import "macros/widgets.html.twig" as widgets %}
{% block box_title %}{{ 'invoices'|trans }}{% endblock %} {% block title %}{{ 'invoices'|trans }}{% endblock %}
{% block box_body_class %}{% endblock %} {% block body %}
{% block box_body %}
{% if form.invoiceText is defined %} {% if form.invoiceText is defined %}
{{ form_row(form.invoiceText) }} {{ form_row(form.invoiceText) }}
{% endif %} {% endif %}

7
templates/timesheet/edit-default.html.twig
View File

@@ -74,11 +74,10 @@
{{ form_row(form.metaFields) }} {{ form_row(form.metaFields) }}
{% endif %} {% 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 %} {% 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 %} {% import "macros/widgets.html.twig" as widgets %}
{% block box_title %}{{ 'extended_settings'|trans }}{% endblock %} {% block title %}{{ 'extended_settings'|trans }}{% endblock %}
{% block box_body_class %}{% endblock %} {% block body %}
{% block box_body %}
{% if form.fixedRate is defined %} {% if form.fixedRate is defined %}
{{ form_row(form.fixedRate, {'row_attr': {'class': 'mb-3 ' ~ form.vars.name ~ '_row_' ~ form.fixedRate.vars.name}}) }} {{ form_row(form.fixedRate, {'row_attr': {'class': 'mb-3 ' ~ form.vars.name ~ '_row_' ~ form.fixedRate.vars.name}}) }}
{% endif %} {% endif %}

2
tests/Controller/DoctorControllerTest.php
View File

@@ -31,7 +31,7 @@ class DoctorControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN); $client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, '/doctor'); $this->assertAccessIsGranted($client, '/doctor');
$result = $client->getCrawler()->filter('.content .card-header'); $result = $client->getCrawler()->filter('.content .accordion-header');
$counter = \count($result); $counter = \count($result);
// this can contain a warning box, that a new release is available // this can contain a warning box, that a new release is available
self::assertTrue($counter === 6 || $counter === 5); self::assertTrue($counter === 6 || $counter === 5);