diff options
| -rw-r--r-- | phpBB/adm/style/acp_users_overview.html | 23 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 |
2 files changed, 17 insertions, 7 deletions
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index e3eff369cc..d48cfa57be 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -124,13 +124,6 @@ <dd><input name="ban_give_reason" type="text" class="text medium" maxlength="3000" id="ban_give_reason" /></dd> </dl> </div> - <!-- IF not S_OWN_ACCOUNT --> - <dl> - <dt><label for="delete_user">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt> - <dd><input type="checkbox" class="radio" name="delete" value="1" /></dd> - <dd><select id="delete_user" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd> - </dl> - <!-- ENDIF --> <p class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> @@ -141,4 +134,20 @@ </form> + <!-- IF not S_OWN_ACCOUNT --> + <form id="user_delete" method="post" action="{U_ACTION}"> + <fieldset> + <legend>{L_DELETE_USER}</legend> + <dl> + <dt><label for="delete_type">{L_DELETE_USER}:</label><br /><span>{L_DELETE_USER_EXPLAIN}</span></dt> + <dd><select id="delete_type" name="delete_type"><option value="retain">{L_RETAIN_POSTS}</option><option value="remove">{L_DELETE_POSTS}</option></select></dd> + </dl> + <p class="quick"> + <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + <input type="hidden" name="delete" value="1" /> + {S_FORM_TOKEN} + </p> + </fieldset> + <!-- ENDIF --> + </form> <!-- ENDIF --> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f0bc0f6a44..3e4bb9c6c7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -124,6 +124,7 @@ <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> <li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li> <li>[Change] Cache overall, forums, topics and news feeds for anonymous users and bots.</li> + <li>[Change] Alter ACP user quick tools interface to reduce confusion with the delete operation.</li> </ul> <a name="v305"></a><h3>1.ii. Changes since 3.0.5</h3> |