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

updated to Symfony 4.2 (#710)

Browse Source
This commit is contained in:
Kevin Papst
2019-04-21 01:41:08 +02:00
committed by GitHub
parent 32b36f42f0
commit f9c8028ea1
31 changed files with 1010 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,29 +51,26 @@
{% set isVisible = activity.project.customer.visible %}
{% endif %}
{% endif %}
{% set label = '' %}
{% if not activity.project is null %}
{% set label = activity.project.customer.name ~ ': ' ~ activity.project.name %}
{% endif %}
{{ macro.label(activity.name, (isVisible ? 'primary' : 'default'), label) }}
{% set type = (isVisible ? 'primary' : 'default') %}
<span class="label label-{{ type }}">{{ activity.name }}</span>
{% endmacro %}
{% macro label_project(project) %}
{% import _self as macro %}
{% set type = 'default' %}
{% if project.visible and project.customer.visible %}
{{ macro.label(project.name, 'primary', project.customer.name) }}
{% else %}
{{ macro.label(project.name, 'default', project.customer.name) }}
{% set type = 'primary' %}
{% endif %}
<span class="label label-{{ type }}">{{ project.name }}</span>
{% endmacro %}
{% macro label_customer(customer) %}
{% import _self as macro %}
{% set type = 'default' %}
{% if customer.visible %}
{{ macro.label(customer.name, 'primary') }}
{% else %}
{{ macro.label(customer.name, 'default') }}
{% set type = 'primary' %}
{% endif %}
<span class="label label-{{ type }}">{{ customer.name }}</span>
{% endmacro %}
{% macro badge_counter(count, url) %}
@@ -86,7 +83,7 @@
{% macro label(title, type, tooltip) %}
{# success, warning, danger, primary #}
<span {% if tooltip %}title="{{ tooltip }}" {% endif %}class="label label-{{ type|default('success') }}">{{ title|trans }}</span>
<span {% if tooltip %}data-tooltip="{{ tooltip }}" {% endif %}class="label label-{{ type|default('success') }}">{{ title|trans }}</span>
{% endmacro %}
{% macro badge(title, color) %}