diff options
27 files changed, 198 insertions, 128 deletions
diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index 42de3e7060..698ea77f01 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -59,6 +59,7 @@ </fieldset> <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </fieldset> @@ -80,10 +81,10 @@ <dt><label for="exclude">{L_IP_EXCLUDE}:</label><br /><span>{L_EXCLUDE_ENTERED_IP}</span></dt> <dd><input type="radio" id="exclude" name="ipexclude" value="1" class="radio" /> {L_YES} <input type="radio" name="ipexclude" value="0" checked="checked" class="radio" /> {L_NO}</dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button1" type="submit" id="securesubmit" name="securesubmit" value="{L_SUBMIT}" /> + </p> </fieldset> <fieldset> @@ -94,10 +95,10 @@ <dt><label for="remove_ip_hostname">{L_IP_HOSTNAME}:</label></dt> <dd><select name="unip[]" id="remove_ip_hostname" multiple="multiple" size="10">{DEFINED_IPS}</select></dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button1" type="submit" id="unsecuresubmit" name="unsecuresubmit" value="{L_SUBMIT}" /> + </p> </fieldset> <!-- ELSE --> @@ -207,16 +208,21 @@ <dd><input type="radio" id="allowed_forums" class="radio" name="forum_select" value="0"<!-- IF not S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_ALL_FORUMS} <input type="radio" class="radio" name="forum_select" value="1"<!-- IF S_FORUM_IDS --> checked="checked"<!-- ENDIF --> /> {L_ALLOW_SELECTED_FORUMS}</dd> <dd><select name="allowed_forums[]" multiple="multiple" size="8">{S_FORUM_ID_OPTIONS}</select></dd> </dl> - </fieldset> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> + </fieldset> </form> <!-- ELSE --> + <form id="extgroups" method="post" action="{U_ACTION}"> + <fieldset class="tabulated"> + <legend>{L_TITLE}</legend> + <table cellspacing="1"> <col class="row1" /><col class="row1" /><col class="row2" /> <thead> @@ -243,12 +249,11 @@ <!-- END groups --> </tbody> </table> - - <form id="extgroups" method="post" action="{U_ACTION}"> - <fieldset class="quick"> + <p class="quick"> {L_CREATE_GROUP}: <input type="text" name="group_name" maxlength="30" /> <input class="button2" name="add" type="submit" value="{L_SUBMIT}" /> - </fieldset> + </p> + </fieldset> </form> <!-- ENDIF --> @@ -266,10 +271,10 @@ <dt><label for="extension_group">{L_EXTENSION_GROUP}</label></dt> <dd>{GROUP_SELECT_OPTIONS}</dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input type="submit" id="add_extension_check" name="add_extension_check" class="button2" value="{L_SUBMIT}" /> + </p> </fieldset> </form> @@ -278,6 +283,9 @@ <form id="change_ext" method="post" action="{U_ACTION}"> + <fieldset class="tabulated"> + <legend>{L_TITLE}</legend> + <table cellspacing="1"> <col class="row1" /><col class="row1" /><col class="row2" /> <thead> @@ -303,9 +311,10 @@ </tbody> </table> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> </fieldset> </form> @@ -314,6 +323,9 @@ <form id="orphan" method="post" action="{U_ACTION}"> + <fieldset> + <legend>{L_TITLE}</legend> + <table cellspacing="1"> <thead> <tr> @@ -346,13 +358,15 @@ <br /> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> + </fieldset> </form> <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 4629200c97..eb42592f81 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -65,11 +65,11 @@ <dt><label for="bangivereason">{L_BAN_GIVE_REASON}:</label></dt> <dd><input name="bangivereason" type="text" id="bangivereason" class="medium" /></dd> </dl> -</fieldset> -<fieldset class="submit-buttons"> +<p class="submit-buttons"> <input class="button1" type="submit" id="bansubmit" name="bansubmit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="banreset" name="banreset" value="{L_RESET}" /> +</p> </fieldset> <br /><br /> @@ -98,11 +98,11 @@ <dt><label for="unbangivereason">{L_BAN_GIVE_REASON}:</label></dt> <dd><input style="border: 0px;" type="text" name="unbangivereason" id="unbangivereason" class="full" disabled="disabled" /></dd> </dl> - </fieldset> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="unbansubmit" name="unbansubmit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="unbanreset" name="unbanreset" value="{L_RESET}" /> + </p> </fieldset> <!-- ELSE --> @@ -114,4 +114,4 @@ </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index c1eb7e2193..4370b5e225 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -48,6 +48,7 @@ </fieldset> <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </fieldset> @@ -85,6 +86,10 @@ <p>{L_ACP_BBCODES_EXPLAIN}</p> + <form id="acp_bbcodes" method="post" action="{U_ACTION}"> + <fieldset class="tabulated"> + <legend>{L_ACP_BBCODES}</legend> + <table cellspacing="1" id="down"> <thead> <tr> @@ -102,14 +107,13 @@ </tbody> </table> - <form id="acp_bbcodes" method="post" action="{U_ACTION}"> - - <fieldset class="quick"> + <p class="quick"> <input class="button2" name="submit" type="submit" value="{L_ADD_BBCODE}" /> + </p> </fieldset> </form> <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_board.html b/phpBB/adm/style/acp_board.html index dd29017cb1..5ab0e079d4 100644 --- a/phpBB/adm/style/acp_board.html +++ b/phpBB/adm/style/acp_board.html @@ -40,10 +40,11 @@ </fieldset> <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </fieldset> </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index bc6c657490..0c4e718353 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -45,11 +45,11 @@ <dt><label for="bot_ip">{L_BOT_IP}:</label><br /><span>{L_BOT_IP_EXPLAIN}</span></dt> <dd><input name="bot_ip" type="text" id="bot_ip" value="{BOT_IP}" /></dd> </dl> - </fieldset> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> </fieldset> </form> @@ -98,4 +98,4 @@ <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index bdc48ea0aa..2b141c0b37 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -28,13 +28,13 @@ <dd><input id="captcha_gd_noise" name="captcha_gd_noise" value="1" class="radio" type="radio"<!-- IF CAPTCHA_GD_NOISE --> checked="checked"<!-- ENDIF --> /> {L_YES} <input name="captcha_gd_noise" value="0" class="radio" type="radio"<!-- IF not CAPTCHA_GD_NOISE --> checked="checked"<!-- ENDIF --> /> {L_NO}</dd> </dl> <!-- ENDIF --> -</fieldset> -<fieldset class="submit-buttons"> +<p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> +</p> </fieldset> </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html index 8d4ba6ef5c..c73670d9a8 100644 --- a/phpBB/adm/style/acp_database.html +++ b/phpBB/adm/style/acp_database.html @@ -15,16 +15,16 @@ <dt><label for="user">{L_SELECT_FILE}:</label></dt> <dd><select id="file" name="file" size="10"><!-- BEGIN files --><option value="{files.FILE}"<!-- IF files.S_LAST_ROW --> selected="selected"<!-- ENDIF -->>{files.NAME}</option><!-- END files --></select></dd> </dl> - </fieldset> <!-- IF EXISTS --> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_START_RESTORE}" /> <input class="button2" type="submit" id="delete" name="delete" value="{L_DELETE_BACKUP}" /> <input class="button2" type="submit" id="download" name="download" value="{L_DOWNLOAD_BACKUP}" /> - </fieldset> + </p> <!-- ENDIF --> + </fieldset> </form> <!-- ELSE --> @@ -74,15 +74,15 @@ <!-- END tables --> </select><br /><br /><div align="right"><a href="#" onclick="selector(true)">{L_SELECT_ALL}</a><br /><a href="#" onclick="selector(false)">{L_DESELECT_ALL}</a></div></dd> </dl> - </fieldset> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> </fieldset> </form> <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_disallow.html b/phpBB/adm/style/acp_disallow.html index 8bd0957786..14e7c392c2 100644 --- a/phpBB/adm/style/acp_disallow.html +++ b/phpBB/adm/style/acp_disallow.html @@ -14,10 +14,10 @@ <dt><label for="user">{L_USERNAME}:</label><br /><span>{L_ADD_DISALLOW_EXPLAIN}</span></dt> <dd><input id="user" type="text" name="disallowed_user" class="medium" /></dd> </dl> -</fieldset> -<fieldset class="quick"> +<p class="quick"> <input class="button1" type="submit" name="disallow" value="{L_SUBMIT}" /> +</p> </fieldset> <h1>{L_DELETE_DISALLOW_TITLE}</h1> @@ -31,10 +31,10 @@ <dt><label for="disallowed">{L_USERNAME}:</label></dt> <dd><select name="disallowed_id" id="disallowed">{S_DISALLOWED_NAMES}</select></dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button1" type="submit" name="allow" value="{L_SUBMIT}" /> + </p> <!-- ELSE --> <p>{L_NO_DISALLOWED}</p> <!-- ENDIF --> @@ -42,4 +42,4 @@ </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_email.html b/phpBB/adm/style/acp_email.html index 9a7a3e4b89..a44b276bee 100644 --- a/phpBB/adm/style/acp_email.html +++ b/phpBB/adm/style/acp_email.html @@ -42,13 +42,13 @@ <dt><label for="send">{L_SEND_IMMEDIATLY}:</label></dt> <dd><input id="send" type="checkbox" class="radio" name="send_immediatly" checked="checked" /></dd> </dl> -</fieldset> -<fieldset class="submit-buttons"> +<p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_EMAIL}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> +</p> </fieldset> </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 1b7ac9472b..427a1f07a4 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -289,6 +289,7 @@ </div> <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </fieldset> @@ -336,10 +337,10 @@ <!-- ENDIF --> </dl> <!-- ENDIF --> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + </p> </fieldset> </form> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index c8e56f9d81..ebff155a6e 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -143,6 +143,7 @@ </fieldset> <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </fieldset> @@ -249,10 +250,10 @@ <dd><textarea id="usernames" name="usernames" cols="40" rows="5"></textarea></dd> <dd>[ <a href="{U_FIND_USERNAME}" onclick="find_username(); return false;">{L_FIND_USERNAME}</a> ]</dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button2" type="submit" name="addusers" value="{L_SUBMIT}" /> + </p> </fieldset> </form> @@ -336,4 +337,4 @@ <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index e3cfb5764a..1ea1061d82 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -12,6 +12,9 @@ <form id="acp_icons" method="post" action="{U_ACTION}"> + <fieldset class="tabulated"> + <legend>{L_TITLE}</legend> + <table cellspacing="1"> <thead> <tr> @@ -64,9 +67,10 @@ </tbody> </table> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> </fieldset> </form> @@ -86,7 +90,6 @@ <!-- IF not S_PAK_OPTIONS --> <p>{L_NO_PAK_OPTIONS}</p> - </fieldset> <!-- ELSE --> <dl> @@ -96,12 +99,12 @@ <dt><label for="current">{L_CURRENT}</label><br /><span>{L_CURRENT_EXPLAIN}</span></dt> <dd><input type="radio" class="radio" id="current" name="current" value="keep" checked="checked" /> {L_KEEP_ALL} <input type="radio" class="radio" name="current" value="replace" /> {L_REPLACE_MATCHES} <input type="radio" class="radio" name="current" value="delete" /> {L_DELETE_ALL} </dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button1" type="submit" id="import" name="import" value="{L_IMPORT_SUBMIT}" /> - </fieldset> + </p> <!-- ENDIF --> + </fieldset> </form> @@ -118,6 +121,10 @@ </div> <!-- ENDIF --> + <form id="acp_icons" method="post" action="{U_ACTION}"> + <fieldset class="tabular"> + <legend>{L_TITLE}<legend> + <div style="text-align: right;"><a href="{U_IMPORT}">{L_IMPORT}</a> | <a href="{U_EXPORT}">{L_EXPORT}</a></div> <table cellspacing="1"> @@ -163,14 +170,13 @@ </tbody> </table> - <form id="acp_icons" method="post" action="{U_ACTION}"> - - <fieldset class="quick"> + <p class="quick"> <input class="button2" name="add" type="submit" value="{L_ICON_ADD}" /> <input class="button2" type="submit" name="edit" value="{L_ICON_EDIT}" /> + </p> </fieldset> </form> <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html index 82bc7fed2f..22c38446f2 100644 --- a/phpBB/adm/style/acp_jabber.html +++ b/phpBB/adm/style/acp_jabber.html @@ -45,13 +45,14 @@ <dt><label for="jab_package_size">{L_JAB_PACKAGE_SIZE}:</label><br /><span>{L_JAB_PACKAGE_SIZE_EXPLAIN}</span></dt> <dd><input type="text" id="jab_package_size" name="jab_package_size" value="{JAB_PACKAGE_SIZE}" /></dd> </dl> -</fieldset> -<fieldset class="submit-buttons"> +<p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> +</p> + </fieldset> </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index 22cbd3921c..bc05fc43fd 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -16,10 +16,10 @@ <dt><label for="use_method">{L_DOWNLOAD_AS}:</label></dt> <dd>{RADIO_BUTTONS}</dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input type="submit" class="button2" value="{L_DOWNLOAD}" name="download" /> + </p> </fieldset> </form> @@ -50,10 +50,10 @@ <dt><label for="lang_author">{L_LANG_AUTHOR}:</label></dt> <dd><input type="text" id="lang_author" name="lang_author" value="{LANG_AUTHOR}" /></dd> </dl> - </fieldset> - <fieldset class="quick" style="margin-top: -15px;"> + <p class="quick" style="margin-top: -15px;"> <input type="submit" name="update_details" class="button2" value="{L_SUBMIT}" /> + </p> </fieldset> </form> @@ -245,4 +245,4 @@ <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index e267d54410..c9f7c0baf1 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -107,14 +107,14 @@ <dd><select name="module_mode" id="module_mode">{S_MODULE_MODES}</select></dd> </dl> </div> - </fieldset> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input type="hidden" name="action" value="{ACTION}" /> <input type="hidden" name="m" value="{MODULE_ID}" /> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> </fieldset> </form> @@ -209,4 +209,4 @@ <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 1622fce7db..d8bbeb33dd 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -74,10 +74,10 @@ <dt><label for="role_description">{L_ROLE_DESCRIPTION}:</label><br /><span>{L_ROLE_DESCRIPTION_EXPLAIN}</span></dt> <dd><textarea id="role_description" name="role_description" rows="3" cols="45">{ROLE_DESCRIPTION}</textarea></dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input type="submit" class="button1" name="submit" value="{L_SUBMIT}" /> + </p> </fieldset> <!-- IF S_DISPLAY_ROLE_MASK --> @@ -229,4 +229,4 @@ <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index 020da77327..9db33f54b2 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -221,4 +221,4 @@ <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index b6a9fac56a..00710ccb4f 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -44,10 +44,10 @@ <dl> <dd class="full"><select name="f[]" multiple="multiple" size="5">{S_FORUM_OPTIONS}</select></dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button1" type="submit" value="{L_LOOK_UP_FORUM}" /> + </p> </fieldset> </form> @@ -88,16 +88,16 @@ <dt><label for="sticky">{L_PRUNE_STICKY}:</label></dt> <dd><input type="radio" class="radio" name="prune_sticky" value="1" /> {L_YES} <input type="radio" class="radio" id="sticky" name="prune_sticky" value="0" checked="checked" /> {L_NO}</dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> {S_HIDDEN_FIELDS} <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> + </p> </fieldset> </form> <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_prune_users.html b/phpBB/adm/style/acp_prune_users.html index a477c24577..0db10e3ae4 100644 --- a/phpBB/adm/style/acp_prune_users.html +++ b/phpBB/adm/style/acp_prune_users.html @@ -43,15 +43,15 @@ <dt><label for="deactivate">{L_DEACTIVATE_DELETE}:</label><br /><span>{L_DEACTIVATE_DELETE_EXPLAIN}</span></dt> <dd><input type="radio" class="radio" name="action" value="delete" /> {L_DELETE_USERS} <input type="radio" class="radio" id="deactivate" name="action" value="deactivate" checked="checked" /> {L_DEACTIVATE}</dd> </dl> -</fieldset> -<fieldset class="submit-buttons"> +<p class="submit-buttons"> <input type="hidden" name="prune" value="1" /> <input class="button1" type="submit" id="update" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> +</p> </fieldset> </form> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index b79ac9cf6b..1926af18a2 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -43,13 +43,13 @@ <dd><input name="min_posts" type="text" id="min_posts" maxlength="10" value="{MIN_POSTS}" /></dd> </dl> </div> - </fieldset> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input type="hidden" name="action" value="save" /> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> </fieldset> </form> @@ -60,6 +60,10 @@ <p>{L_ACP_RANKS_EXPLAIN}</p> + <form id="acp_ranks" method="post" action="{U_ACTION}"> + <fieldset class="tabulated"> + <legend>{L_ACP_MANAGE_RANKS}</legend> + <table cellspacing="1"> <thead> <tr> @@ -81,14 +85,13 @@ </tbody> </table> - <form id="acp_ranks" method="post" action="{U_ACTION}"> - - <fieldset class="quick"> + <p class="quick"> <input class="button2" name="add" type="submit" value="{L_ADD_RANK}" /> + </p> </fieldset> </form> <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index be987dd294..4aaf7328e7 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -48,11 +48,11 @@ <dd>{TRANSLATED_DESCRIPTION}</dd> </dl> <!-- ENDIF --> - </fieldset> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> </fieldset> </form> @@ -63,6 +63,10 @@ <p>{L_ACP_REASONS_EXPLAIN}</p> + <form id="reasons" method="post" action="{U_ACTION}"> + <fieldset class="tabuled"> + <legend>{L_ACP_REASONS}</legend> + <!-- IF .reasons --> <table cellspacing="1"> <col class="row1" /><col class="row1" /><col class="row2" /> @@ -107,17 +111,16 @@ <!-- ENDIF --> - <form id="reasons" method="post" action="{U_ACTION}"> - - <fieldset class="quick"> + <p class="quick"> <input type="hidden" name="action" value="add" /> <input type="text" name="reason_title" /> <input class="button2" name="addreason" type="submit" value="{L_ADD_NEW_REASON}" /> + </p> </fieldset> </form> <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 77fbbdc764..7a712892e8 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -55,6 +55,7 @@ <!-- END backend --> <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> </fieldset> @@ -91,8 +92,13 @@ <!-- IF backend.S_STATS --> + <form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}"> + {backend.S_HIDDEN_FIELDS} + <fieldset class="tabular"> + <legend>{L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></legend> + <table cellspacing="1"> - <caption>» {L_INDEX_STATS}: {backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption> + <caption>{backend.L_NAME} <!-- IF backend.S_ACTIVE -->({L_ACTIVE}) <!-- ENDIF --></caption> <col class="col1" /><col class="col2" /><col class="col1" /><col class="col2" /> <thead> <tr> @@ -116,15 +122,13 @@ <!-- ENDIF --> - <form id="acp_search_index_{backend.NAME}" method="post" action="{U_ACTION}"> - {backend.S_HIDDEN_FIELDS} - - <fieldset class="quick"> + <p class="quick"> <!-- IF backend.S_INDEXED --> <input class="button2" type="submit" name="action[delete]" value="{L_DELETE_INDEX}" onclick="popup_progress_bar('delete');" /> <!-- ELSE --> <input class="button2" type="submit" name="action[create]" value="{L_CREATE_INDEX}" onclick="popup_progress_bar('create');" /> <!-- ENDIF --> + </p> </fieldset> </form> @@ -134,4 +138,4 @@ <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 27bc628e4e..d592dbaa25 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -22,10 +22,10 @@ <dt><label for="new_id">{L_REPLACE}:</label><br /><span>{L_REPLACE_EXPLAIN}</span></dt> <dd><select name="new_id">{S_REPLACE_OPTIONS}</select></dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button1" type="submit" name="update" value="{L_DELETE}" /> + </p> </fieldset> </form> @@ -62,6 +62,7 @@ <form method="post" action="{U_ACTION}"> <fieldset class="quick" style="text-align: left;"> + <legend>{L_SELECT_IMAGE}</legend> {L_SELECT_IMAGE}: <select name="imgname" onchange="this.form.submit();"> <!-- BEGIN category --> <option class="sep" value="">{category.NAME}</option> @@ -84,6 +85,7 @@ </fieldset> <fieldset> + <legend>{L_IMAGE}</legend> <dl> <dt><label for="imgpath">{L_IMAGE}:</label></dt> <dd><select id="imgpath" name="imgpath" onchange="update_image(this.options[selectedIndex].value);"><option value=""<!-- IF not IMAGE_SELECT--> selected="selected"<!-- ENDIF -->>{L_NO_IMAGE}</option> @@ -103,7 +105,8 @@ </fieldset> <fieldset class="submit-buttons"> - <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" value="{L_RESET}" /> + <legend>{L_SUBMIT}</legend> + <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> <input class="button2" type="reset" value="{L_RESET}" /> </fieldset> </form> @@ -213,6 +216,7 @@ </fieldset> <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> {S_HIDDEN_FIELDS} <input class="button1" id="save" type="submit" name="save" value="{L_SUBMIT}" /> </fieldset> @@ -338,6 +342,7 @@ <!-- ENDIF --> <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> {S_HIDDEN_FIELDS} <input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /> <!-- IF S_SHOWCSS --> @@ -365,10 +370,10 @@ <dt><label for="custom_class">{L_CSS_CLASS_NAME}:</label></dt> <dd><input id="custom_class" name="custom_class" type="text" value="" maxlength="40" size="40" /></dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button1" type="submit" id="add_custom" name="add_custom" value="{L_SUBMIT}" /> + </p> </fieldset> </form> @@ -396,6 +401,8 @@ <p>{L_TEMPLATE_CACHE_EXPLAIN}</p> <form name="acp_styles" method="post" action="{U_ACTION}"> + <fieldset class="tabulated"> + <legend>{L_TEMPLATE_CACHE}</legend> <table cellspacing="1"> <thead> @@ -424,10 +431,11 @@ </tbody> </table> - <fieldset class="quick"> + <p class="quick"> <span class="small"><a href="#" onclick="marklist('acp_styles', 'delete', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('acp_styles', 'delete', false); return false;">{L_UNMARK_ALL}</a></span><br /> <input class="button1" type="submit" id="submit" name="submit" value="{L_DELETE_MARKED}" /> + </p> </fieldset> </form> @@ -477,10 +485,10 @@ <dt><label for="format">{L_ARCHIVE_FORMAT}:</label></dt> <dd>{FORMAT_BUTTONS}</dd> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> + </p> </fieldset> </form> @@ -547,6 +555,7 @@ <form id="acp_styles" method="post" action="{U_ACTION}"> <fieldset class="quick"> + <legend>{L_CREATE}</legend> {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> @@ -618,7 +627,8 @@ <!-- ENDIF --> </fieldset> - <fieldset class="quick"> + <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> <input class="button1" type="submit" name="update" value="{L_SUBMIT}" /> </fieldset> @@ -626,4 +636,4 @@ <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 915cc111d3..873a34b146 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -18,10 +18,10 @@ <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> </dl> - </fieldset> - <fieldset class="quick"> + <p class="quick"> <input type="submit" name="submituser" value="{L_SUBMIT}" class="button1" /> + </p> </fieldset> </form> @@ -746,4 +746,4 @@ var help_line = { <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index 44d5a5228e..17f734c29f 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -23,11 +23,11 @@ <dd><input id="replacement" type="text" name="replacement" value="{REPLACEMENT}" /></dd> </dl> {S_HIDDEN_FIELDS} - </fieldset> - <fieldset class="submit-buttons"> + <p class="submit-buttons"> <input class="button1" type="submit" id="submit" name="save" value="{L_SUBMIT}" /> <input class="button2" type="reset" id="reset" name="reset" value="{L_RESET}" /> + </p> </fieldset> </form> @@ -40,12 +40,12 @@ <form id="acp_words" method="post" action="{U_ACTION}"> - <fieldset class="quick"> + <fieldset class="tabulated"> + <legend>{L_ACP_WORDS}</legend> + <p class="quick"> {S_HIDDEN_FIELDS} <input class="button2" name="add" type="submit" value="{L_ADD_WORD}" /> - </fieldset> - - </form> + </p> <table cellspacing="1"> <thead> @@ -67,6 +67,9 @@ </tbody> </table> + </fieldset> + + </form> <!-- ENDIF --> -<!-- INCLUDE overall_footer.html -->
\ No newline at end of file +<!-- INCLUDE overall_footer.html --> diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index f5c7741fba..16901cd500 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -470,7 +470,7 @@ label img { vertical-align: middle; } -fieldset.quick { +fieldset.quick, p.quick { margin: 0 0 5px 0; padding: 5px 0 0 0; border: none; @@ -479,6 +479,14 @@ fieldset.quick { font-size: 1.1em; } +fieldset.quick legend { + display: none; +} + +fieldset.tabulated { + background-color: #DADFE4; +} + fieldset.nobg { margin: 15px 0 0 0; padding: 0; @@ -603,7 +611,7 @@ input:focus, textarea:focus { } -/* Submit button fieldset +/* Submit button fieldset or paragraph ---------------------------------------- */ fieldset.submit-buttons { text-align: center; @@ -613,10 +621,21 @@ fieldset.submit-buttons { margin-top: -1px; } -fieldset.submit-buttons input { +p.submit-buttons { + text-align: center; + margin: 0; + padding: 4px; + margin-top: 10px; +} + +fieldset.submit-buttons input, p.submit-buttons input { padding: 3px 2px; } +fieldset.submit-buttons legend { + display: none; +} + /* Input field styles ---------------------------------------- */ diff --git a/phpBB/adm/style/install_install.html b/phpBB/adm/style/install_install.html index f84f55d7b1..91a7f25480 100755 --- a/phpBB/adm/style/install_install.html +++ b/phpBB/adm/style/install_install.html @@ -54,12 +54,11 @@ <!-- ENDIF --> <!-- IF S_SHOW_DOWNLOAD --> - <fieldset> - <legend>{L_DL_CONFIG}</legend> - <p>{L_DL_CONFIG_EXPLAIN}</p> - </fieldset> + <h2>{L_DL_CONFIG}</h2> + <p>{L_DL_CONFIG_EXPLAIN}</p> <fieldset class="submit-buttons"> + <legend>{L_DL_CONFIG}</legend> {S_HIDDEN} <input class="button1" type="submit" id="dlconfig" name="dlconfig" value="{L_DL_DOWNLOAD}" /> <input class="button1" type="submit" id="dldone" name="dldone" value="{L_DL_DONE}" /> </fieldset> @@ -67,6 +66,7 @@ <!-- IF L_SUBMIT --> <fieldset class="submit-buttons"> + <legend>{L_SUBMIT}</legend> {S_HIDDEN} <!-- IF L_SUBMIT --><input class="button1" type="submit" id="submit" name="submit" value="{L_SUBMIT}" /><!-- ENDIF --> </fieldset> @@ -74,4 +74,4 @@ </form> -<!-- INCLUDE install_footer.html -->
\ No newline at end of file +<!-- INCLUDE install_footer.html --> |