From b8b6625872747486bc996846fffd4fa592e7f9b0 Mon Sep 17 00:00:00 2001 From: ioannisbat Date: Sat, 26 May 2018 13:19:34 +0300 Subject: [PATCH 1/2] [ticket/15672] Keep same format in Submit changes. PHPBB3-15672 --- phpBB/adm/style/acp_attachments.html | 40 +++++++++++++++--------- phpBB/adm/style/acp_ban.html | 14 +++++---- phpBB/adm/style/acp_contact.html | 9 ++++-- phpBB/adm/style/acp_database.html | 13 +++++--- phpBB/adm/style/acp_groups_position.html | 16 +++++----- phpBB/adm/style/acp_help_phpbb.html | 2 ++ phpBB/adm/style/acp_jabber.html | 9 ++++-- phpBB/adm/style/acp_permissions.html | 9 ++++-- phpBB/adm/style/acp_prune_users.html | 22 +++++++------ phpBB/adm/style/acp_search.html | 20 +++++++----- phpBB/includes/acp/acp_board.php | 9 ++---- 11 files changed, 98 insertions(+), 65 deletions(-) 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 @@ - -
- {L_SUBMIT} +

  +

+
@@ -207,10 +207,13 @@
-

-   - -

+ +
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

{S_FORM_TOKEN}
@@ -311,10 +314,14 @@ -

-   - -

+ +
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

+ {S_FORM_TOKEN}
@@ -385,10 +392,13 @@ -

-   - -

+ +
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

{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 @@
- -

-   - -

-{S_FORM_TOKEN} +
+
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

+ {S_FORM_TOKEN}
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 @@ -
-   - +
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

{S_FORM_TOKEN}
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 @@
{L_SELECT_ALL} :: {L_DESELECT_ALL}
+
-

-   - -

- {S_FORM_TOKEN} +
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

+ {S_FORM_TOKEN}
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 @@ - -

-   - - - {S_FORM_TOKEN} -

+ +
+ {L_ACP_SUBMIT_CHANGES} +

+   + + + {S_FORM_TOKEN} +

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 @@
+ {L_ACP_SUBMIT_CHANGES}

@@ -51,6 +52,7 @@

+ {L_ACP_SUBMIT_CHANGES}

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 @@

-
-   - +
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

{S_FORM_TOKEN}
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 @@

- - - {S_FORM_TOKEN} + {L_ACP_SUBMIT_CHANGES} +

+   + + {S_FORM_TOKEN} +



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 @@

{L_ACP_PRUNE_USERS_EXPLAIN}

- +
{L_CRITERIA}
@@ -66,15 +66,19 @@
- -

- - -   - - {S_FORM_TOKEN} -

+ +
+ {L_ACP_SUBMIT_CHANGES} +

+ + +   + + {S_FORM_TOKEN} +

+
+
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 @@ -
- {L_SUBMIT} -   - +
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

{S_FORM_TOKEN}
@@ -89,10 +91,12 @@

{L_CONTINUE_EXPLAIN}

-
- {L_SUBMIT} -   - +
+ {L_ACP_SUBMIT_CHANGES} +

+   + +

{S_FORM_TOKEN}
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', From 7330cdee2c5209e8d20e374dfc325ad61edacc2a Mon Sep 17 00:00:00 2001 From: mrgoldy Date: Thu, 7 May 2020 16:23:09 +0200 Subject: [PATCH 2/2] [ticket/15672] Readd config setting and correct HTML adjustment PHPBB3-15672 --- phpBB/adm/style/acp_attachments.html | 14 ++++++++------ phpBB/includes/acp/acp_board.php | 3 +-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index e13af1b3e7..a8d6f92d71 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -57,12 +57,14 @@ +
-

-   - -

- +
+ {{ lang('ACP_SUBMIT_CHANGES') }} +

+   + +

@@ -209,7 +211,7 @@
- {L_ACP_SUBMIT_CHANGES} + {L_ACP_SUBMIT_CHANGES}

  diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 9e4ef2e0d6..cd5f54d871 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -137,8 +137,6 @@ class acp_board $avatar_vars += $driver->prepare_form_acp($user); } - $legend2 = 'ACP_SUBMIT_CHANGES'; - $display_vars = array( 'title' => 'ACP_AVATAR_SETTINGS', 'vars' => array( @@ -366,6 +364,7 @@ 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',