diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 14:17:56 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-04-10 14:17:56 -0400 |
| commit | 2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28 (patch) | |
| tree | 665c0c3ca9ffb24b9dbbf53d25df094c138bb74f /phpBB/adm | |
| parent | 8a54d8850932a22c9d808973572b29d82a7a2dd2 (diff) | |
| parent | d3b5df2548446c76e94e41837abc8b5a8d034b42 (diff) | |
| download | forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.tar forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.tar.gz forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.tar.bz2 forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.tar.xz forums-2d3dcd43c58fe2e28fafcb6738e45c8632b2ff28.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9581] Fix missing index
[ticket/9581] Slightly tweaked queries
[ticket/9581] Make banlist table select optional
[ticket/9581] Mass e-mail to banned users
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_email.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index 885809ffe2..ff52500dca 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -39,6 +39,10 @@ <dd><select id="priority" name="mail_priority_flag">{S_PRIORITY_OPTIONS}</select></dd> </dl> <dl> + <dt><label for="banned">{L_MAIL_BANNED}:</label><br /><span>{L_MAIL_BANNED_EXPLAIN}</span></dt> + <dd><input id="banned" name="mail_banned_flag" type="checkbox" class="radio" /></dd> +</dl> +<dl> <dt><label for="send">{L_SEND_IMMEDIATELY}:</label></dt> <dd><input id="send" type="checkbox" class="radio" name="send_immediately" checked="checked" /></dd> </dl> |