makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17100] Improve output of unwrapped macros

Browse source 
PHPBB3-17100
This commit is contained in:
Marc Alexander 2022-04-18 20:50:23 +02:00
parent 2dfe5ebe6d
commit 003b606781
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
phpBB/adm/style/form_macros.twig
View file

@ -1,17 +1,18 @@
{% macro input(form_data) %} {% macro input(form_data) %}
<input {% apply replace({"\n": ' ', '\t': ''}) %}
{% if form_data.id %}id="{{ form_data.id }}"{% endif %} <input
type="{{ form_data.type }}" {% if form_data.id %}id="{{ form_data.id }}"{% endif %}
name="{{ form_data.name }}" type="{{ form_data.type }}"
{% if form_data.size %}size="{{ form_data.size }}"{% endif %} name="{{ form_data.name }}"
{% if form_data.maxlength %}maxlength="{{ form_data.maxlength }}"{% endif %} {% if form_data.size %}size="{{ form_data.size }}"{% endif %}
{% if form_data.min %}min="{{ form_data.min }}"{% endif %} {% if form_data.maxlength %}maxlength="{{ form_data.maxlength }}"{% endif %}
{% if form_data.max %}max="{{ form_data.max }}"{% endif %} {% if form_data.min %}min="{{ form_data.min }}"{% endif %}
{% if form_data.type == 'password' %}autocomplete="off"{% endif %} {% if form_data.max %}max="{{ form_data.max }}"{% endif %}
{% if form_data.checked %}checked="checked"{% endif %} {% if form_data.type == 'password' %}autocomplete="off"{% endif %}
{% if form_data.class %}class="{{ form_data.class }}"{% endif %} {% if form_data.checked %}checked="checked"{% endif %}
value="{{ form_data.value }}" {% if form_data.class %}class="{{ form_data.class }}"{% endif %}
> value="{{ form_data.value }}">
{% endapply %}
{% endmacro %} {% endmacro %}
{% macro dimension(form_data) %} {% macro dimension(form_data) %}
@ -19,14 +20,15 @@
{% endmacro %} {% endmacro %}
{% macro textarea(form_data) %} {% macro textarea(form_data) %}
<textarea {% apply replace({"\n": ' ', '\t': ''}) %}
id="{{ form_data.id }}" <textarea
name="{{ form_data.name }}" id="{{ form_data.id }}"
rows="{{ form_data.rows }}" name="{{ form_data.name }}"
cols="{{ form_data.cols }}" rows="{{ form_data.rows }}"
> cols="{{ form_data.cols }}">
{{ form_data.content }} {{ form_data.content }}
</textarea> </textarea>
{% endapply %}
{% endmacro %} {% endmacro %}
{% macro radio_buttons(form_data) %} {% macro radio_buttons(form_data) %}
@ -35,7 +37,7 @@
{% endmacro %} {% endmacro %}
{% macro select(form_data) %} {% macro select(form_data) %}
<select id="{{ form_data.id }}" name="{{ form_data.name }}"> <select {% if form_data.id %}id="{{ form_data.id }}"{% endif %} name="{{ form_data.name }}">
{% for option in form_data.options %} {% for option in form_data.options %}
<option value="{{ option.value }}"{% if option.selected %} selected="selected"{% endif %}>{{ option.label }}</option> <option value="{{ option.value }}"{% if option.selected %} selected="selected"{% endif %}>{{ option.label }}</option>
{% endfor %} {% endfor %}