diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 2cba5774f6..e13af1b3e7 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -57,12 +57,12 @@
<!-- ENDIF -->
<!-- END options -->
- </fieldset>
- <fieldset class="submit-buttons">
- <legend>{L_SUBMIT}</legend>
+ <p class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
<input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ </p>
+
</fieldset>
<!-- IF not S_SECURE_DOWNLOADS -->
@@ -207,10 +207,13 @@
<dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd>
</dl>
- <p class="submit-buttons">
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
- </p>
+ </fieldset>
+ <fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ </p>
{S_FORM_TOKEN}
</fieldset>
@@ -311,10 +314,14 @@
</tbody>
</table>
- <p class="submit-buttons">
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
- </p>
+ </fieldset>
+ <fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ </p>
+
{S_FORM_TOKEN}
</fieldset>
</form>
@@ -385,10 +392,13 @@
<!-- ENDIF -->
<!-- IF .orphan -->
- <p class="submit-buttons">
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
- </p>
+ </fieldset>
+ <fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ </p>
<!-- ENDIF -->
{S_FORM_TOKEN}
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html
index d0eab75ad8..ffea40027e 100644
--- a/phpBB/adm/style/acp_ban.html
+++ b/phpBB/adm/style/acp_ban.html
@@ -73,12 +73,14 @@
<dt><label for="bangivereason">{L_BAN_GIVE_REASON}{L_COLON}</label></dt>
<dd><input name="bangivereason" type="text" class="text medium" maxlength="255" id="bangivereason" /></dd>
</dl>
-
-<p class="submit-buttons">
- <input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
-</p>
-{S_FORM_TOKEN}
+</fieldset>
+<fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" />
+ </p>
+ {S_FORM_TOKEN}
</fieldset>
</form>
diff --git a/phpBB/adm/style/acp_contact.html b/phpBB/adm/style/acp_contact.html
index d63fd08a3a..2c273e3235 100644
--- a/phpBB/adm/style/acp_contact.html
+++ b/phpBB/adm/style/acp_contact.html
@@ -66,9 +66,12 @@
</dl>
</fieldset>
- <fieldset class="submit-buttons">
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
- <input class="button2" type="submit" name="preview" value="{L_PREVIEW}" />
+ <fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ </p>
{S_FORM_TOKEN}
</fieldset>
</form>
diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index d3433a8aa6..cb2b6d0d39 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -76,12 +76,15 @@
</select></dd>
<dd><a href="#" onclick="selector(true); return false;">{L_SELECT_ALL}</a> :: <a href="#" onclick="selector(false); return false;">{L_DESELECT_ALL}</a></dd>
</dl>
+ </fieldset>
- <p class="submit-buttons">
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
- </p>
- {S_FORM_TOKEN}
+ <fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ </p>
+ {S_FORM_TOKEN}
</fieldset>
</form>
diff --git a/phpBB/adm/style/acp_groups_position.html b/phpBB/adm/style/acp_groups_position.html
index 20ed9521f0..8e56b7b5d9 100644
--- a/phpBB/adm/style/acp_groups_position.html
+++ b/phpBB/adm/style/acp_groups_position.html
@@ -15,13 +15,15 @@
<label><input type="radio" name="legend_sort_groupname" class="radio" value="0"<!-- IF not LEGEND_SORT_GROUPNAME --> checked="checked"<!-- ENDIF --> /> {L_NO}</label>
</dd>
</dl>
-
- <p class="submit-buttons">
- <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
- <input class="button2" type="reset" name="reset" value="{L_RESET}" />
- <input type="hidden" name="action" value="set_config_legend" />
- {S_FORM_TOKEN}
- </p>
+ </fieldset>
+ <fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" name="update" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" name="reset" value="{L_RESET}" />
+ <input type="hidden" name="action" value="set_config_legend" />
+ {S_FORM_TOKEN}
+ </p>
</fieldset>
</form>
diff --git a/phpBB/adm/style/acp_help_phpbb.html b/phpBB/adm/style/acp_help_phpbb.html
index 478ecc162a..1573c31f69 100644
--- a/phpBB/adm/style/acp_help_phpbb.html
+++ b/phpBB/adm/style/acp_help_phpbb.html
@@ -40,6 +40,7 @@
</div>
<!-- EVENT acp_help_phpbb_stats_after -->
<fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<p class="submit-buttons">
<input type="hidden" name="systemdata" value="{RAW_DATA}" />
<input type="hidden" name="help_send_statistics_time" value="{COLLECT_STATS_TIME}" />
@@ -51,6 +52,7 @@
</form>
<form action="{U_COLLECT_STATS}" method="post" target="questionaire_result" id="questionnaire-form">
<fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
<p class="submit-buttons">
<input type="hidden" name="systemdata" value="{RAW_DATA}" />
<input class="button1" type="submit" id="submit_stats" name="submit" value="{L_SEND_STATISTICS}" />
diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html
index e76c9a0323..5267062106 100644
--- a/phpBB/adm/style/acp_jabber.html
+++ b/phpBB/adm/style/acp_jabber.html
@@ -70,9 +70,12 @@
</fieldset>
-<fieldset class="submit-buttons">
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+<fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ </p>
{S_FORM_TOKEN}
</fieldset>
</form>
diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html
index 7766052c59..8042053028 100644
--- a/phpBB/adm/style/acp_permissions.html
+++ b/phpBB/adm/style/acp_permissions.html
@@ -340,9 +340,12 @@
<br class="responsive-hide" /><br class="responsive-hide" />
<fieldset class="quick" style="float: {S_CONTENT_FLOW_END};">
- <input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
- <input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
- {S_FORM_TOKEN}
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" />
+ <input class="button2" type="button" id="reset" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" />
+ {S_FORM_TOKEN}
+ </p>
</fieldset>
<br class="responsive-hide" /><br class="responsive-hide" />
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html
index 6e8b2e4214..ecd1839250 100644
--- a/phpBB/adm/style/acp_prune_users.html
+++ b/phpBB/adm/style/acp_prune_users.html
@@ -7,7 +7,7 @@
<p>{L_ACP_PRUNE_USERS_EXPLAIN}</p>
<form id="acp_prune" method="post" action="{U_ACTION}">
-
+
<fieldset>
<legend>{L_CRITERIA}</legend>
<dl>
@@ -66,15 +66,19 @@
<dd><label><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS}</label>
<label><input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</label></dd>
</dl>
-
-<p class="submit-buttons">
- <input type="hidden" name="prune" value="1" />
-
- <input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
- {S_FORM_TOKEN}
-</p>
</fieldset>
+
+<fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input type="hidden" name="prune" value="1" />
+
+ <input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ {S_FORM_TOKEN}
+ </p>
+</fieldset>
+
</form>
<!-- INCLUDE overall_footer.html -->
diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html
index 99620058dc..deae1234bb 100644
--- a/phpBB/adm/style/acp_search.html
+++ b/phpBB/adm/style/acp_search.html
@@ -59,10 +59,12 @@
<!-- END backend -->
- <fieldset class="submit-buttons">
- <legend>{L_SUBMIT}</legend>
- <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
- <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ <fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ </p>
{S_FORM_TOKEN}
</fieldset>
</form>
@@ -89,10 +91,12 @@
<p>{L_CONTINUE_EXPLAIN}</p>
<form id="acp_search_continue" method="post" action="{U_CONTINUE_INDEXING}">
- <fieldset class="submit-buttons">
- <legend>{L_SUBMIT}</legend>
- <input class="button1" type="submit" id="continue" name="continue" value="{L_CONTINUE}" onclick="popup_progress_bar('{S_CONTINUE_INDEXING}');" />
- <input class="button2" type="submit" id="cancel" name="cancel" value="{L_CANCEL}" />
+ <fieldset>
+ <legend>{L_ACP_SUBMIT_CHANGES}</legend>
+ <p class="submit-buttons">
+ <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" />
+ <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" />
+ </p>
{S_FORM_TOKEN}
</fieldset>
</form>
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 576bfd755f..9e4ef2e0d6 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -137,16 +137,16 @@ class acp_board
$avatar_vars += $driver->prepare_form_acp($user);
}
+ $legend2 = 'ACP_SUBMIT_CHANGES';
+
$display_vars = array(
'title' => 'ACP_AVATAR_SETTINGS',
'vars' => array(
'legend1' => 'ACP_AVATAR_SETTINGS',
-
'avatar_min_width' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
'avatar_min_height' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
'avatar_max_width' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
'avatar_max_height' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false),
-
'allow_avatar' => array('lang' => 'ALLOW_AVATARS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'avatar_min' => array('lang' => 'MIN_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
'avatar_max' => array('lang' => 'MAX_AVATAR_SIZE', 'validate' => 'int:0', 'type' => 'dimension:0', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']),
@@ -158,9 +158,7 @@ class acp_board
$display_vars['vars'] += $avatar_vars;
}
- $display_vars['vars'] += [
- 'legend2' => 'ACP_SUBMIT_CHANGES'
- ];
+ $display_vars['vars']['legend2'] = 'ACP_SUBMIT_CHANGES';
break;
case 'message':
@@ -368,7 +366,6 @@ class acp_board
'load_user_activity_limit' => array('lang' => 'LOAD_USER_ACTIVITY_LIMIT', 'validate' => 'int:0:99999999', 'type' => 'number:0:99999999', 'explain' => true),
'load_tplcompile' => array('lang' => 'RECOMPILE_STYLES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'allow_cdn' => array('lang' => 'ALLOW_CDN', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
- 'enable_accurate_pm_button' => array('lang' => 'YES_ACCURATE_PM_BUTTON', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'allow_live_searches' => array('lang' => 'ALLOW_LIVE_SEARCHES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
'legend3' => 'CUSTOM_PROFILE_FIELDS',