diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-11-09 11:47:21 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-11-09 11:47:21 +0100 |
| commit | 128eae72171838f689bb1bddba15e0e486325abc (patch) | |
| tree | de3d9415e386c4368e31192ee2600e3980200a1d /phpBB/adm/style | |
| parent | 5d37c171c2c47be5e718b9a5e961a365c8f02f19 (diff) | |
| parent | 443af0ad5679c054502a0b5a8ec778c1bbd9e9d0 (diff) | |
| download | forums-128eae72171838f689bb1bddba15e0e486325abc.tar forums-128eae72171838f689bb1bddba15e0e486325abc.tar.gz forums-128eae72171838f689bb1bddba15e0e486325abc.tar.bz2 forums-128eae72171838f689bb1bddba15e0e486325abc.tar.xz forums-128eae72171838f689bb1bddba15e0e486325abc.zip | |
Merge remote-tracking branch 'github-p/feature/prune-users' into develop
* github-p/feature/prune-users: (21 commits)
[feature/prune-users] $author_id_sql is no longer needed here.
[feature/prune-users] Move quote to the correct line.
[feature/prune-users] Split one line into two lines for readability.
[feature/prune-users] Use empty for checking array size.
[feature/prune-users] Fix issues with queries pointed out by bantu.
[feature/prune-users] Add spaces inside brackets.
[feature/prune-users] Use a map instead of performing array scans.
[feature/prune-users] Fix incorrect condition when deleting log entries.
[feature/prune-users] Non-cosmetic changes per bantu's review.
[feature/prune-users] Cosmetic changes per bantu's review.
[feature/prune-users] Minor UI adjustment and bug fixes
[feature/prune_users] Moved set_config_count out of user loop.
[feature/prune-users] Fixed user id check in undelivered users loop.
[feature/prune-users] Call sql_is_set once for author ids in user_delete.
[feature/prune-users] Replaced missed occurrences of $user_id with $user_ids.
[feature/prune-users] Call sql_is_set for user ids once in user_delete.
[feature/prune-users] Fixed whitespace in language file.
[feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b.
[feature/prune-users] Adjust some language strings for new features
[feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.
...
Diffstat (limited to 'phpBB/adm/style')
| -rw-r--r-- | phpBB/adm/style/acp_prune_users.html | 29 | ||||
| -rw-r--r-- | phpBB/adm/style/confirm_body_prune.html | 28 |
2 files changed, 44 insertions, 13 deletions
diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 968d307832..4ca562fd32 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -9,7 +9,7 @@ <form id="acp_prune" method="post" action="{U_ACTION}"> <fieldset> - <legend>{L_ACP_PRUNE_USERS}</legend> + <legend>{L_CRITERIA}</legend> <dl> <dt><label for="username">{L_USERNAME}:</label></dt> <dd><input type="text" id="username" name="username" /></dd> @@ -19,8 +19,15 @@ <dd><input type="text" id="email" name="email" /></dd> </dl> <dl> + <dt><label for="email">{L_WEBSITE}:</label></dt> + <dd><input type="text" id="website" name="website" /></dd> +</dl> +<dl> <dt><label for="joined">{L_JOINED}:</label><br /><span>{L_JOINED_EXPLAIN}</span></dt> - <dd><select name="joined_select">{S_JOINED_OPTIONS}</select> <input type="text" id="joined" name="joined" /></dd> + <dd> + <strong>{L_AFTER}</strong> <input type="text" id="joined_after" name="joined_after" /> + <br /> <br /> <strong>{L_BEFORE}</strong> <input type="text" id="joined_before" name="joined_before" /> + </dd> </dl> <dl> <dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt> @@ -31,10 +38,28 @@ <dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd> </dl> <dl> + <dt><label for="posts_on_queue">{L_POSTS_ON_QUEUE}:</label></dt> + <dd><select name="queue_select">{S_COUNT_OPTIONS}</select> <input type="text" id="posts_on_queue" name="posts_on_queue" /></select> +</dl> +<!-- IF S_GROUP_LIST --> +<dl> + <dt><label for="group_id">{L_GROUP}:</label><br /><span>{L_PRUNE_USERS_GROUP_EXPLAIN}</dt> + <dd><select name="group_id">{S_GROUP_LIST}</select></dd> +</dl> +<!-- ENDIF --> +</fieldset> + +<fieldset> + <legend>{L_USERNAMES}</legend> +<dl> <dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt> <dd><textarea id="users" name="users" cols="40" rows="5"></textarea></dd> <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(this.href); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> +</fieldset> + +<fieldset> + <legend>{L_OPTIONS}</legend> <dl> <dt><label for="deleteposts">{L_DELETE_USER_POSTS}:</label><br /><span>{L_DELETE_USER_POSTS_EXPLAIN}</span></dt> <dd><label><input type="radio" class="radio" name="deleteposts" value="1" /> {L_YES}</label> diff --git a/phpBB/adm/style/confirm_body_prune.html b/phpBB/adm/style/confirm_body_prune.html index 9481386231..4c00ac2c3d 100644 --- a/phpBB/adm/style/confirm_body_prune.html +++ b/phpBB/adm/style/confirm_body_prune.html @@ -2,6 +2,23 @@ <form id="confirm" method="post" action="{S_CONFIRM_ACTION}"> +<fieldset id="userlist"> + <h2>{L_PRUNE_USERS_LIST}</h2> + <!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF --> + + <br /> + <!-- BEGIN users --> + » <input type="checkbox" name="user_ids[]" value="{users.USER_ID}" checked="checked" /> + <a href="{users.U_PROFILE}">{users.USERNAME}</a> + <!-- IF users.U_USER_ADMIN --> [ <a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF --><br /> + <!-- END users --> + <br /> + <span class="small"> + <a href="#" onclick="marklist('userlist', 'user_ids', true)">{L_MARK_ALL}</a> • + <a href="#" onclick="marklist('userlist', 'user_ids', false)">{L_UNMARK_ALL}</a> + </span> +</fieldset> + <fieldset> <h1>{MESSAGE_TITLE}</h1> <p>{MESSAGE_TEXT}</p> @@ -12,17 +29,6 @@ <input type="submit" name="confirm" value="{L_YES}" class="button2" /> <input type="submit" name="cancel" value="{L_NO}" class="button2" /> </div> - - <h2>{L_PRUNE_USERS_LIST}</h2> - <!-- IF S_DEACTIVATE --><p>{L_PRUNE_USERS_LIST_DEACTIVATE}</p><!-- ELSE --><p>{L_PRUNE_USERS_LIST_DELETE}</p><!-- ENDIF --> - - <br /> - <!-- BEGIN users --> - » <a href="{users.U_PROFILE}">{users.USERNAME}</a><!-- IF users.U_USER_ADMIN --> [<a href="{users.U_USER_ADMIN}">{L_USER_ADMIN}</a>]<!-- ENDIF --><br /> - <!-- END users --> - - <br /><br /> - </fieldset> </form> |