diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-12-16 15:48:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-12-16 15:48:23 +0000 |
| commit | b68de2323d6444b4b3685a98bbcb9500a38e45cb (patch) | |
| tree | 6046a64891cfc1c2edb3f4b42b0e799f2921c155 /phpBB/adm | |
| parent | 51d173ff1e6d3764be4701b92ecfd68007ad1c81 (diff) | |
| download | forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.gz forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.bz2 forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.xz forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.zip | |
merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_ban.html | 6 | ||||
| -rw-r--r-- | phpBB/adm/style/acp_users_overview.html | 23 | ||||
| -rw-r--r-- | phpBB/adm/style/captcha_recaptcha.html | 2 |
3 files changed, 20 insertions, 11 deletions
diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index bc326345b0..539e8032dd 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -93,15 +93,15 @@ </dl> <dl> <dt><label for="unbanlength">{L_BAN_LENGTH}:</label></dt> - <dd><input style="border: 0;" type="text" class="text full" disabled="disabled" name="unbanlength" id="unbanlength" /></dd> + <dd><input style="border: 0;" type="text" class="text full" readonly="readonly" name="unbanlength" id="unbanlength" /></dd> </dl> <dl> <dt><label for="unbanreason">{L_BAN_REASON}:</label></dt> - <dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbanreason" id="unbanreason" rows="5" cols="80"> </textarea></dd> + <dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbanreason" id="unbanreason" rows="5" cols="80"> </textarea></dd> </dl> <dl> <dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt> - <dd><textarea style="border: 0;" class="text full" disabled="disabled" name="unbangivereason" id="unbangivereason" rows="5" cols="80"> </textarea></dd> + <dd><textarea style="border: 0;" class="text full" readonly="readonly" name="unbangivereason" id="unbangivereason" rows="5" cols="80"> </textarea></dd> </dl> <p class="submit-buttons"> 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/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html index e4fa5dd426..702a4a1099 100644 --- a/phpBB/adm/style/captcha_recaptcha.html +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -4,7 +4,7 @@ <script type="text/javascript"> // <![CDATA[ var RecaptchaOptions = { - lang : '{L_RECAPTCHA_LANG}', + lang : '{LA_RECAPTCHA_LANG}' }; // ]]> </script> |