Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Status] Add attr option + deprecated non camelCase option #177

Merged
merged 9 commits into from
Dec 12, 2023
Merged

[Status] Add attr option + deprecated non camelCase option #177

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a56ac24
Add status_dot component
Nov 9, 2023
f9d306c
Re-use self macro
Nov 9, 2023
2b81e3f
status_indicator add `attr` option
Nov 9, 2023
dc263d1
Removing self import
Dec 11, 2023
259d69f
Removing spaceless
Dec 11, 2023
3bd78c5
Update status_dot component
Dec 11, 2023
f97bfb2
Re-use existing `status_dot`
Dec 11, 2023
e167bb6
Use status color as status_dot color
Dec 11, 2023
85c23bf
remove color twig concat
cavasinf Dec 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 27 additions & 16 deletions templates/components/status.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
{% macro status(text, options) %}
{% set _color = options.color ?? 'green' %}
{% set _animated = options.animated ?? true %}
{% set _lite = options.lite is defined ? options.lite : false %}
{% set _with_dot = options.with_dot is defined ? options.with_dot : false %}
{% set _extraClass = options.extraClass ?? '' %}

{%- apply spaceless -%}
<span class="status status-{{ _color }} {{ _lite ? 'status-lite' : '' }} {{ _extraClass }}">
{% if _with_dot %}
<span class="status-dot {{ _animated ? 'status-dot-animated' : '' }}"></span>
{% endif %}
{{ text }}
</span>
{%- endapply -%}
{% endmacro %}
{% macro status(text, options) %}
{% import '@Tabler/includes/utils.html.twig' as utils %}
{% import '@Tabler/components/status_dot.html.twig' as status_dot %}

cavasinf marked this conversation as resolved.
Show resolved Hide resolved
{% set _color = options.color ?? 'green' %}
{% set _animated = (options.animated ?? true) is same as true %}
{% set _lite = (options.lite ?? false) is same as true %}
{% if options.with_dot is defined %}
{% deprecated 'with_dot option is deprecated, use withDot option instead!' %}
{% set _withDot = options.with_dot is same as true %}
{% else %}
{% set _withDot = (options.withDot ?? false) is same as true %}
{% endif %}

{% set _extraClass = options.extraClass ?? '' %}
{% set _attr = options.attr ?? {} %}

<span
class="status status-{{ _color }} {% if _lite %}status-lite{% endif %} {{ _extraClass }}"
{{ utils.attr_to_html(_attr) }}
>
{% if _withDot %}
{{ status_dot({color: _color, animated : _animated}) }}
{% endif %}
{{ text }}
</span>
{% endmacro %}
10 changes: 8 additions & 2 deletions templates/components/status_dot.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
{% macro status_dot(options) %}
{% import '@Tabler/includes/utils.html.twig' as utils %}

{% set _color = options.color ?? 'green' %}
{% set _animated = options.animated ?? true %}
{% set _animated = (options.animated ?? true) is same as true %}
{% set _extraClass = options.extraClass ?? '' %}
{% set _attr = options.attr ?? {} %}

<span class="status-dot status-{{ _color }} {% if _animated %}status-dot-animated{% endif %}"></span>
<span
class="status-dot {% if _animated %}status-dot-animated{% endif %} {% if _color is not null %}status-{{ _color }}{% endif %} {{ _extraClass }}"
{{ utils.attr_to_html(_attr) }}
></span>
{% endmacro %}
30 changes: 17 additions & 13 deletions templates/components/status_indicator.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
{% macro status_indicator(options) %}

{% set _color = options.color ?? 'green' %}
{% set _animated = options.animated ?? true %}
{% set _extraClass = options.extraClass ?? '' %}

<span class="status-indicator {{ _animated ? 'status-indicator-animated' : '' }} {{ 'status-'~_color }} {{ _extraClass }}">
<span class="status-indicator-circle"></span>
<span class="status-indicator-circle"></span>
<span class="status-indicator-circle"></span>
</span>

{% endmacro %}
{% macro status_indicator(options) %}
{% import '@Tabler/includes/utils.html.twig' as utils %}

{% set _color = options.color ?? 'green' %}
{% set _animated = (options.animated ?? true) is same as true %}
{% set _extraClass = options.extraClass ?? '' %}
{% set _attr = options.attr ?? {} %}

<span
class="status-indicator {% if _animated %}status-indicator-animated{% endif %} {{ 'status-'~_color }} {{ _extraClass }}"
{{ utils.attr_to_html(_attr) }}
cavasinf marked this conversation as resolved.
Show resolved Hide resolved
>
<span class="status-indicator-circle"></span>
<span class="status-indicator-circle"></span>
<span class="status-indicator-circle"></span>
</span>
{% endmacro %}
Loading