diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index adbabb7089..ae4134e95b 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -77,449 +77,23 @@
-
+
-
+
-
-
-
- {L_USER_PROFILE}
-
- {L_UCP_ICQ}:
-
-
-
- {L_UCP_AIM}:
-
-
-
- {L_UCP_MSNM}:
-
-
-
- {L_UCP_YIM}:
-
-
-
- {L_UCP_JABBER}:
-
-
-
- {L_WEBSITE}:
-
-
-
- {L_LOCATION}:
-
-
-
- {L_OCCUPATION}:
- {OCCUPATION}
-
-
- {L_INTERESTS}:
- {INTERESTS}
-
-
- {L_BIRTHDAY}: {L_BIRTHDAY_EXPLAIN}
- {L_DAY}: {S_BIRTHDAY_DAY_OPTIONS} {L_MONTH}: {S_BIRTHDAY_MONTH_OPTIONS} {L_YEAR}: {S_BIRTHDAY_YEAR_OPTIONS}
-
-
-
-
-
- {L_USER_CUSTOM_PROFILE_FIELDS}
-
-
- {profile_fields.LANG_NAME}: {profile_fields.LANG_EXPLAIN}
- {profile_fields.FIELD}
-
- {profile_fields.ERROR}
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
- {L_UCP_PREFS_PERSONAL}
-
- {L_SHOW_EMAIL}:
- id="viewemail" checked="checked" /> {L_YES} id="viewemail" checked="checked" /> {L_NO}
-
-
- {L_ADMIN_EMAIL}:
- id="massemail" checked="checked" /> {L_YES} id="massemail" checked="checked" /> {L_NO}
-
-
- {L_ALLOW_PM}: {L_ALLOW_PM_EXPLAIN}
- id="allowpm" checked="checked" /> {L_YES} id="allowpm" checked="checked" /> {L_NO}
-
-
- {L_HIDE_ONLINE}:
- id="hideonline" checked="checked" /> {L_YES} id="hideonline" checked="checked" /> {L_NO}
-
-
- {L_NOTIFY_METHOD}: {L_NOTIFY_METHOD_EXPLAIN}
- id="notifymethod" checked="checked" /> {L_NOTIFY_METHOD_EMAIL} id="notifymethod" checked="checked" disabled="disabled" /> {L_NOTIFY_METHOD_IM} id="notifymethod" checked="checked" /> {L_NOTIFY_METHOD_BOTH}
-
-
- {L_NOTIFY_ON_PM}:
- id="notifypm" checked="checked" /> {L_YES} id="notifypm" checked="checked" /> {L_NO}
-
-
- {L_POPUP_ON_PM}:
- id="popuppm" checked="checked" /> {L_YES} id="popuppm" checked="checked" />{L_NO}
-
-
- {L_BOARD_LANGUAGE}:
- {S_LANG_OPTIONS}
-
-
- {L_BOARD_STYLE}:
- {S_STYLE_OPTIONS}
-
-
- {L_BOARD_TIMEZONE}:
- {S_TZ_OPTIONS}
-
-
- {L_BOARD_DST}:
- id="dst" checked="checked" /> {L_YES} id="dst" checked="checked" /> {L_NO}
-
-
- {L_BOARD_DATE_FORMAT}: {L_BOARD_DATE_FORMAT_EXPLAIN}
- {S_DATEFORMAT_OPTIONS}
- style="display:none;">
-
-
-
-
- {L_UCP_PREFS_POST}
-
- {L_DEFAULT_BBCODE}:
- id="bbcode" checked="checked" /> {L_YES} id="bbcode" checked="checked" /> {L_NO}
-
-
- {L_DEFAULT_SMILIES}:
- id="smilies" checked="checked" /> {L_YES} id="smilies" checked="checked" /> {L_NO}
-
-
- {L_DEFAULT_ADD_SIG}:
- id="sig" checked="checked" /> {L_YES} id="sig" checked="checked" /> {L_NO}
-
-
- {L_DEFAULT_NOTIFY}:
- id="notify" checked="checked" /> {L_YES} id="notify" checked="checked" /> {L_NO}
-
-
-
-
- {L_UCP_PREFS_VIEW}
-
- {L_VIEW_IMAGES}:
- id="view_images" checked="checked" /> {L_YES} id="view_images" checked="checked" /> {L_NO}
-
-
- {L_VIEW_FLASH}:
- id="view_flash" checked="checked" /> {L_YES} id="view_flash" checked="checked" /> {L_NO}
-
-
- {L_VIEW_SMILIES}:
- id="view_smilies" checked="checked" /> {L_YES} id="view_smilies" checked="checked" /> {L_NO}
-
-
- {L_VIEW_SIGS}:
- id="view_sigs" checked="checked" /> {L_YES} id="view_sigss" checked="checked" /> {L_NO}
-
-
- {L_VIEW_AVATARS}:
- id="view_avatars" checked="checked" /> {L_YES} id="view_avatars" checked="checked" /> {L_NO}
-
-
- {L_DISABLE_CENSORS}:
- id="view_wordcensor" checked="checked" /> {L_YES} id="view_wordcensor" checked="checked" /> {L_NO}
-
-
- {L_VIEW_TOPICS_DAYS}:
- {S_TOPIC_SORT_DAYS}
-
-
- {L_VIEW_TOPICS_KEY}:
- {S_TOPIC_SORT_KEY}
-
-
- {L_VIEW_TOPICS_DIR}:
- {S_TOPIC_SORT_DIR}
-
-
- {L_VIEW_POSTS_DAYS}:
- {S_POST_SORT_DAYS}
-
-
- {L_VIEW_POSTS_KEY}:
- {S_POST_SORT_KEY}
-
-
- {L_VIEW_POSTS_DIR}:
- {S_POST_SORT_DIR}
-
-
-
-
-
-
-
-
+
- enctype="multipart/form-data">
-
-
- {L_ACP_USER_AVATAR}
-
- {L_CURRENT_IMAGE}: {L_AVATAR_EXPLAIN}
- {AVATAR_IMAGE}
- {L_DELETE_AVATAR}
-
-
-
-
- {L_UPLOAD_AVATAR_FILE}:
-
-
-
- {L_UPLOAD_AVATAR_URL}: {L_UPLOAD_AVATAR_URL_EXPLAIN}
-
-
-
-
-
- {L_LINK_REMOTE_AVATAR}: {L_LINK_REMOTE_AVATAR_EXPLAIN}
-
-
-
- {L_LINK_REMOTE_SIZE}: {L_LINK_REMOTE_SIZE_EXPLAIN}
- px X px
-
-
-
-
- {L_AVATAR_GALLERY}:
-
-
-
-
-
-
-
- {L_AVATAR_GALLERY}
-
- {L_AVATAR_CATEGORY}:
- {S_CAT_OPTIONS}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -541,112 +115,7 @@
-
-
-
-
-
-
-
- {L_ADMIN_SIG_PREVIEW}
- {SIGNATURE_PREVIEW}
-
-
-
-
- {L_SIGNATURE}
- {L_SIGNATURE_EXPLAIN}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {L_FONT_SIZE}:
- {L_FONT_TINY}
- {L_FONT_SMALL}
- {L_FONT_NORMAL}
- {L_FONT_LARGE}
- {L_FONT_HUGE}
-
-
-
-
- onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" />
-
-
-
-
-
- {SIGNATURE}
-
-
-
- {L_DISABLE_BBCODE}
-
-
- {L_DISABLE_SMILIES}
-
-
- {L_DISABLE_MAGIC_URL}
-
- {L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
-
-
-
-
-
-
-
-
-
+
diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html
new file mode 100644
index 0000000000..6fc8ef46bb
--- /dev/null
+++ b/phpBB/adm/style/acp_users_avatar.html
@@ -0,0 +1,75 @@
+ enctype="multipart/form-data">
+
+
+ {L_ACP_USER_AVATAR}
+
+ {L_CURRENT_IMAGE}: {L_AVATAR_EXPLAIN}
+ {AVATAR_IMAGE}
+ {L_DELETE_AVATAR}
+
+
+
+
+ {L_UPLOAD_AVATAR_FILE}:
+
+
+
+ {L_UPLOAD_AVATAR_URL}: {L_UPLOAD_AVATAR_URL_EXPLAIN}
+
+
+
+
+
+ {L_LINK_REMOTE_AVATAR}: {L_LINK_REMOTE_AVATAR_EXPLAIN}
+
+
+
+ {L_LINK_REMOTE_SIZE}: {L_LINK_REMOTE_SIZE_EXPLAIN}
+ px X px
+
+
+
+
+ {L_AVATAR_GALLERY}:
+
+
+
+
+
+
+
+ {L_AVATAR_GALLERY}
+
+ {L_AVATAR_CATEGORY}:
+ {S_CAT_OPTIONS}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html
new file mode 100644
index 0000000000..0f64888170
--- /dev/null
+++ b/phpBB/adm/style/acp_users_feedback.html
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {L_DISPLAY_LOG}: {S_LIMIT_DAYS} {L_SORT_BY}: {S_SORT_KEY} {S_SORT_DIR}
+
+
+
+
+
+
+
+
+
+
+
+ {L_MARK_ALL} • {L_UNMARK_ALL}
+
+
+
+ {L_ADD_FEEDBACK}
+
+ {L_ADD_FEEDBACK_EXPLAIN}
+
+
+ {L_ACP_USER_FEEDBACK}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html
new file mode 100644
index 0000000000..cfdc364b48
--- /dev/null
+++ b/phpBB/adm/style/acp_users_overview.html
@@ -0,0 +1,82 @@
+
+
+
+ {L_ACP_USER_OVERVIEW}
+
+ {L_USERNAME}: {L_NAME_CHARS_EXPLAIN}
+
+ [ {L_USE_PERMISSIONS} ]
+
+
+
+ {L_USER_IS_INACTIVE}:
+ {USER_INACTIVE_REASON}
+
+
+
+ {L_REGISTERED}:
+ {USER_REGISTERED}
+
+
+
+ {L_REGISTERED_IP}:
+ {REGISTERED_IP}
+ [ {L_WHOIS} ]
+
+
+
+ {L_LAST_ACTIVE}:
+ {USER_LASTACTIVE}
+
+
+ {L_POSTS}:
+ {USER_POSTS}
+
+
+ {L_WARNINGS}:
+ {USER_WARNINGS}
+
+
+ {L_FOUNDER}: {L_FOUNDER_EXPLAIN}
+ id="user_founder" checked="checked" disabled="disabled" /> {L_YES} id="user_founder" checked="checked" disabled="disabled" /> {L_NO}
+
+
+ {L_EMAIL}:
+
+
+
+ {L_CONFIRM_EMAIL}: {L_CONFIRM_EMAIL_EXPLAIN}
+
+
+
+ {L_NEW_PASSWORD}: {L_CHANGE_PASSWORD_EXPLAIN}
+
+
+
+ {L_CONFIRM_PASSWORD}: {L_CONFIRM_PASSWORD_EXPLAIN}
+
+
+
+
+
+
+ {L_USER_TOOLS}
+
+ {L_QUICK_TOOLS}:
+ {S_ACTION_OPTIONS}
+
+
+
+ {L_DELETE_USER}: {L_DELETE_USER_EXPLAIN}
+
+ {L_RETAIN_POSTS} {L_DELETE_POSTS}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html
new file mode 100644
index 0000000000..3a0d244d43
--- /dev/null
+++ b/phpBB/adm/style/acp_users_prefs.html
@@ -0,0 +1,132 @@
+
+
+
+ {L_UCP_PREFS_PERSONAL}
+
+ {L_SHOW_EMAIL}:
+ id="viewemail" checked="checked" /> {L_YES} id="viewemail" checked="checked" /> {L_NO}
+
+
+ {L_ADMIN_EMAIL}:
+ id="massemail" checked="checked" /> {L_YES} id="massemail" checked="checked" /> {L_NO}
+
+
+ {L_ALLOW_PM}: {L_ALLOW_PM_EXPLAIN}
+ id="allowpm" checked="checked" /> {L_YES} id="allowpm" checked="checked" /> {L_NO}
+
+
+ {L_HIDE_ONLINE}:
+ id="hideonline" checked="checked" /> {L_YES} id="hideonline" checked="checked" /> {L_NO}
+
+
+ {L_NOTIFY_METHOD}: {L_NOTIFY_METHOD_EXPLAIN}
+ id="notifymethod" checked="checked" /> {L_NOTIFY_METHOD_EMAIL} id="notifymethod" checked="checked" disabled="disabled" /> {L_NOTIFY_METHOD_IM} id="notifymethod" checked="checked" /> {L_NOTIFY_METHOD_BOTH}
+
+
+ {L_NOTIFY_ON_PM}:
+ id="notifypm" checked="checked" /> {L_YES} id="notifypm" checked="checked" /> {L_NO}
+
+
+ {L_POPUP_ON_PM}:
+ id="popuppm" checked="checked" /> {L_YES} id="popuppm" checked="checked" />{L_NO}
+
+
+ {L_BOARD_LANGUAGE}:
+ {S_LANG_OPTIONS}
+
+
+ {L_BOARD_STYLE}:
+ {S_STYLE_OPTIONS}
+
+
+ {L_BOARD_TIMEZONE}:
+ {S_TZ_OPTIONS}
+
+
+ {L_BOARD_DST}:
+ id="dst" checked="checked" /> {L_YES} id="dst" checked="checked" /> {L_NO}
+
+
+ {L_BOARD_DATE_FORMAT}: {L_BOARD_DATE_FORMAT_EXPLAIN}
+ {S_DATEFORMAT_OPTIONS}
+ style="display:none;">
+
+
+
+
+ {L_UCP_PREFS_POST}
+
+ {L_DEFAULT_BBCODE}:
+ id="bbcode" checked="checked" /> {L_YES} id="bbcode" checked="checked" /> {L_NO}
+
+
+ {L_DEFAULT_SMILIES}:
+ id="smilies" checked="checked" /> {L_YES} id="smilies" checked="checked" /> {L_NO}
+
+
+ {L_DEFAULT_ADD_SIG}:
+ id="sig" checked="checked" /> {L_YES} id="sig" checked="checked" /> {L_NO}
+
+
+ {L_DEFAULT_NOTIFY}:
+ id="notify" checked="checked" /> {L_YES} id="notify" checked="checked" /> {L_NO}
+
+
+
+
+ {L_UCP_PREFS_VIEW}
+
+ {L_VIEW_IMAGES}:
+ id="view_images" checked="checked" /> {L_YES} id="view_images" checked="checked" /> {L_NO}
+
+
+ {L_VIEW_FLASH}:
+ id="view_flash" checked="checked" /> {L_YES} id="view_flash" checked="checked" /> {L_NO}
+
+
+ {L_VIEW_SMILIES}:
+ id="view_smilies" checked="checked" /> {L_YES} id="view_smilies" checked="checked" /> {L_NO}
+
+
+ {L_VIEW_SIGS}:
+ id="view_sigs" checked="checked" /> {L_YES} id="view_sigss" checked="checked" /> {L_NO}
+
+
+ {L_VIEW_AVATARS}:
+ id="view_avatars" checked="checked" /> {L_YES} id="view_avatars" checked="checked" /> {L_NO}
+
+
+ {L_DISABLE_CENSORS}:
+ id="view_wordcensor" checked="checked" /> {L_YES} id="view_wordcensor" checked="checked" /> {L_NO}
+
+
+ {L_VIEW_TOPICS_DAYS}:
+ {S_TOPIC_SORT_DAYS}
+
+
+ {L_VIEW_TOPICS_KEY}:
+ {S_TOPIC_SORT_KEY}
+
+
+ {L_VIEW_TOPICS_DIR}:
+ {S_TOPIC_SORT_DIR}
+
+
+ {L_VIEW_POSTS_DAYS}:
+ {S_POST_SORT_DAYS}
+
+
+ {L_VIEW_POSTS_KEY}:
+ {S_POST_SORT_KEY}
+
+
+ {L_VIEW_POSTS_DIR}:
+ {S_POST_SORT_DIR}
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html
new file mode 100644
index 0000000000..69edb1159b
--- /dev/null
+++ b/phpBB/adm/style/acp_users_profile.html
@@ -0,0 +1,66 @@
+
+
+
+ {L_USER_PROFILE}
+
+ {L_UCP_ICQ}:
+
+
+
+ {L_UCP_AIM}:
+
+
+
+ {L_UCP_MSNM}:
+
+
+
+ {L_UCP_YIM}:
+
+
+
+ {L_UCP_JABBER}:
+
+
+
+ {L_WEBSITE}:
+
+
+
+ {L_LOCATION}:
+
+
+
+ {L_OCCUPATION}:
+ {OCCUPATION}
+
+
+ {L_INTERESTS}:
+ {INTERESTS}
+
+
+ {L_BIRTHDAY}: {L_BIRTHDAY_EXPLAIN}
+ {L_DAY}: {S_BIRTHDAY_DAY_OPTIONS} {L_MONTH}: {S_BIRTHDAY_MONTH_OPTIONS} {L_YEAR}: {S_BIRTHDAY_YEAR_OPTIONS}
+
+
+
+
+
+ {L_USER_CUSTOM_PROFILE_FIELDS}
+
+
+ {profile_fields.LANG_NAME}: {profile_fields.LANG_EXPLAIN}
+ {profile_fields.FIELD}
+
+ {profile_fields.ERROR}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html
new file mode 100644
index 0000000000..3c66e52662
--- /dev/null
+++ b/phpBB/adm/style/acp_users_signature.html
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+ {L_ADMIN_SIG_PREVIEW}
+ {SIGNATURE_PREVIEW}
+
+
+
+
+ {L_SIGNATURE}
+ {L_SIGNATURE_EXPLAIN}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {L_FONT_SIZE}:
+ {L_FONT_TINY}
+ {L_FONT_SMALL}
+ {L_FONT_NORMAL}
+ {L_FONT_LARGE}
+ {L_FONT_HUGE}
+
+
+
+
+ onmouseover="helpline('cb_{custom_tags.BBCODE_ID}')" />
+
+
+
+
+
+ {SIGNATURE}
+
+
+
+ {L_DISABLE_BBCODE}
+
+
+ {L_DISABLE_SMILIES}
+
+
+ {L_DISABLE_MAGIC_URL}
+
+ {L_OPTIONS}: {BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS}
+
+
+
+
+
+
+
+
+
\ No newline at end of file