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

UI improvements for datatables (#593)

Browse Source
This commit is contained in:
Kevin Papst
2019-02-22 21:25:43 +01:00
committed by GitHub
parent 1f7ec6769a
commit 3d4b0c3fd6
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@
{% if visible %}
{{ macro.label('badge.visible', 'success') }}
{% else %}
{{ macro.label('badge.invisible', 'warning') }}
{{ macro.label('badge.invisible', 'default') }}
{% endif %}
{% endmacro %}
@@ -99,7 +99,7 @@
{% if not activity.project is null %}
{% set label = activity.project.customer.name ~ ': ' ~ activity.project.name %}
{% endif %}
{{ macro.label(activity.name, (isVisible ? 'primary' : 'warning'), label) }}
{{ macro.label(activity.name, (isVisible ? 'primary' : 'default'), label) }}
{% endmacro %}
{% macro label_project(project) %}
@@ -107,7 +107,7 @@
{% if project.visible and project.customer.visible %}
{{ macro.label(project.name, 'primary', project.customer.name) }}
{% else %}
{{ macro.label(project.name, 'warning', project.customer.name) }}
{{ macro.label(project.name, 'default', project.customer.name) }}
{% endif %}
{% endmacro %}
@@ -116,7 +116,7 @@
{% if customer.visible %}
{{ macro.label(customer.name, 'primary') }}
{% else %}
{{ macro.label(customer.name, 'warning') }}
{{ macro.label(customer.name, 'default') }}
{% endif %}
{% endmacro %}