Templates: Update spacing handling

This commit is contained in:
Igor Scheller 2023-11-11 18:34:35 +01:00 committed by msquare
parent 58c457be86
commit 7f2f5ab7ed
2 changed files with 10 additions and 17 deletions

View File

@ -35,7 +35,10 @@
{% endmacro %} {% endmacro %}
{% macro button(label, url, type, size, title, icon_left, icon_right) %} {% macro button(label, url, type, size, title, icon_left, icon_right) %}
<a href="{{ url }}" class="btn btn-{{ type|default('secondary') }}{% if size %} btn-{{ size }}{% endif %}"{% if title %} title="{{ title }}"{% endif %}> <a href="{{ url }}" class="btn btn-{{ type|default('secondary') }}
{%- if size %} btn-{{ size }}{% endif %}"
{%- if title %} title="{{ title }}"{% endif -%}
>
{%- if icon_left %}{{ _self.icon(icon_left) }}{% endif %} {%- if icon_left %}{{ _self.icon(icon_left) }}{% endif %}
{{ label }} {{ label }}
{%- if icon_right %}{{ _self.icon(icon_right) }}{% endif %} {%- if icon_right %}{{ _self.icon(icon_right) }}{% endif %}

View File

@ -105,15 +105,9 @@ Also adds buttons to increment / decrement the value.
{%- if opt.min is defined %} min="{{ opt.min }}"{% endif %} {%- if opt.min is defined %} min="{{ opt.min }}"{% endif %}
{%- if opt.max is defined %} max="{{ opt.max }}"{% endif %} {%- if opt.max is defined %} max="{{ opt.max }}"{% endif %}
{%- if opt.step is defined %} step="{{ opt.step }}"{% endif %} {%- if opt.step is defined %} step="{{ opt.step }}"{% endif %}
{%- if opt.required|default(false) %} {%- if opt.required|default(false) %} required{% endif -%}
required {%- if opt.disabled|default(false) %} disabled{% endif -%}
{%- endif -%} {%- if opt.readonly|default(false) %} readonly{% endif -%}
{%- if opt.disabled|default(false) %}
disabled
{%- endif -%}
{%- if opt.readonly|default(false) %}
readonly
{%- endif -%}
> >
<button class="btn btn-secondary spinner-down" type="button" data-input-id="{{ name }}"> <button class="btn btn-secondary spinner-down" type="button" data-input-id="{{ name }}">
@ -152,12 +146,8 @@ Also adds buttons to increment / decrement the value.
{% endif %} {% endif %}
{%- endif %} {%- endif %}
<textarea class="form-control" id="{{ name }}" name="{{ name }}" <textarea class="form-control" id="{{ name }}" name="{{ name }}"
{%- if opt.required|default(false) %} {%- if opt.required|default(false) %} required{%- endif -%}
required {%- if opt.rows|default(0) %} rows="{{ opt.rows }}"{%- endif -%}
{%- endif -%}
{%- if opt.rows|default(0) %}
rows="{{ opt.rows }}"
{%- endif -%}
>{{ opt.value|default('') }}</textarea> >{{ opt.value|default('') }}</textarea>
</div> </div>
{%- endmacro %} {%- endmacro %}
@ -193,7 +183,7 @@ Renders a select element wrapped in a DIV with mb-3.
{% endif %} {% endif %}
<select id="{{ name }}" name="{{ name }}" <select id="{{ name }}" name="{{ name }}"
class="form-control {%- if opt.class is defined %} {{ opt.class }}{% endif %}" class="form-control {%- if opt.class is defined %} {{ opt.class }}{% endif %}"
{%- if opt.required|default(false) %}required{%- endif -%}> {%- if opt.required|default(false) %} required{%- endif -%}>
{%- if opt.default_option is defined %} {%- if opt.default_option is defined %}
<option value="">{{ opt.default_option }}</option> <option value="">{{ opt.default_option }}</option>
{% endif %} {% endif %}