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

frontend update to tabler beta 19 (#4029)

Browse Source
This commit is contained in:
Kevin Papst
2023-05-15 19:10:00 +02:00
committed by GitHub
parent 43bd7bf1ab
commit 04422f3530
63 changed files with 235 additions and 1018 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
templates/about/license.html.twig
View File

@@ -12,27 +12,27 @@
<h3 class="m-0 mb-1">
<a href="{{ constant('App\\Constants::HOMEPAGE') }}" target="_blank">{{ constant('App\\Constants::SOFTWARE') }}</a>
</h3>
<div class="text-muted">
<div class="text-body-secondary">
{{ constant('App\\Constants::VERSION') }}
</div>
</div>
<div class="d-flex">
<a href="{{ ''|docu_link }}" target="_blank" class="card-btn">
<i class="me-2 text-muted {{ 'help'|icon(false) }}"></i>
<i class="me-2 text-body-secondary {{ 'help'|icon(false) }}"></i>
{{ 'help'|trans({}, 'about') }}
</a>
<a href="{{ constant('App\\Constants::GITHUB') }}discussions" target="_blank" class="card-btn">
<i class="me-2 text-muted {{ 'fab fa-github'|icon(false) }}"></i>
<i class="me-2 text-body-secondary {{ 'fab fa-github'|icon(false) }}"></i>
{{ 'support'|trans({}, 'about') }}
</a>
</div>
<div class="d-flex">
<a href="{{ constant('App\\Constants::HOMEPAGE') }}" target="_blank" class="card-btn">
<i class="me-2 text-muted {{ 'home'|icon(false) }}"></i>
<i class="me-2 text-body-secondary {{ 'home'|icon(false) }}"></i>
{{ 'website'|trans({}, 'about') }}
</a>
<a href="{{ constant('App\\Constants::HOMEPAGE') }}/donate/" target="_blank" class="card-btn">
<i class="me-2 text-muted {{ 'fas fa-hand-holding-heart'|icon(false) }}"></i>
<i class="me-2 text-body-secondary {{ 'fas fa-hand-holding-heart'|icon(false) }}"></i>
{{ 'donate'|trans({}, 'about') }}
</a>
</div>
@@ -92,11 +92,11 @@
<i class="fa-2x fas fa-balance-scale"></i>
</div>
<div>
<small class="text-muted">{{ constant('\\App\\Constants::SOFTWARE') }} is licensed under the</small>
<small class="text-body-secondary">{{ constant('\\App\\Constants::SOFTWARE') }} is licensed under the</small>
<h3 class="lh-1">GNU Affero General Public License v3.0</h3>
</div>
</div>
<div class="text-muted mb-3">
<div class="text-body-secondary mb-3">
Permissions of this strongest copyleft license are conditioned on making available complete source code of licensed works and modifications,
which include larger works using a licensed work, under the same license.
Copyright and license notices must be preserved. Contributors provide an express grant of patent rights.

2
templates/base.html.twig
View File

@@ -157,7 +157,7 @@
{% if block('table_actions') is defined %}
{{ block('table_actions') }}
{% elseif block('breadcrumb') is defined %}
<div class="text-muted mt-1">
<div class="text-body-secondary mt-1">
{{ block('breadcrumb') }}
</div>
{% endif %}

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

@@ -28,7 +28,7 @@
{% if source.blockInclude is not null and entry.blockName is not null and block(entry.blockName, source.blockInclude) is defined %}
{{ block(entry.blockName, source.blockInclude) }}
{% else %}
<span class="d-block text-muted text-truncate mt-n1">{{ entry.title }}</span>
<span class="d-block text-body-secondary text-truncate mt-n1">{{ entry.title }}</span>
{% endif %}
</div>
</div>

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

@@ -2,6 +2,6 @@
{% import "macros/widgets.html.twig" as widgets %}
{{ title }}
{% if project is not null %}
<small class="d-block text-muted text-truncate mt-n1">{{ project }}{% if customer is not null %}, {{ customer }}{% endif %}</small>
<small class="d-block text-body-secondary text-truncate mt-n1">{{ project }}{% if customer is not null %}, {{ customer }}{% endif %}</small>
{% endif %}
{% endmacro %}

2
templates/default/_form_modal.html.twig
View File

@@ -12,7 +12,7 @@
{% endif %}
{% endblock %}
</h5>
<button type="button" class="btn-close{% if tabler_bundle.isDarkMode() %} btn-close-white{% endif %}" data-bs-dismiss="modal" aria-label="{{ 'action.close'|trans }}"></button>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ 'action.close'|trans }}"></button>
</div>
<div class="modal-body">
{% block modal_body %}

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

@@ -106,7 +106,7 @@
{%- elseif '.ERROR' in logLine -%}
{%- set logLineClass = 'text-warning text-bold' -%}
{%- elseif '.DEBUG' in logLine -%}
{%- set logLineClass = 'text-muted' -%}
{%- set logLineClass = 'text-body-secondary' -%}
{%- endif -%}
<span class="{{ logLineClass }}">{{- logLine -}}</span>
{%- endfor %}</pre>

2
templates/embeds/comments.html.twig
View File

@@ -22,7 +22,7 @@
<div class="text-truncate">
<strong>{{ widgets.username(comment.createdBy) }}</strong>
</div>
<div class="text-muted">{{ comment.createdAt|date_time }}</div>
<div class="text-body-secondary">{{ comment.createdAt|date_time }}</div>
</div>
<div class="col-auto align-self-center">
{% if route_pin is not null %}

2
templates/embeds/teams.html.twig
View File

@@ -20,7 +20,7 @@
{% block box_attributes %}id="team_listing_box"{% endblock %}
{% block box_title %}
{{ 'permissions'|trans({}, 'actions') }}
{% if teams|length > 0 %}<small class="text-muted d-none d-sm-inline ms-1">{{ 'team.visibility_restricted'|trans({}, 'teams') }}</small>{% endif %}
{% if teams|length > 0 %}<small class="text-body-secondary d-none d-sm-inline ms-1">{{ 'team.visibility_restricted'|trans({}, 'teams') }}</small>{% endif %}
{% endblock %}
{% block box_body_class %}{% if teams|length > 0 %}p-0{% endif %}{% endblock %}
{% block box_body %}

4
templates/form/blocks.html.twig
View File

@@ -103,9 +103,9 @@
{{ form_errors(form.user) }}
</div>
{% if user is not null %}
<div class="text-muted">{{- form.vars.data.user.title -}}</div>
<div class="text-body-secondary">{{- form.vars.data.user.title -}}</div>
{% else %}
<div class="text-muted">__TITLE__</div>
<div class="text-body-secondary">__TITLE__</div>
{% endif %}
</div>
</div>

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

@@ -4,7 +4,7 @@
{% import "invoice/actions.html.twig" as actions %}
{% block datatable_row %}
<tr class="modal-ajax-form open-edit{% if entry.canceled %} warning text-muted{% endif %}" data-href="{{ path('admin_invoice_edit', {'id': entry.id}) }}">
<tr class="modal-ajax-form open-edit{% if entry.canceled %} text-body-secondary{% endif %}" data-href="{{ path('admin_invoice_edit', {'id': entry.id}) }}">
<td class="{{ tables.class(dataTable, 'avatar') }}">{{ widgets.user_avatar(entry.user) }}</td>
<td class="{{ tables.class(dataTable, 'date') }}">{{ entry.createdAt|date_short }}</td>
<td class="{{ tables.class(dataTable, 'user') }}">{{ widgets.label_user(entry.user) }}</td>

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

@@ -262,7 +262,7 @@
{{ form_end(multi_update_form) }}
{% endif %}
{% if route is not empty and entries is not null %}
<p class="d-none d-sm-block m-0 text-muted multi_update_form_hide">
<p class="d-none d-sm-block m-0 text-body-secondary multi_update_form_hide">
{{ 'pagination'|trans({'%start%': entries.getCurrentPageOffsetStart(), '%end%': entries.getCurrentPageOffsetEnd(), '%total%': entries.getNbResults()}) }}
</p>
{% set options = { 'css_container_class': 'pagination m-0 ms-auto d-print-none' } %}

2
templates/security/self-registration/confirmed.html.twig
View File

@@ -7,7 +7,7 @@
{% endblock %}
{% block login_actions %}
<div class="text-center text-muted mt-3">
<div class="text-center text-body-secondary mt-3">
<a href="{{ path('homepage') }}">
{{ 'Show homepage'|trans({}, 'TablerBundle') }}
</a>

4
templates/security/unlock.html.twig
View File

@@ -7,7 +7,7 @@
{% block login_box_msg %}{{ 'security.unlock.title'|trans }}{% endblock %}
{% block login_form %}
<p class="text-muted text-center mb-4">
<p class="text-body-secondary text-center mb-4">
{% block unlock_title %}{{ 'security.unlock.intro'|trans }}{% endblock %}
</p>
<div class="mb-4 text-center">
@@ -15,7 +15,7 @@
{{ user_avatar(app.user, false, 'avatar-xl mb-3') }}
<h3>{{ username(app.user) }}</h3>
{% if app.user.title is not empty %}
<p class="text-muted">{{ app.user.title }}</p>
<p class="text-body-secondary">{{ app.user.title }}</p>
{% endif %}
</div>
{% block unlock_form %}

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

@@ -17,7 +17,7 @@
{% for section in sorted|sort((a, b) => a.name <=> b.name) %}
<a class="list-group-item d-flex" href="#conf_{{ section.id }}">
{{ section.name }}
<small class="text-muted ms-auto">{{ section.counter }}</small>
<small class="text-body-secondary ms-auto">{{ section.counter }}</small>
</a>
{% endfor %}
</div>

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

@@ -18,7 +18,7 @@
<div class="col" style="min-width: 100px">
<h4 class="card-title m-0">{{ widgets.username(user) }}</h4>
{% if user.title is not empty %}
<div class="text-muted">
<div class="text-body-secondary">
{{ user.title }}
</div>
{% endif %}

2
templates/widget/widget-counter.html.twig
View File

@@ -16,7 +16,7 @@
<div class="font-weight-medium">
{{ title|trans }}
</div>
<div class="text-muted">
<div class="text-body-secondary">
{% block widget_data %}
{{ data }}
{% endblock %}

2
templates/widget/widget-more.html.twig
View File

@@ -17,7 +17,7 @@
{{ title|trans }}
</a>
</div>
<div class="text-muted">
<div class="text-body-secondary">
{% if data is iterable %}
{{ 'Invalid data' }}
{% else %}

2
templates/wizard/done.html.twig
View File

@@ -5,7 +5,7 @@
<div class="card-body text-center py-4 p-sm-5">
<img src="{{ asset('wizard/done.png') }}" height="120" class="mb-n2" alt="Illustration by Katerina Limpitsouni from https://undraw.co/">
<h1 class="mt-5">{{ 'wizard.done.title'|trans({}, 'wizard') }}</h1>
<p class="text-muted">{{ 'wizard.done.description'|trans({}, 'wizard') }}</p>
<p class="text-body-secondary">{{ 'wizard.done.description'|trans({}, 'wizard') }}</p>
</div>
{% endblock %}

2
templates/wizard/intro.html.twig
View File

@@ -4,6 +4,6 @@
<div class="card-body text-center py-4 p-sm-5">
<img src="{{ asset('wizard/time-management.png') }}" height="120" class="mb-n2" alt="Illustration by Katerina Limpitsouni from https://undraw.co/">
<h1 class="mt-5">{{ 'wizard.intro.title'|trans({}, 'wizard') }}</h1>
<p class="text-muted">{{ 'wizard.intro.description'|trans({}, 'wizard') }}</p>
<p class="text-body-secondary">{{ 'wizard.intro.description'|trans({}, 'wizard') }}</p>
</div>
{% endblock %}

2
templates/wizard/profile.html.twig
View File

@@ -3,7 +3,7 @@
{% block wizard_content %}
<div class="card-body text-center py-4 p-sm-5">
<h1 class="mt-2">{{ 'wizard.profile.title'|trans({}, 'wizard') }}</h1>
<p class="text-muted">{{ 'wizard.profile.description'|trans({}, 'wizard') }}</p>
<p class="text-body-secondary">{{ 'wizard.profile.description'|trans({}, 'wizard') }}</p>
</div>
<div class="hr-text hr-text-center hr-text-spaceless">{{ 'wizard.separator'|trans({}, 'wizard') }}</div>
<div class="card-body">