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

Release 2.0.35 (#4302)

Browse Source
This commit is contained in:
Kevin Papst
2023-09-23 18:15:22 +02:00
committed by GitHub
parent de419350b2
commit 7a5b12762a
122 changed files with 1555 additions and 2054 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
templates/plugin/index.html.twig
View File

@@ -12,10 +12,9 @@
{% block box_body_class %}p-0{% endblock %}
{% block box_body %}
{% set columns = {
'name': {'class': 'alwaysVisible'},
'name': {'class': 'alwaysVisible w-25'},
'description': {'class': 'd-none d-md-table-cell'},
'version': {'class': 'text-center w-min'},
'actions': {'class': 'actions alwaysVisible'},
} %}
{% set tableName = 'plugins' %}
@@ -26,17 +25,13 @@
{% for plugin in plugins|sort((p1, p2) => p1.name|lower <=> p2.name|lower) %}
<tr>
<td class="{{ tables.data_table_column_class(tableName, columns, 'name') }}">
{% if plugin.id != plugin.name %}
<span data-toggle="tooltip" data-placement="top" title="{{ plugin.id }}">{{ plugin.name }}</span>
{% else %}
{{ plugin.name }}
{% endif %}
<a href="{{ plugin.metadata.homepage }}" title="{{ 'homepage'|trans }}" target="_blank">{{ plugin.name }}</a>
</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'description') }}">{{ plugin.metadata.description }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'version') }}">{{ widgets.label(plugin.metadata.version, 'primary') }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'actions') }}">
{% set event = actions(app.user, 'plugin', 'index', {'plugin': plugin}) %}
{{ widgets.table_actions(event.actions) }}
<td class="{{ tables.data_table_column_class(tableName, columns, 'description') }}">
{{ plugin.metadata.description }}
</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'version') }}">
{{ widgets.label(plugin.metadata.version, 'primary', plugin.id) }}
</td>
</tr>
{% endfor %}
@@ -55,9 +50,9 @@
{% endblock %}
{% block box_body %}
{% set columns = {
'name': {'class': 'alwaysVisible'},
'name': {'class': 'alwaysVisible w-25'},
'description': {'class': 'd-none d-md-table-cell'},
'actions': {'class': 'actions alwaysVisible'},
'shop': {'class': 'w-min alwaysVisible'},
} %}
{% set tableName = 'extensions' %}
@@ -71,7 +66,7 @@
<a href="{{ extension.url }}" title="{{ 'homepage'|trans }}" target="_blank">{{ extension.name }}</a>
</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'description') }}">{{ extension.description }}</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'actions') }}">
<td class="{{ tables.data_table_column_class(tableName, columns, 'shop') }}">
{% if extension.buy is defined and extension.buy is not empty and (extension.minimum_version is not defined or (extension.minimum_version is not empty and constant('App\\Constants::VERSION') >= extension.minimum_version)) %}
<a class="btn btn-icon btn-outline-secondary" href="{{ extension.buy }}" title="{{ 'buy'|trans({}, 'plugins') }}" target="_blank">{{ icon('shop') }}</a>
{% endif %}

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

@@ -3,8 +3,8 @@
{% block main %}
<div class="row">
<div class="col-12 col-md-3 mb-3 d-none d-md-block">
<div class="card">
<div class="col-12 col-xxl-2 col-md-3 mb-3 d-none d-md-block">
<div class="card sticky-xxl-top">
<div class="list-group list-group-flush">
{% set sorted = [] %}
{% for section in sections %}
@@ -15,7 +15,7 @@
{% set sorted = sorted|merge([{'name': title, 'id': section.model.section, 'counter': section.form.children.configuration|length}]) %}
{% endfor %}
{% for section in sorted|sort((a, b) => a.name <=> b.name) %}
<a class="list-group-item d-flex" href="#conf_{{ section.id }}">
<a class="list-group-item d-flex ps-4 pe-4 p-lg-3 pb-md-2 pt-md-2" href="#conf_{{ section.id }}">
{{ section.name }}
<small class="text-body-secondary ms-auto">{{ section.counter }}</small>
</a>
@@ -24,7 +24,7 @@
</div>
</div>
<div class="col-12 col-md-9">
<div class="col-12 col-xxl-10 col-md-9">
<div class="row">
<div class="col-12">
{% set formEditTemplate = kimai_context.modalRequest ? 'default/_form_modal.html.twig' : 'default/_form.html.twig' %}