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

Upgrade Tabler frontend to 1.0.21 (#5066)

Browse Source
This commit is contained in:
Kevin Papst
2024-09-23 18:31:33 +02:00
committed by GitHub
parent 13649e146c
commit 40154be8f9
27 changed files with 287 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,15 +17,9 @@
{# compare templates/page_setup.html.twig block table_actions #}
{% macro actions(dataTable) %}
{% set btnClass = '' %}
{% set bgClass = '' %}
{% if not tabler_bundle.isNavbarOverlapping() and not tabler_bundle.isDarkMode() %}
{% set btnClass = 'btn-white' %}
{% set bgClass = 'bg-white' %}
{% endif %}
<div class="btn-list">
{% if dataTable.hasConfiguration() %}
<a class="btn btn-icon {{ btnClass }}" href="#" data-bs-toggle="modal" data-bs-target="#modal_{{ dataTable.getTableName() }}" title="{{ 'modal.columns.title'|trans }}">
<a class="btn btn-icon" href="#" data-bs-toggle="modal" data-bs-target="#modal_{{ dataTable.getTableName() }}" title="{{ 'modal.columns.title'|trans }}">
{{ icon('columns', true) }}
</a>
{% endif %}
@@ -40,9 +34,9 @@
{% set order = form_widget(form.order) %}
{% set filterCount = dataTable.getQuery().countFilter() %}
<div class="input-group inline-search position-static">
<button type="button" class="btn {{ btnClass }} dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="false" aria-haspopup="true" aria-expanded="false" id="search-dropdown-btn" title="{{ 'search_filter'|trans }}">
<button type="button" class="btn dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="false" aria-haspopup="true" aria-expanded="false" id="search-dropdown-btn" title="{{ 'search_filter'|trans }}">
{{ icon('filter', true) }}
{% if filterCount > 0 %}<span class="badge badge-pill bg-blue ms-1 d-none d-md-inline">{{ filterCount }}</span>{% endif %}
{% if filterCount > 0 %}<span class="badge badge-pill bg-primary text-primary-fg ms-1 d-none d-md-inline">{{ filterCount }}</span>{% endif %}
</button>
<div class="dropdown-menu p-3 search-dropdown" data-popper-placement="bottom-start" aria-labelledby="search-dropdown-btn">
{{ form_rest(form) }}
@@ -64,7 +58,7 @@
</div>
</div>
{{ searchTerm|raw }}
<span class="input-group-text {{ bgClass }}">
<span class="input-group-text">
{% set bookmarkToken = csrf_token('search') %}
{% set searchBtnClass = 'btn btn-icon btn-sm btn-ghost-secondary' %}
<input type="hidden" name="_token" value="{{ bookmarkToken }}">

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

@@ -229,20 +229,20 @@
{% if teams|length > 0 %}
{{ _self.badge_counter(teams|length) }}
{% else %}
{{ _self.badge_counter(0, null, 'bg-gray') }}
{{ _self.badge_counter(0, null, 'gray') }}
{% endif %}
{% endmacro %}
{% macro badge_counter(count, url, type) %}
{% if url %}
<a href="{{ url }}"><span class="badge {{ type|default('bg-blue') }}">{{ count }}</span></a>
{% if url is not null %}
<a href="{{ url }}">{{ _self.badge_type(count, type|default('blue')) }}</a>
{% else %}
<span class="badge {{ type|default('bg-blue') }}">{{ count }}</span>
{{ _self.badge_type(count, type|default('blue')) }}
{% endif %}
{% endmacro %}
{% macro label(title, type, tooltip) %}
<span {% if tooltip %}data-toggle="tooltip" data-placement="top" title="{{ tooltip }}" {% endif %}class="badge bg-{{ type|default('success') }}">{{ title }}</span>
<span {% if tooltip %}data-toggle="tooltip" data-placement="top" title="{{ tooltip }}" {% endif %}class="badge bg-{{ type|default('success') }} text-{{ type|default('success') }}-fg">{{ title }}</span>
{% endmacro %}
{% macro label_color(title, color) %}
@@ -253,6 +253,11 @@
<span class="badge"{% if color is not null %} style="background-color:{{ color }}; color:{{ color|font_contrast }}"{% endif %}>{{ title }}</span>
{% endmacro %}
{% macro badge_type(title, type) %}
{% set class = (type is not empty ? 'bg-' ~ type ~ ' text-' ~ type ~ '-fg' : '') %}
<span class="badge {{ class }}">{{ title }}</span>
{% endmacro %}
{% macro form_errors(form) %}
{% if form.vars.errors|length > 0 %}
{% set message = '' %}
@@ -306,9 +311,14 @@
{% endmacro %}
{% macro tag_list(taglist) %}
<div class="tags-list">
{% for tag in taglist %}
{{ _self.badge(tag.name, tag.color|colorize(tag.name)) }}
<span class="tag">
<span class="legend" style="background-color: {{ tag.color|colorize(tag.name) }}"></span>
{{ tag.name }}
</span>
{% endfor %}
</div>
{% endmacro %}
{% macro meta_field_value(entity, field) %}