diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-06 15:31:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-05-06 15:31:39 +0000 |
| commit | 6205be1e746dd51dface756fbeb8b7fc702e1d80 (patch) | |
| tree | 5f6fc8a6fa8bc8f13d5511a3f8ac4bb148d60b5e /phpBB | |
| parent | 1e74ea85c5eebf9de7d29b1816ed5f8d9a02d638 (diff) | |
| download | forums-6205be1e746dd51dface756fbeb8b7fc702e1d80.tar forums-6205be1e746dd51dface756fbeb8b7fc702e1d80.tar.gz forums-6205be1e746dd51dface756fbeb8b7fc702e1d80.tar.bz2 forums-6205be1e746dd51dface756fbeb8b7fc702e1d80.tar.xz forums-6205be1e746dd51dface756fbeb8b7fc702e1d80.zip | |
#9828, #10545, #10541, #10533, #10529, #10527, #10521, #10503, #10481
- more label fixes
- simpler approach to get input cursor text
git-svn-id: file:///svn/phpbb/trunk@7485 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
42 files changed, 177 insertions, 177 deletions
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 1c7dc40b25..8066d90eca 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -174,7 +174,7 @@ <legend>{L_LEGEND}</legend> <dl> <dt><label for="group_name">{L_GROUP_NAME}:</label></dt> - <dd><input type="text" class="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd> + <dd><input type="text" id="group_name" size="20" maxlength="100" name="group_name" value="{GROUP_NAME}" /></dd> </dl> <dl> <dt><label for="category">{L_SPECIAL_CATEGORY}:</label><br /><span>{L_SPECIAL_CATEGORY_EXPLAIN}</span></dt> @@ -197,7 +197,7 @@ </dl> <dl> <dt><label for="extgroup_filesize">{L_MAX_EXTGROUP_FILESIZE}:</label></dt> - <dd><input type="text" class="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd> + <dd><input type="text" id="extgroup_filesize" size="3" maxlength="15" name="max_filesize" value="{EXTGROUP_FILESIZE}" /> <select name="size_select">{S_EXT_GROUP_SIZE_OPTIONS}</select></dd> </dl> <dl> <dt><label for="assigned_extensions">{L_ASSIGNED_EXTENSIONS}:</label></dt> @@ -253,7 +253,7 @@ </tbody> </table> <p class="quick"> - {L_CREATE_GROUP}: <input type="text" class="text" name="group_name" maxlength="30" /> + {L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" /> <input class="button2" name="add" type="submit" value="{L_SUBMIT}" /> </p> </fieldset> @@ -268,7 +268,7 @@ <legend>{L_ADD_EXTENSION}</legend> <dl> <dt><label for="add_extension">{L_EXTENSION}</label></dt> - <dd><input type="text" class="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd> + <dd><input type="text" id="add_extension" size="20" maxlength="100" name="add_extension" value="{ADD_EXTENSION}" /></dd> </dl> <dl> <dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt> @@ -346,7 +346,7 @@ <td><a href="{orphan.U_FILE}">{orphan.REAL_FILENAME}</a></td> <td>{orphan.FILETIME}</td> <td>{orphan.FILESIZE}</td> - <td><b>ID: </b><input type="text" class="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td> + <td><b>ID: </b><input type="text" name="post_id[{orphan.ATTACH_ID}]" size="7" maxlength="10" value="{orphan.POST_ID}" /></td> <td><input type="checkbox" class="radio" name="add[{orphan.ATTACH_ID}]" /></td> <td><input type="checkbox" class="radio" name="delete[{orphan.ATTACH_ID}]" /></td> </tr> diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index e196c697ac..4370b5e225 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -35,7 +35,7 @@ <p>{L_BBCODE_HELPLINE_EXPLAIN}</p> <dl> <dt><label for="bbcode_helpline">{L_BBCODE_HELPLINE_TEXT}</label></dt> - <dd><input type="text" class="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd> + <dd><input type="text" id="bbcode_helpline" name="bbcode_helpline" size="60" maxlength="255" value="{BBCODE_HELPLINE}" /></dd> </dl> </fieldset> diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index 25c5418479..6b531f545e 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -23,7 +23,7 @@ <legend>{L_TITLE}</legend> <dl> <dt><label for="bot_name">{L_BOT_NAME}:</label><br /><span>{L_BOT_NAME_EXPLAIN}</span></dt> - <dd><input name="bot_name" type="text" class="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd> + <dd><input name="bot_name" type="text" id="bot_name" value="{BOT_NAME}" maxlength="255" /></dd> </dl> <dl> <dt><label for="bot_style">{L_BOT_STYLE}:</label><br /><span>{L_BOT_STYLE_EXPLAIN}</span></dt> @@ -39,11 +39,11 @@ </dl> <dl> <dt><label for="bot_agent">{L_BOT_AGENT}:</label><br /><span>{L_BOT_AGENT_EXPLAIN}</span></dt> - <dd><input name="bot_agent" type="text" class="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd> + <dd><input name="bot_agent" type="text" id="bot_agent" value="{BOT_AGENT}" maxlength="255" /></dd> </dl> <dl> <dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt> - <dd><input name="bot_ip" type="text" class="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd> + <dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" maxlength="255" /></dd> </dl> <p class="submit-buttons"> diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index b16f5c907f..5744136230 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -28,7 +28,7 @@ </dl> <dl> <dt><label for="subject">{L_SUBJECT}:</label></dt> - <dd><input name="subject" type="text" class="text" id="subject" value="{SUBJECT}" /></dd> + <dd><input name="subject" type="text" id="subject" value="{SUBJECT}" /></dd> </dl> <dl> <dt><label for="message">{L_MASS_MESSAGE}:</label><br /><span>{L_MASS_MESSAGE_EXPLAIN}</span></dt> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 08a3a45f83..b5b2dcabcb 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -148,7 +148,9 @@ <dl> <dt><label for="forum_desc">{L_FORUM_DESC}:</label><br /><span>{L_FORUM_DESC_EXPLAIN}</span></dt> <dd><textarea id="forum_desc" name="forum_desc" rows="5" cols="45">{FORUM_DESC}</textarea></dd> - <dd><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd> + <dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label> + <label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label> + <label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd> </dl> <dl> <dt><label for="forum_image">{L_FORUM_IMAGE}:</label><br /><span>{L_FORUM_IMAGE_EXPLAIN}</span></dt> @@ -159,11 +161,11 @@ </dl> <dl> <dt><label for="forum_password">{L_FORUM_PASSWORD}:</label><br /><span>{L_FORUM_PASSWORD_EXPLAIN}</span></dt> - <dd><input type="password" class="text" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" maxlength="40" /></dd> + <dd><input type="password" id="forum_password" name="forum_password" value="{FORUM_PASSWORD}" maxlength="40" /></dd> </dl> <dl> <dt><label for="forum_password_confirm">{L_FORUM_PASSWORD_CONFIRM}:</label><br /><span>{L_FORUM_PASSWORD_CONFIRM_EXPLAIN}</span></dt> - <dd><input type="password" class="text" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></dd> + <dd><input type="password" id="forum_password_confirm" name="forum_password_confirm" value="{FORUM_PASSWORD_CONFIRM}" /></dd> </dl> <dl> <dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt> @@ -220,7 +222,7 @@ </dl> <dl> <dt><label for="topics_per_page">{L_FORUM_TOPICS_PAGE}:</label><br /><span>{L_FORUM_TOPICS_PAGE_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd> + <dd><input type="text" id="topics_per_page" name="topics_per_page" value="{TOPICS_PER_PAGE}" size="4" maxlength="4" /></dd> </dl> </fieldset> @@ -233,15 +235,15 @@ </dl> <dl> <dt><label for="prune_freq">{L_AUTO_PRUNE_FREQ}:</label><br /><span>{L_AUTO_PRUNE_FREQ_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd> + <dd><input type="text" id="prune_freq" name="prune_freq" value="{PRUNE_FREQ}" maxlength="4" size="4" /> {L_DAYS}</dd> </dl> <dl> <dt><label for="prune_days">{L_AUTO_PRUNE_DAYS}:</label><br /><span>{L_AUTO_PRUNE_DAYS_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd> + <dd><input type="text" id="prune_days" name="prune_days" value="{PRUNE_DAYS}" maxlength="4" size="4" /> {L_DAYS}</dd> </dl> <dl> <dt><label for="prune_viewed">{L_AUTO_PRUNE_VIEWED}:</label><br /><span>{L_AUTO_PRUNE_VIEWED_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd> + <dd><input type="text" id="prune_viewed" name="prune_viewed" value="{PRUNE_VIEWED}" maxlength="4" size="4" /> {L_DAYS}</dd> </dl> <dl> <dt><label for="prune_old_polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt> @@ -297,7 +299,9 @@ <dl> <dt><label for="forum_rules">{L_FORUM_RULES}:</label><br /><span>{L_FORUM_RULES_EXPLAIN}</span></dt> <dd><textarea id="forum_rules" name="forum_rules" rows="4" cols="70">{FORUM_RULES_PLAIN}</textarea></dd> - <dd><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} <input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} <input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd> + <dd><label><input type="checkbox" class="radio" name="rules_parse_bbcode"<!-- IF S_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label> + <label><input type="checkbox" class="radio" name="rules_parse_smilies"<!-- IF S_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label> + <label><input type="checkbox" class="radio" name="rules_parse_urls"<!-- IF S_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd> </dl> </fieldset> </div> @@ -475,7 +479,7 @@ <fieldset class="quick"> <input type="hidden" name="action" value="add" /> - <input type="text" class="text" name="forum_name" value="" maxlength="255" /> + <input type="text" name="forum_name" value="" maxlength="255" /> <input class="button2" name="addforum" type="submit" value="{L_CREATE_FORUM}" /> </fieldset> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 446ca31040..3e98e5de4c 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -28,7 +28,9 @@ <dl> <dt><label for="group_desc">{L_GROUP_DESC}:</label></dt> <dd><textarea id="group_desc" name="group_desc" rows="5" cols="45">{GROUP_DESC}</textarea></dd> - <dd><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE} <input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES} <input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</dd> + <dd><label><input type="checkbox" class="radio" name="desc_parse_bbcode"<!-- IF S_DESC_BBCODE_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_BBCODE}</label> + <label><input type="checkbox" class="radio" name="desc_parse_smilies"<!-- IF S_DESC_SMILIES_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_SMILIES}</label> + <label><input type="checkbox" class="radio" name="desc_parse_urls"<!-- IF S_DESC_URLS_CHECKED --> checked="checked"<!-- ENDIF --> /> {L_PARSE_URLS}</label></dd> </dl> <!-- IF not S_SPECIAL_GROUP --> <dl> @@ -70,11 +72,11 @@ </dl> <dl> <dt><label for="group_message_limit">{L_GROUP_MESSAGE_LIMIT}:</label><br /><span>{L_GROUP_MESSAGE_LIMIT_EXPLAIN}</span></dt> - <dd><input name="group_message_limit" type="text" class="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd> + <dd><input name="group_message_limit" type="text" id="group_message_limit" maxlength="4" size="4" value="{GROUP_MESSAGE_LIMIT}" /></dd> </dl> <dl> <dt><label for="group_colour">{L_GROUP_COLOR}:</label><br /><span>{L_GROUP_COLOR_EXPLAIN}</span></dt> - <dd><input name="group_colour" type="text" class="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /> <span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> + <dd><input name="group_colour" type="text" id="group_colour" value="{GROUP_COLOUR}" size="6" maxlength="6" /> <span>[ <a href="#" onclick="swatch(); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> </dl> <dl> <dt><label for="group_rank">{L_GROUP_RANK}:</label></dt> @@ -87,7 +89,7 @@ <dl> <dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> <dd>{AVATAR_IMAGE}</dd> - <dd><input type="checkbox" class="radio" name="delete" /> <span>{L_DELETE_AVATAR}</span></dd> + <dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd> </dl> <!-- IF not S_IN_AVATAR_GALLERY --> <!-- IF S_CAN_UPLOAD --> @@ -97,16 +99,16 @@ </dl> <dl> <dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> - <dd><input name="uploadurl" type="text" class="text" id="uploadurl" value="" /></dd> + <dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd> </dl> <!-- ENDIF --> <dl> <dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> - <dd><input name="remotelink" type="text" class="text" id="remotelink" value="" /></dd> + <dd><input name="remotelink" type="text" id="remotelink" value="" /></dd> </dl> <dl> <dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> - <dd><input name="width" type="text" class="text text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></dd> + <dd><input name="width" type="text" id="width" size="3" value="{AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{AVATAR_HEIGHT}" /> <span>px</span></dd> </dl> <!-- IF S_DISPLAY_GALLERY --> <dl> @@ -304,7 +306,7 @@ <fieldset class="quick"> <!-- IF S_GROUP_ADD --> - {L_CREATE_GROUP}: <input type="text" class="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" /> + {L_CREATE_GROUP}: <input type="text" name="group_name" value="" /> <input class="button2" type="submit" name="submit" value="{L_SUBMIT}" /> <input type="hidden" name="add" value="1" /> <!-- ENDIF --> </fieldset> diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 2ceb0e5a69..1f14b7044b 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -24,27 +24,27 @@ </dl> <dl> <dt><label for="jab_host">{L_JAB_SERVER}:</label><br /><span>{L_JAB_SERVER_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd> + <dd><input type="text" id="jab_host" name="jab_host" value="{JAB_HOST}" /></dd> </dl> <dl> <dt><label for="jab_port">{L_JAB_PORT}:</label><br /><span>{L_JAB_PORT_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd> + <dd><input type="text" id="jab_port" name="jab_port" value="{JAB_PORT}" maxlength="5" size="5" /></dd> </dl> <dl> <dt><label for="jab_username">{L_JAB_USERNAME}:</label><br /><span>{L_JAB_USERNAME_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd> + <dd><input type="text" id="jab_username" name="jab_username" value="{JAB_USERNAME}" /></dd> </dl> <dl> <dt><label for="jab_password">{L_JAB_PASSWORD}:</label></dt> - <dd><input type="password" class="text" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd> + <dd><input type="password" id="jab_password" name="jab_password" value="{JAB_PASSWORD}" /></dd> </dl> <dl> <dt><label for="jab_resource">{L_JAB_RESOURCE}:</label><br /><span>{L_JAB_RESOURCE_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="jab_resource" name="jab_resource" value="{JAB_RESOURCE}" /></dd> + <dd><input type="text" id="jab_resource" name="jab_resource" value="{JAB_RESOURCE}" /></dd> </dl> <dl> <dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd> + <dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" maxlength="5" size="5" /></dd> </dl> <p class="submit-buttons"> diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 2b9e541e6a..d15f722e98 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -36,11 +36,11 @@ <legend>{LANG_LOCAL_NAME}</legend> <dl> <dt><label for="lang_english_name">{L_LANG_ENGLISH_NAME}:</label></dt> - <dd><input type="text" class="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd> + <dd><input type="text" id="lang_english_name" name="lang_english_name" value="{LANG_ENGLISH_NAME}" maxlength="100" /></dd> </dl> <dl> <dt><label for="lang_local_name">{L_LANG_LOCAL_NAME}:</label></dt> - <dd><input type="text" class="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd> + <dd><input type="text" id="lang_local_name" name="lang_local_name" value="{LANG_LOCAL_NAME}" maxlength="255" /></dd> </dl> <dl> <dt><label>{L_LANG_ISO_CODE}:</label></dt> @@ -48,7 +48,7 @@ </dl> <dl> <dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt> - <dd><input type="text" class="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd> + <dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" maxlength="255" /></dd> </dl> <p class="quick" style="margin-top: -15px;"> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 40d052bc2a..d241119fb6 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -192,7 +192,7 @@ <input type="hidden" name="action" value="add" /> <input type="hidden" name="module_parent_id" value="{PARENT_ID}" /> - <input type="text" class="text" name="module_langname" maxlength="255" /> + <input type="text" name="module_langname" maxlength="255" /> <input class="button2" name="addmodule" type="submit" value="{L_CREATE_MODULE}" /> </fieldset> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 593c43b965..d70533bd94 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -37,7 +37,7 @@ <legend>{L_ROLE_DETAILS}</legend> <dl> <dt><label for="role_name">{L_ROLE_NAME}:</label></dt> - <dd><input name="role_name" type="text" class="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd> + <dd><input name="role_name" type="text" id="role_name" value="{ROLE_NAME}" maxlength="255" /></dd> </dl> <dl> <dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt> @@ -181,7 +181,7 @@ </table> <fieldset class="quick"> - {L_CREATE_ROLE}: <input type="text" class="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br /> + {L_CREATE_ROLE}: <input type="text" name="role_name" value="" maxlength="255" /><!-- IF S_ROLE_OPTIONS --> <select name="options_from"><option value="0" selected="selected">{L_CREATE_ROLE_FROM}</option>{S_ROLE_OPTIONS}</select><!-- ENDIF --> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /><br /> </fieldset> </form> diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 0f1583fd39..9097bf1e61 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -30,7 +30,7 @@ <dl> <dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt> <dd><select id="forum" name="forum_id[]"<!-- IF S_FORUM_MULTIPLE --> multiple="multiple"<!-- ENDIF --> size="10">{S_FORUM_OPTIONS}</select></dd> - <!-- IF S_FORUM_ALL --><dd><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</dd><!-- ENDIF --> + <!-- IF S_FORUM_ALL --><dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd><!-- ENDIF --> </dl> <p class="quick"> @@ -75,7 +75,7 @@ <dt><label for="username">{L_FIND_USERNAME}:</label></dt> <dd><input class="text medium" type="text" id="username" name="username[]" /></dd> <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> - <dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</dd> + <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> <p class="quick"> @@ -120,7 +120,7 @@ <legend>{L_MANAGE_USERS}</legend> <dl> <dd class="full"><select style="width: 100%;" name="user_id[]" multiple="multiple" size="5">{S_DEFINED_USER_OPTIONS}</select></dd> - <!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</dd><!-- ENDIF --> + <!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_users" value="1" /> {L_ALL_USERS}</label></dd><!-- ENDIF --> </dl> </fieldset> @@ -132,13 +132,13 @@ </form> <form id="add_user" method="post" action="{U_ACTION}"> - + <fieldset> <legend>{L_ADD_USERS}</legend> <p>{L_USERNAMES_EXPLAIN}</p> <dl> <dd class="full"><textarea id="username" name="usernames" rows="5" cols="5" style="width: 100%; height: 60px;"></textarea></dd> - <dd class="full" style="text-align: left;"><div style="float: right;">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</div><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</dd> + <dd class="full" style="text-align: left;"><div style="float: right;">[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</div><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> </fieldset> @@ -165,7 +165,7 @@ <legend>{L_MANAGE_GROUPS}</legend> <dl> <dd class="full"><select style="width: 100%;" name="group_id[]" multiple="multiple" size="5">{S_DEFINED_GROUP_OPTIONS}</select></dd> - <!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</dd><!-- ENDIF --> + <!-- IF S_ALLOW_ALL_SELECT --><dd class="full" style="text-align: right;"><label><input type="checkbox" class="radio" name="all_groups" value="1" /> {L_ALL_GROUPS}</label></dd><!-- ENDIF --> </dl> </fieldset> @@ -224,9 +224,9 @@ <legend>{L_LOOK_UP_USER}</legend> <dl> <dt><label for="username">{L_FIND_USERNAME}:</label></dt> - <dd><input type="text" class="text" id="username" name="username[]" /></dd> + <dd><input type="text" id="username" name="username[]" /></dd> <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> - <dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</dd> + <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> </fieldset> diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 9831384533..ad8d987a02 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -45,7 +45,7 @@ <dl> <dt><label for="forum">{L_LOOK_UP_FORUM}:</label></dt> <dd><select name="f[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></dd> - <dd><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</dd> + <dd><label><input type="checkbox" class="radio" name="all_forums" value="1" /> {L_ALL_FORUMS}</label></dd> </dl> <p class="quick"> @@ -73,11 +73,11 @@ <legend>{L_FORUM_PRUNE}</legend> <dl> <dt><label for="prune_days">{L_PRUNE_NOT_POSTED}:</label></dt> - <dd><input type="text" class="text" id="prune_days" name="prune_days" /></dd> + <dd><input type="text" id="prune_days" name="prune_days" /></dd> </dl> <dl> <dt><label for="prune_vieweddays">{L_PRUNE_NOT_VIEWED}:</label></dt> - <dd><input type="text" class="text" id="prune_vieweddays" name="prune_vieweddays" /></dd> + <dd><input type="text" id="prune_vieweddays" name="prune_vieweddays" /></dd> </dl> <dl> <dt><label for="polls">{L_PRUNE_OLD_POLLS}:</label><br /><span>{L_PRUNE_OLD_POLLS_EXPLAIN}</span></dt> diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index 8f1d03ec7a..1300ddffb2 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -12,23 +12,23 @@ <legend>{L_ACP_PRUNE_USERS}</legend> <dl> <dt><label for="username">{L_USERNAME}:</label></dt> - <dd><input type="text" class="text" id="username" name="username" /></dd> + <dd><input type="text" id="username" name="username" /></dd> </dl> <dl> <dt><label for="email">{L_EMAIL}:</label></dt> - <dd><input type="text" class="text" id="email" name="email" /></dd> + <dd><input type="text" id="email" name="email" /></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" class="text" id="joined" name="joined" /></dd> + <dd><select name="joined_select">{S_JOINED_OPTIONS}</select> <input type="text" id="joined" name="joined" /></dd> </dl> <dl> <dt><label for="active">{L_LAST_ACTIVE}:</label><br /><span>{L_LAST_ACTIVE_EXPLAIN}</span></dt> - <dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" class="text" id="active" name="active" /></dd> + <dd><select name="active_select">{S_ACTIVE_OPTIONS}</select> <input type="text" id="active" name="active" /></dd> </dl> <dl> <dt><label for="count">{L_POSTS}:</label></dt> - <dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" class="text" id="count" name="count" /></dd> + <dd><select name="count_select">{S_COUNT_OPTIONS}</select> <input type="text" id="count" name="count" /></dd> </dl> <dl> <dt><label for="users">{L_ACP_PRUNE_USERS}:</label><br /><span>{L_SELECT_USERS_EXPLAIN}</span></dt> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index 017def30a6..a8d496e257 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -26,7 +26,7 @@ <legend>{L_ACP_RANKS}</legend> <dl> <dt><label for="title">{L_RANK_TITLE}:</label></dt> - <dd><input name="title" type="text" class="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd> + <dd><input name="title" type="text" id="title" value="{RANK_TITLE}" maxlength="255" /></dd> </dl> <dl> <dt><label for="rank_image">{L_RANK_IMAGE}:</label></dt> @@ -41,7 +41,7 @@ <!-- IF S_SPECIAL_RANK --><div id="posts" style="display: none;"><!-- ELSE --><div id="posts"><!-- ENDIF --> <dl> <dt><label for="min_posts">{L_RANK_MINIMUM}:</label></dt> - <dd><input name="min_posts" type="text" class="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd> + <dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd> </dl> </div> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index 8ed536aea1..e10cc1d1ca 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -30,7 +30,7 @@ <p><!-- IF S_TRANSLATED -->{L_IS_TRANSLATED_EXPLAIN}<!-- ELSE -->{L_IS_NOT_TRANSLATED_EXPLAIN}<!-- ENDIF --></p> <dl> <dt><label for="reason_title">{L_REASON_TITLE}:</label></dt> - <dd><input name="reason_title" type="text" class="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd> + <dd><input name="reason_title" type="text" id="reason_title" value="{REASON_TITLE}" maxlength="255" /></dd> </dl> <!-- IF S_TRANSLATED --> <dl> @@ -114,7 +114,7 @@ <p class="quick"> <input type="hidden" name="action" value="add" /> - <input type="text" class="text" name="reason_title" /> + <input type="text" name="reason_title" /> <input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" /> </p> </fieldset> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index f38b0e724f..8d0ad2f07c 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -18,23 +18,23 @@ </dl> <dl> <dt><label for="search_interval">{L_SEARCH_INTERVAL}:</label><br /><span>{L_SEARCH_INTERVAL_EXPLAIN}</span></dt> - <dd><input id="search_interval" type="text" class="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd> + <dd><input id="search_interval" type="text" size="4" maxlength="4" name="config[search_interval]" value="{SEARCH_INTERVAL}" /> {L_SECONDS}</dd> </dl> <dl> <dt><label for="search_anonymous_interval">{L_SEARCH_GUEST_INTERVAL}:</label><br /><span>{L_SEARCH_GUEST_INTERVAL_EXPLAIN}</span></dt> - <dd><input id="search_anonymous_interval" type="text" class="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd> + <dd><input id="search_anonymous_interval" type="text" size="4" maxlength="4" name="config[search_anonymous_interval]" value="{SEARCH_GUEST_INTERVAL}" /> {L_SECONDS}</dd> </dl> <dl> <dt><label for="limit_search_load">{L_LIMIT_SEARCH_LOAD}:</label><br /><span>{L_LIMIT_SEARCH_LOAD_EXPLAIN}</span></dt> - <dd><input id="limit_search_load" type="text" class="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd> + <dd><input id="limit_search_load" type="text" size="4" maxlength="4" name="config[limit_search_load]" value="{LIMIT_SEARCH_LOAD}" /></dd> </dl> <dl> <dt><label for="min_search_author_chars">{L_MIN_SEARCH_AUTHOR_CHARS}:</label><br /><span>{L_MIN_SEARCH_AUTHOR_CHARS_EXPLAIN}</span></dt> - <dd><input id="min_search_author_chars" type="text" class="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd> + <dd><input id="min_search_author_chars" type="text" size="4" maxlength="4" name="config[min_search_author_chars]" value="{MIN_SEARCH_AUTHOR_CHARS}" /></dd> </dl> <dl> <dt><label for="search_store_results">{L_SEARCH_STORE_RESULTS}:</label><br /><span>{L_SEARCH_STORE_RESULTS_EXPLAIN}</span></dt> - <dd><input id="search_store_results" type="text" class="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd> + <dd><input id="search_store_results" type="text" size="4" maxlength="6" name="config[search_store_results]" value="{SEARCH_STORE_RESULTS}" /> {L_SECONDS}</dd> </dl> </fieldset> diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 67bef1b7e2..11da8d2d5a 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -211,7 +211,7 @@ </dl> <dl> <dt><label for="text_rows">{L_TEMPLATE_EDITOR_HEIGHT}:</label></dt> - <dd><input id="text_rows" type="text" class="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> + <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button2" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> </dl> <textarea id="template_data" name="template_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{TEMPLATE_DATA}</textarea> </fieldset> @@ -284,7 +284,7 @@ <legend>{L_THEME_EDITOR}</legend> <dl> <dt><label for="text_rows">{L_THEME_EDITOR_HEIGHT}:</label></dt> - <dd><input id="text_rows" type="text" class="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button1" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> + <dd><input id="text_rows" type="text" maxlength="3" value="{TEXT_ROWS}" /> <input class="button1" type="button" name="update" onclick="change_editor_height(this.form.text_rows.value);" value="{L_UPDATE}" /></dd> </dl> <textarea id="css_data" name="css_data" style="font-family:'Courier New', monospace;font-size:9pt;line-height:125%;width:100%;" cols="80" rows="{TEXT_ROWS}">{CSS_DATA}</textarea> </fieldset> @@ -295,7 +295,7 @@ <legend>{L_BACKGROUND}</legend> <dl> <dt><label for="background_color">{L_BACKGROUND_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt> - <dd><input id="background_color" name="background_color" type="text" class="text" value="{BACKGROUND_COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> + <dd><input id="background_color" name="background_color" type="text" value="{BACKGROUND_COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('background_color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> </dl> <dl> <dt><label for="backround_image">{L_BACKGROUND_IMAGE}:</label></dt> @@ -311,15 +311,15 @@ <legend>{L_FOREGROUND}</legend> <dl> <dt><label for="color">{L_FONT_COLOUR}:</label><br /><span>{L_CSS_COLOUR_EXPLAIN}</span></dt> - <dd><input id="color" name="color" type="text" class="text" value="{COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> + <dd><input id="color" name="color" type="text" value="{COLOR}" size="6" /> <span>[ <a href="#" onclick="swatch('color'); return false">{L_COLOUR_SWATCH}</a> ]</span></dd> </dl> <dl> <dt><label for="font_family">{L_FONT_FACE}:</label><br /><span>{L_FONT_FACE_EXPLAIN}</span></dt> - <dd><input id="font_family" name="font_family" type="text" class="text" value="{FONT_FAMILY}" size="40" maxlength="255" /></dd> + <dd><input id="font_family" name="font_family" type="text" value="{FONT_FAMILY}" size="40" maxlength="255" /></dd> </dl> <dl> <dt><label for="font_size">{L_FONT_SIZE}:</label></dt> - <dd><input id="font_size" name="font_size" type="text" class="text" value="{FONT_SIZE}" size="5" maxlength="5" /> <select id="font_size_unit" name="font_size_unit">{S_FONT_SIZE_UNITS}</select></dd> + <dd><input id="font_size" name="font_size" type="text" value="{FONT_SIZE}" size="5" maxlength="5" /> <select id="font_size_unit" name="font_size_unit">{S_FONT_SIZE_UNITS}</select></dd> </dl> <dl> <dt><label for="font_weight">{L_BOLD}:</label></dt> @@ -341,7 +341,7 @@ </dl> <dl> <dt><label for="line_height">{L_LINE_SPACING}</label></dt> - <dd><input id="line_height" name="line_height" type="text" class="text" value="{LINE_HEIGHT}" size="3" maxlength="3" /> <select id="line_height_unit" name="line_height_unit">{S_LINE_HEIGHT_UNITS}</select></dd> + <dd><input id="line_height" name="line_height" type="text" value="{LINE_HEIGHT}" size="3" maxlength="3" /> <select id="line_height_unit" name="line_height_unit">{S_LINE_HEIGHT_UNITS}</select></dd> </dl> </fieldset> @@ -374,7 +374,7 @@ <legend>{L_CUSTOM_CLASS}</legend> <dl> <dt><label for="custom_class">{L_CSS_CLASS_NAME}:</label></dt> - <dd><input id="custom_class" name="custom_class" type="text" class="text" value="" maxlength="200" size="40" /></dd> + <dd><input id="custom_class" name="custom_class" type="text" value="" maxlength="200" size="40" /></dd> </dl> <p class="quick"> @@ -566,7 +566,7 @@ <fieldset class="quick"> <legend>{L_CREATE}</legend> - {L_CREATE}: <input type="text" class="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /> + {L_CREATE}: <input type="text" name="name" value="" /> {L_FROM} <select name="basis">{S_BASIS_OPTIONS}</select> <input class="button2" type="submit" name="add" value="{L_SUBMIT}" /> </fieldset> </form> @@ -593,11 +593,11 @@ <legend>{L_TITLE}</legend> <dl> <dt><label for="name">{L_NAME}:</label></dt> - <dd><!-- IF S_INSTALL --><b id="name">{NAME}</b><!-- ELSE --><input type="text" class="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd> + <dd><!-- IF S_INSTALL --><b id="name">{NAME}</b><!-- ELSE --><input type="text" id="name" name="name" value="{NAME}" /><!-- ENDIF --></dd> </dl> <dl> <dt><label for="copyright">{L_COPYRIGHT}:</label></dt> - <dd><!-- IF S_INSTALL --><b id="name">{COPYRIGHT}</b><!-- ELSE --><input type="text" class="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd> + <dd><!-- IF S_INSTALL --><b id="name">{COPYRIGHT}</b><!-- ELSE --><input type="text" id="copyright" name="copyright" value="{COPYRIGHT}" /><!-- ENDIF --></dd> </dl> <!-- IF S_STYLE and not S_BASIS --> <dl> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 01d34e7f70..958becd809 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -16,7 +16,7 @@ <dt><label for="username">{L_FIND_USERNAME}:</label></dt> <dd><input class="text medium" type="text" id="username" name="username" /></dd> <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> - <dd class="full" style="text-align: left;"><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</dd> + <dd class="full" style="text-align: left;"><label><input type="checkbox" class="radio" id="anonymous" name="u" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> </dl> <p class="quick"> @@ -126,22 +126,25 @@ <!-- BEGIN group --> <!-- IF group.S_NEW_GROUP_TYPE --> <tr> - <td class="row3" colspan="4"><b>{group.GROUP_TYPE}</b></td> + <td class="row3" colspan="4"><strong>{group.GROUP_TYPE}</strong></td> </tr> <!-- ELSE --> <!-- IF group.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF --> - <td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td> - <td><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --></td> - <td><!-- IF not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ENDIF --></td> - <td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td> + <td><a href="{group.U_EDIT_GROUP}">{group.GROUP_NAME}</a></td> + <td><!-- IF group.S_NO_DEFAULT --><a href="{group.U_DEFAULT}">{L_GROUP_DEFAULT}</a><!-- ELSE --><strong>{L_GROUP_DEFAULT}</strong><!-- ENDIF --></td> + <td><!-- IF not group.S_SPECIAL_GROUP --><a href="{group.U_DEMOTE_PROMOTE}">{group.L_DEMOTE_PROMOTE}</a><!-- ELSE --> <!-- ENDIF --></td> + <td><a href="{group.U_DELETE}">{L_GROUP_DELETE}</a></td> + </tr> <!-- ENDIF --> <!-- END group --> </tbody> </table> - <fieldset class="quick"> - {L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> - </fieldset> + <!-- IF S_GROUP_OPTIONS --> + <fieldset class="quick"> + {L_USER_GROUP_ADD}: <select name="g">{S_GROUP_OPTIONS}</select> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + </fieldset> + <!-- ENDIF --> </form> diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 66385ee428..c2590ebca0 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -5,7 +5,7 @@ <dl> <dt><label>{L_CURRENT_IMAGE}:</label><br /><span>{L_AVATAR_EXPLAIN}</span></dt> <dd>{AVATAR_IMAGE}</dd> - <dd><input type="checkbox" class="radio" name="delete" /> <span>{L_DELETE_AVATAR}</span></dd> + <dd><label><input type="checkbox" class="radio" name="delete" /> {L_DELETE_AVATAR}</label></dd> </dl> <!-- IF not S_IN_AVATAR_GALLERY --> <!-- IF S_CAN_UPLOAD --> @@ -15,17 +15,17 @@ </dl> <dl> <dt><label for="uploadurl">{L_UPLOAD_AVATAR_URL}:</label><br /><span>{L_UPLOAD_AVATAR_URL_EXPLAIN}</span></dt> - <dd><input name="uploadurl" type="text" class="text" id="uploadurl" value="" /></dd> + <dd><input name="uploadurl" type="text" id="uploadurl" value="" /></dd> </dl> <!-- ENDIF --> <!-- IF S_ALLOW_REMOTE --> <dl> <dt><label for="remotelink">{L_LINK_REMOTE_AVATAR}:</label><br /><span>{L_LINK_REMOTE_AVATAR_EXPLAIN}</span></dt> - <dd><input name="remotelink" type="text" class="text" id="remotelink" value="" /></dd> + <dd><input name="remotelink" type="text" id="remotelink" value="" /></dd> </dl> <dl> <dt><label for="width">{L_LINK_REMOTE_SIZE}:</label><br /><span>{L_LINK_REMOTE_SIZE_EXPLAIN}</span></dt> - <dd><input name="width" type="text" class="text text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>px</span></dd> + <dd><input name="width" type="text" id="width" size="3" value="{USER_AVATAR_WIDTH}" /> <span>px X </span> <input type="text" name="height" size="3" value="{USER_AVATAR_HEIGHT}" /> <span>px</span></dd> </dl> <!-- ENDIF --> <!-- IF S_DISPLAY_GALLERY --> diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 322df38662..9f8ed9648a 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -4,7 +4,7 @@ <legend>{L_ACP_USER_OVERVIEW}</legend> <dl> <dt><label for="user">{L_USERNAME}:</label><br /><span>{L_NAME_CHARS_EXPLAIN}</span></dt> - <dd><input type="text" class="text" id="user" name="user" value="{USER}" /></dd> + <dd><input type="text" id="user" name="user" value="{USER}" /></dd> <!-- IF U_SWITCH_PERMISSIONS --><dd>[ <a href="{U_SWITCH_PERMISSIONS}">{L_USE_PERMISSIONS}</a> ]</dd><!-- ENDIF --> </dl> <!-- IF S_USER_INACTIVE --> @@ -51,11 +51,11 @@ </dl> <dl> <dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt> - <dd><input type="password" class="text" id="new_password" name="new_password" value="" /></dd> + <dd><input type="password" id="new_password" name="new_password" value="" /></dd> </dl> <dl> <dt><label for="password_confirm">{L_CONFIRM_PASSWORD}:</label><br /><span>{L_CONFIRM_PASSWORD_EXPLAIN}</span></dt> - <dd><input type="password" class="text" id="password_confirm" name="password_confirm" value="" /></dd> + <dd><input type="password" id="password_confirm" name="password_confirm" value="" /></dd> </dl> <p class="quick"> diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index e8e3aced8f..99e82ea0db 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -58,7 +58,7 @@ <dl> <dt><label for="dateoptions">{L_BOARD_DATE_FORMAT}:</label><br /><span>{L_BOARD_DATE_FORMAT_EXPLAIN}</span></dt> <dd><select name="dateoptions" id="dateoptions" onchange="if(this.value=='custom'){dE('custom_date',1);}else{dE('custom_date',-1);} if (this.value == 'custom') { document.getElementById('dateformat').value = '{A_DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }">{S_DATEFORMAT_OPTIONS}</select></dd> - <dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" class="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd> + <dd><div id="custom_date"<!-- IF not S_CUSTOM_DATEFORMAT --> style="display:none;"<!-- ENDIF -->><input type="text" name="dateformat" id="dateformat" value="{DATE_FORMAT}" maxlength="30" /></div></dd> </dl> </fieldset> diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index 2d087c39f2..69edb1159b 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -4,31 +4,31 @@ <legend>{L_USER_PROFILE}</legend> <dl> <dt><label for="icq">{L_UCP_ICQ}:</label></dt> - <dd><input type="text" class="text" id="icq" name="icq" value="{ICQ}" /></dd> + <dd><input type="text" id="icq" name="icq" value="{ICQ}" /></dd> </dl> <dl> <dt><label for="aim">{L_UCP_AIM}:</label></dt> - <dd><input type="text" class="text" id="aim" name="aim" value="{AIM}" /></dd> + <dd><input type="text" id="aim" name="aim" value="{AIM}" /></dd> </dl> <dl> <dt><label for="msn">{L_UCP_MSNM}:</label></dt> - <dd><input type="text" class="text" id="msn" name="msn" value="{MSN}" /></dd> + <dd><input type="text" id="msn" name="msn" value="{MSN}" /></dd> </dl> <dl> <dt><label for="yim">{L_UCP_YIM}:</label></dt> - <dd><input type="text" class="text" id="yim" name="yim" value="{YIM}" /></dd> + <dd><input type="text" id="yim" name="yim" value="{YIM}" /></dd> </dl> <dl> <dt><label for="jabber">{L_UCP_JABBER}:</label></dt> - <dd><input type="text" class="text" id="jabber" name="jabber" value="{JABBER}" /></dd> + <dd><input type="text" id="jabber" name="jabber" value="{JABBER}" /></dd> </dl> <dl> <dt><label for="website">{L_WEBSITE}:</label></dt> - <dd><input type="text" class="text" id="website" name="website" value="{WEBSITE}" /></dd> + <dd><input type="text" id="website" name="website" value="{WEBSITE}" /></dd> </dl> <dl> <dt><label for="location">{L_LOCATION}:</label></dt> - <dd><input type="text" class="text" id="location" name="location" value="{LOCATION}" /></dd> + <dd><input type="text" id="location" name="location" value="{LOCATION}" /></dd> </dl> <dl> <dt><label for="occupation">{L_OCCUPATION}:</label></dt> diff --git a/phpBB/adm/style/acp_users_signature.html b/phpBB/adm/style/acp_users_signature.html index f6a38b4f36..43373a2a7e 100644 --- a/phpBB/adm/style/acp_users_signature.html +++ b/phpBB/adm/style/acp_users_signature.html @@ -86,13 +86,13 @@ <div> <!-- IF S_BBCODE_ALLOWED --> - <input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE} + <label><input type="checkbox" class="radio" name="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label> <!-- ENDIF --> <!-- IF S_SMILIES_ALLOWED --> - <input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES} + <label><input type="checkbox" class="radio" name="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label> <!-- ENDIF --> <!-- IF S_LINKS_ALLOWED --> - <input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL} + <label><input type="checkbox" class="radio" name="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label> <!-- ENDIF --> <br /><br /><strong>{L_OPTIONS}: </strong>{BBCODE_STATUS} :: {IMG_STATUS} :: {FLASH_STATUS} :: {URL_STATUS} :: {SMILIES_STATUS} </div> diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 22bd641e4d..fa85669595 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -16,11 +16,11 @@ <legend>{L_EDIT_WORD}</legend> <dl> <dt><label for="word">{L_WORD}</label></dt> - <dd><input id="word" type="text" class="text" name="word" value="{WORD}" maxlength="255" /></dd> + <dd><input id="word" type="text" name="word" value="{WORD}" maxlength="255" /></dd> </dl> <dl> <dt><label for="replacement">{L_REPLACEMENT}</label></dt> - <dd><input id="replacement" type="text" class="text" name="replacement" value="{REPLACEMENT}" maxlength="255" /></dd> + <dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" maxlength="255" /></dd> </dl> {S_HIDDEN_FIELDS} diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 13711deb95..691accc13c 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -663,7 +663,7 @@ input, textarea { font-family: Verdana, Helvetica, Arial, sans-serif; font-size: 0.90em; font-weight: normal; - cursor: default; + cursor: text; vertical-align: middle; padding: 2px; color: #111111; @@ -735,7 +735,6 @@ textarea { font-size: 0.85em; width: 60%; padding: 2px; - cursor: text; } label { @@ -969,7 +968,6 @@ p.submit-buttons { fieldset.submit-buttons input, p.submit-buttons input { padding: 3px 2px; - cursor: pointer; } fieldset.submit-buttons legend { @@ -979,10 +977,6 @@ fieldset.submit-buttons legend { /* Input field styles ---------------------------------------- */ -input.text { - cursor: text; -} - input.radio, input.permissions-checkbox { width: auto !important; background-color: transparent; @@ -1005,11 +999,11 @@ input.autowidth { width: auto !important;} /* Form button styles ---------------------------------------- */ a.button1, input.button1, input.button3, -a.button2, input.button2 { +a.button2, input.button2 { width: auto !important; - padding: 1px 3px; + padding: 1px 3px 0 3px; font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - color: #000000; + color: #000; font-size: 0.85em; background: #EFEFEF url("../images/bg_button.gif") repeat-x top; cursor: pointer; @@ -1041,6 +1035,11 @@ a.button2:hover, input.button2:hover { color: #BC2A4D; } +input.disabled { + font-weight: normal; + color: #666666; +} + /* Pagination ---------------------------------------- */ .pagination { @@ -1098,40 +1097,6 @@ a.button2:hover, input.button2:hover { } -/* Form button styles ----------------------------------------- */ -a.button1, input.button1, input.button3, -a.button2, input.button2 { - width: auto !important; - padding: 1px 3px 0 3px; - font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - color: #000; - background-color: #EFEFEF; - cursor: pointer; -} - -a.button1, input.button1 { - font-weight: bold; - border: 1px solid #666666; -} - -a.button2, input.button2 { - border: 1px solid #666666; -} - -/* <a> button in the style of the form buttons */ -a.button1, a.button1:link, a.button1:visited, a.button1:active, -a.button2, a.button2:link, a.button2:visited, a.button2:active { - text-decoration: none; - color: #000000; - padding: 4px 8px; -} - -input.disabled { - font-weight: normal; - color: #666666; -} - /* Action Highlighting ---------------------------------------- */ .successbox, .errorbox { diff --git a/phpBB/adm/style/custom_profile_fields.html b/phpBB/adm/style/custom_profile_fields.html index 289d11d32e..1aba162d00 100644 --- a/phpBB/adm/style/custom_profile_fields.html +++ b/phpBB/adm/style/custom_profile_fields.html @@ -10,7 +10,7 @@ <!-- END text --> <!-- BEGIN string --> - <input type="text" class="text" name="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" /> + <input type="text" name="{string.FIELD_IDENT}" size="{string.FIELD_LENGTH}" maxlength="{string.FIELD_MAXLEN}" value="{string.FIELD_VALUE}" /> <!-- END string --> <!-- BEGIN bool --> @@ -22,7 +22,7 @@ <!-- END bool --> <!-- BEGIN int --> - <input type="text" class="text" name="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" /> + <input type="text" name="{int.FIELD_IDENT}" size="{int.FIELD_LENGTH}" value="{int.FIELD_VALUE}" /> <!-- END int --> <!-- BEGIN date --> diff --git a/phpBB/adm/style/install_update.html b/phpBB/adm/style/install_update.html index c8f3811abe..30f797cc8c 100644 --- a/phpBB/adm/style/install_update.html +++ b/phpBB/adm/style/install_update.html @@ -187,7 +187,7 @@ </dt> <dd style="margin-left: 60%;"><!-- IF not files.S_BINARY -->[ <a href="{files.U_SHOW_DIFF}" onclick="popup('{files.U_SHOW_DIFF}', 700, 500); return false;">{files.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd> <!-- IF files.S_CUSTOM --> - <dd style="margin-left: 60%;"><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</dd> + <dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{files.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd> <!-- ENDIF --> <!-- IF files.STATUS eq 'conflict' --> </dl> diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 8b54589707..dd67cdda87 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -106,12 +106,26 @@ class acp_modules trigger_error($user->lang['NO_MODULE_ID'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); } + $sql = 'SELECT * + FROM ' . MODULES_TABLE . " + WHERE module_class = '" . $db->sql_escape($this->module_class) . "' + AND module_id = $module_id"; + $result = $db->sql_query($sql); + $row = $db->sql_fetchrow($result); + $db->sql_freeresult($result); + + if (!$row) + { + trigger_error($user->lang['NO_MODULE'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); + } + $sql = 'UPDATE ' . MODULES_TABLE . ' SET module_enabled = ' . (($action == 'enable') ? 1 : 0) . " - WHERE module_id = $module_id"; + WHERE module_class = '" . $db->sql_escape($this->module_class) . "' + AND module_id = $module_id"; $db->sql_query($sql); - add_log('admin', 'LOG_MODULE_' . strtoupper($action)); + add_log('admin', 'LOG_MODULE_' . strtoupper($action), $this->lang_name($row['module_langname'])); $this->remove_cache_file(); break; diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index aae147af4f..78a9983b0f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3355,7 +3355,7 @@ function truncate_string($string, $max_length = 60, $allow_reply = true, $append */ function get_username_string($mode, $user_id, $username, $username_colour = '', $guest_username = false, $custom_profile_url = false) { - global $phpbb_root_path, $phpEx, $user; + global $phpbb_root_path, $phpEx, $user, $auth; $profile_url = ''; $username_colour = ($username_colour) ? '#' . $username_colour : ''; @@ -3372,8 +3372,17 @@ function get_username_string($mode, $user_id, $username, $username_colour = '', // Only show the link if not anonymous if ($user_id && $user_id != ANONYMOUS) { - $profile_url = ($custom_profile_url !== false) ? $custom_profile_url : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile'); - $profile_url .= '&u=' . (int) $user_id; + // Do not show the link if the user is already logged in but do not have u_viewprofile permissions (relevant for bots mostly). + // For all others the link leads to a login page or the profile. + if ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) + { + $profile_url = ''; + } + else + { + $profile_url = ($custom_profile_url !== false) ? $custom_profile_url : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile'); + $profile_url .= '&u=' . (int) $user_id; + } } else { diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 51a45166ba..18853eb013 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1490,18 +1490,18 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false, { if (sizeof($forum_ids) == 1) { - $sql = 'SELECT SUM(topic_replies + 1) AS forum_posts + $sql = 'SELECT SUM(t.topic_replies + 1) AS forum_posts FROM ' . TOPICS_TABLE . ' t WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' AND t.topic_approved = 1'; } else { - $sql = 'SELECT p.forum_id, SUM(topic_replies + 1) AS forum_posts + $sql = 'SELECT t.forum_id, SUM(t.topic_replies + 1) AS forum_posts FROM ' . TOPICS_TABLE . ' t WHERE ' . $db->sql_in_set('t.forum_id', $forum_ids) . ' AND t.topic_approved = 1 - GROUP BY p.forum_id'; + GROUP BY t.forum_id'; } $result = $db->sql_query($sql); diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php index a7a9e48c8f..cec097cd8a 100755 --- a/phpBB/includes/mcp/mcp_logs.php +++ b/phpBB/includes/mcp/mcp_logs.php @@ -18,7 +18,7 @@ class mcp_logs var $u_action; var $p_master; - function mcp_main(&$p_master) + function mcp_logs(&$p_master) { $this->p_master = &$p_master; } diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php index ced9f83ce9..7d16664a77 100644 --- a/phpBB/includes/mcp/mcp_main.php +++ b/phpBB/includes/mcp/mcp_main.php @@ -598,7 +598,7 @@ function mcp_move_topic($topic_ids) $db->sql_transaction('begin'); - $sql = 'SELECT SUM(topic_replies + 1) as topic_posts + $sql = 'SELECT SUM(t.topic_replies + 1) as topic_posts FROM ' . TOPICS_TABLE . ' t WHERE ' . $db->sql_in_set('t.topic_id', $topic_ids); $result = $db->sql_query($sql); diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index 2fc97d423a..03347101e0 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -18,7 +18,7 @@ class mcp_queue var $p_master; var $u_action; - function mcp_main(&$p_master) + function mcp_queue(&$p_master) { $this->p_master = &$p_master; } diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 06d5ffd03d..9080dcdc76 100755 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -18,7 +18,7 @@ class mcp_reports var $p_master; var $u_action; - function mcp_main(&$p_master) + function mcp_reports(&$p_master) { $this->p_master = &$p_master; } diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index fd6ef88480..739368c3df 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -542,8 +542,8 @@ $lang = array_merge($lang, array( 'LOG_MCP_CHANGE_POSTER' => '<strong>Changed poster in topic “%1$s”</strong><br />» from %2$s to %3$s', - 'LOG_MODULE_DISABLE' => '<strong>Module disabled</strong>', - 'LOG_MODULE_ENABLE' => '<strong>Module enabled</strong>', + 'LOG_MODULE_DISABLE' => '<strong>Module disabled</strong><br />» %s', + 'LOG_MODULE_ENABLE' => '<strong>Module enabled</strong><br />» %s', 'LOG_MODULE_MOVE_DOWN' => '<strong>Module moved down</strong><br />» %s', 'LOG_MODULE_MOVE_UP' => '<strong>Module moved up</strong><br />» %s', 'LOG_MODULE_REMOVED' => '<strong>Module removed</strong><br />» %s', diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html index f828ffa72e..80886b477d 100644 --- a/phpBB/styles/prosilver/template/mcp_topic.html +++ b/phpBB/styles/prosilver/template/mcp_topic.html @@ -95,8 +95,9 @@ onload_functions.push('subPanels()'); <div class="panel"> <div class="inner"><span class="corners-top"><span></span></span> + <h3 id="review"> - <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'),true);">Expand view</a></span> + <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; } else if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> {L_TOPIC_REVIEW}: {TOPIC_TITLE} </h3> diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html index cf12aa631f..7ebe1e3472 100644 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ b/phpBB/styles/prosilver/template/memberlist_im.html @@ -19,11 +19,11 @@ <!-- IF S_SEND_ICQ --> <dl class="fields2"> <dt><label for="from">{L_IM_NAME}:</label></dt> - <dd><input class="inputbox" type="text" name="from" id="from" size="20" maxlength="40" /></dd> + <dd><input class="inputbox autowidth" type="text" name="from" id="from" size="20" maxlength="40" /></dd> </dl> <dl class="fields2"> <dt><label for="body">{L_IM_MESSAGE}:</label></dt> - <dd><textarea class="inputbox" name="body" id="body" rows="5" cols="45"></textarea></dd> + <dd><textarea class="inputbox autowidth" name="body" id="body" rows="5" cols="45"></textarea></dd> </dl> <dl class="fields2"> <dt> </dt> @@ -54,7 +54,7 @@ <!-- IF S_SEND_JABBER --> <dl class="fields2"> <dt><label for="message">{L_IM_MESSAGE}:</label></dt> - <dd><textarea class="inputbox" name="message" id="message" rows="5" cols="45"></textarea></dd> + <dd><textarea class="inputbox autowidth" name="message" id="message" rows="5" cols="45"></textarea></dd> </dl> <dl class="fields2"> <dt> </dt> @@ -67,10 +67,6 @@ <dt> </dt> <dd>{L_IM_NO_JABBER}</dd> </dl> - <dl class="fields2"> - <dt> </dt> - <dd><input class="button1" name="submit" type="submit" value="{L_IM_SEND}" /></dd> - </dl> <!-- ENDIF --> <!-- IF S_SENT_JABBER --> diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html index d999d344da..19b52d3738 100644 --- a/phpBB/styles/prosilver/template/posting_topic_review.html +++ b/phpBB/styles/prosilver/template/posting_topic_review.html @@ -1,6 +1,6 @@ <h3 id="review"> - <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; return false}; if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> + <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; } else if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> {L_TOPIC_REVIEW}: {TOPIC_TITLE} </h3> diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html index 008f5f2b3d..d49166fe62 100644 --- a/phpBB/styles/prosilver/template/ucp_main_front.html +++ b/phpBB/styles/prosilver/template/ucp_main_front.html @@ -19,7 +19,7 @@ <!-- IF topicrow.PAGINATION --><strong class="pagination"><span>{topicrow.PAGINATION}</span></strong><!-- ENDIF --> <!-- IF topicrow.ATTACH_ICON_IMG -->{topicrow.ATTACH_ICON_IMG} <!-- ENDIF -->{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {topicrow.FIRST_POST_TIME} </dt> - <dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} + <dd class="lastpost"><span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} <a href="{topicrow.U_LAST_POST}">{LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {topicrow.LAST_POST_TIME}</span> </dd> </dl> diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html index aedf488f9d..f90c75f10d 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_history.html +++ b/phpBB/styles/prosilver/template/ucp_pm_history.html @@ -1,6 +1,6 @@ <h3 id="review"> - <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; return false}; if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> + <span class="right-box"><a href="#review" onclick="viewableArea(getElementById('topicreview'), true); var rev_text = getElementById('review').getElementsByTagName('a').item(0).firstChild; if (rev_text.data == '{L_EXPAND_VIEW}'){rev_text.data = '{L_COLLAPSE_VIEW}'; } else if (rev_text.data == '{L_COLLAPSE_VIEW}'){rev_text.data = '{L_EXPAND_VIEW}'};">{L_EXPAND_VIEW}</a></span> {L_MESSAGE_HISTORY}: {TITLE} </h3> diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index a1db3d514a..e376bf5390 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -170,7 +170,12 @@ <!-- IF not postrow.S_IGNORE_POST --> <dl class="postprofile" id="profile{postrow.POST_ID}"> - <dt><!-- IF postrow.POSTER_AVATAR --><a href="{postrow.U_POST_AUTHOR}">{postrow.POSTER_AVATAR}</a><br /><!-- ENDIF -->{postrow.POST_AUTHOR_FULL}</dt> + <dt> + <!-- IF postrow.POSTER_AVATAR --> + <!-- IF postrow.U_POST_AUTHOR --><a href="{postrow.U_POST_AUTHOR}">{postrow.POSTER_AVATAR}</a><!-- ELSE -->{postrow.POSTER_AVATAR}<!-- ENDIF --><br /> + <!-- ENDIF --> + <!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF --> + </dt> <!-- IF postrow.RANK_TITLE or postrow.RANK_IMG --><dd>{postrow.RANK_TITLE}<!-- IF postrow.RANK_TITLE and postrow.RANK_IMG --><br /><!-- ENDIF -->{postrow.RANK_IMG}</dd><!-- ENDIF --> diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 733a3cc8d3..09f11fbca9 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -9,6 +9,7 @@ a:active { color: #d2d2d2; text-decoration: none; } /* Coloured usernames */ .username-coloured { font-weight: bold; + display: inline !important; } /* Links on gradient backgrounds */ |