1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00

[ticket/17100] Use twig functions for form elements

PHPBB3-17100
This commit is contained in:
Marc Alexander
2023-04-09 13:12:39 +02:00
parent 69f5d5f40f
commit 60dacf0bfe
21 changed files with 313 additions and 116 deletions

View File

@@ -37,7 +37,6 @@
<!-- IF S_ATTACHMENT_SETTINGS -->
{% import 'macros/form_macros.twig' as form_macros %}
<form id="attachsettings" method="post" action="{U_ACTION}">
<!-- BEGIN options -->
<!-- IF options.S_LEGEND -->
@@ -52,7 +51,7 @@
<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>
{% if options.CONTENT is iterable %}
{{ form_macros.build_template(options.CONTENT)}}
{{ FormsBuildTemplate(options.CONTENT)}}
{% else %}
{options.CONTENT}
{% endif %}
@@ -210,8 +209,7 @@
<dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}{L_COLON}</label></dt>
<dd>
<input type="number" id="extgroup_filesize" min="0" max="999999999999999" step="any" name="max_filesize" value="{EXTGROUP_FILESIZE}" />
{% from 'macros/form_macros.twig' import select %}
{{ select(EXT_GROUP_SIZE_OPTIONS) }}
{{ FormsSelect(EXT_GROUP_SIZE_OPTIONS) }}
</dd>
</dl>
<dl>

View File

@@ -13,7 +13,6 @@
</div>
<!-- ENDIF -->
{% import 'macros/form_macros.twig' as form_macros %}
<form id="acp_board" method="post" action="{U_ACTION}">
<!-- BEGIN options -->
@@ -30,7 +29,7 @@
<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span>{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
<dd>
{% if options.CONTENT is iterable %}
{{ form_macros.build_template(options.CONTENT)}}
{{ FormsBuildTemplate(options.CONTENT)}}
{% else %}
{{ options.CONTENT }}
{% endif %}

View File

@@ -32,8 +32,7 @@
<dl>
<dt><label for="{{ LANG_OPTIONS.id }}">{L_BOT_LANG}{L_COLON}</label><br /><span>{L_BOT_LANG_EXPLAIN}</span></dt>
<dd>
{% import 'macros/form_macros.twig' as form_macros %}
{{ form_macros.select(LANG_OPTIONS) }}
{{ FormsSelect(LANG_OPTIONS) }}
</dd>
</dl>
<dl>

View File

@@ -65,8 +65,7 @@
<!-- ENDIF -->
<fieldset class="quick">
{% from 'macros/form_macros.twig' import select %}
{{ select(INACTIVE_OPTIONS) }}
{{ FormsSelect(INACTIVE_OPTIONS) }}
<input class="button2" type="submit" name="submit" value="{L_SUBMIT}" />
<p class="small"><a href="#" onclick="marklist('inactive', 'mark', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('inactive', 'mark', false); return false;">{L_UNMARK_ALL}</a></p>
{S_FORM_TOKEN}

View File

@@ -43,8 +43,7 @@
<dl>
<dt><label for="{{ LANG_OPTIONS.id }}">{L_BOARD_LANGUAGE}{L_COLON}</label></dt>
<dd>
{% import 'macros/form_macros.twig' as form_macros %}
{{ form_macros.select(LANG_OPTIONS) }}
{{ FormsSelect(LANG_OPTIONS) }}
</dd>
</dl>
<dl>

View File

@@ -1,15 +1,14 @@
<dl>
{% from "macros/form_macros.twig" import select %}
<dt><label for="timezone">{{ lang('BOARD_TIMEZONE') | lang('COLON') }}</label></dt>
<dt><label for="timezone">{{ lang('BOARD_TIMEZONE') ~ lang('COLON') }}</label></dt>
{% if TIMEZONE_OPTIONS %}
<dd id="tz_select_date hidden">
{% set tz_date_data = TIMEZONE_OPTIONS|merge({ options: [{ value: "", label: lang('SELECT_CURRENT_TIME') }]|merge(TIMEZONE_OPTIONS.options) }) %}
{{ select(tz_date_data, 'autowidth tz_select', 'tz_date', 'tz_date', true) }}
{% set tz_date_data = TIMEZONE_OPTIONS | merge({options: [{ value: "", label: lang('SELECT_CURRENT_TIME')}] | merge(TIMEZONE_OPTIONS.options) }) %}
{{ FormsSelect(tz_date_data | merge({class: 'autowidth tz_select', id: 'tz_date', name: 'tz_date', group_only: true})) }}
</dd>
{% endif %}
<dd>
{% set tz_select_data = TIMEZONE_OPTIONS|merge({ options: [{ value: "", label: lang('SELECT_TIMEZONE') }]|merge(TIMEZONE_OPTIONS.options) }) %}
{{ select(tz_select_data, 'autowidth tz_select', 'timezone') }}
{% set tz_select_data = TIMEZONE_OPTIONS | merge({ options: [{ value: "", label: lang('SELECT_TIMEZONE') }] | merge(TIMEZONE_OPTIONS.options) }) %}
{{ FormsSelect(tz_select_data | merge({class: 'autowidth tz_select', id: 'timezone'})) }}
{% INCLUDEJS('timezone.js') %}
</dd>