diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-26 15:51:11 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-26 15:51:11 +0000 |
| commit | a43ead8ee7db832871db9cd2c4f294108398f4b0 (patch) | |
| tree | 417710b9e382752ac1f815633e67f73cdc7e3fe0 /phpBB/adm | |
| parent | 599a5964c064978b15653b05c4709f2c72943bb2 (diff) | |
| download | forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar.gz forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar.bz2 forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.tar.xz forums-a43ead8ee7db832871db9cd2c4f294108398f4b0.zip | |
do not get too excited
git-svn-id: file:///svn/phpbb/trunk@7954 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
23 files changed, 58 insertions, 56 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index ce8a54d6de..f99a2f8a73 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -15,7 +15,7 @@ define('ADMIN_START', true); define('NEED_SID', true); // Include files -$phpbb_root_path = './../'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); require($phpbb_root_path . 'common.' . $phpEx); require($phpbb_root_path . 'includes/functions_admin.' . $phpEx); @@ -141,6 +141,8 @@ function adm_page_header($page_title) 'S_USER_LANG' => $user->lang['USER_LANG'], 'S_CONTENT_DIRECTION' => $user->lang['DIRECTION'], 'S_CONTENT_ENCODING' => 'UTF-8', + 'S_CONTENT_FLOW_BEGIN' => ($user->lang['DIRECTION'] == 'ltr') ? 'left' : 'right', + 'S_CONTENT_FLOW_END' => ($user->lang['DIRECTION'] == 'ltr') ? 'right' : 'left', )); // application/xhtml+xml not used because of IE diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html index cee60b4185..36d8f24f32 100644 --- a/phpBB/adm/style/acp_attachments.html +++ b/phpBB/adm/style/acp_attachments.html @@ -3,7 +3,7 @@ <a name="maincontent"></a> <!-- IF U_BACK --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <!-- ENDIF --> <h1>{L_TITLE}</h1> diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 4370b5e225..8d9827b672 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -4,7 +4,7 @@ <!-- IF S_EDIT_BBCODE --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_ACP_BBCODES}</h1> diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index a80c6db331..2f65a0fbec 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -4,7 +4,7 @@ <!-- IF S_EDIT_BOT --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> @@ -85,11 +85,11 @@ </tbody> </table> - <fieldset class="quick" style="float: left;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> <input class="button2" name="add" type="submit" value="{L_BOT_ADD}" /> </fieldset> - <fieldset class="quick" style="float: right;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> <select name="action">{S_BOT_OPTIONS}</select> <input class="button2" name="submit" type="submit" value="{L_SUBMIT}" /> <p class="small"><a href="#" onclick="marklist('acp_bots', 'mark', true);">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('acp_bots', 'mark', false);">{L_UNMARK_ALL}</a></p> diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 5b06ff2cff..1aef98c36b 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -95,7 +95,7 @@ //--> </script> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE} :: {FORUM_NAME}</h1> @@ -316,7 +316,7 @@ <!-- ELSEIF S_DELETE_FORUM --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_FORUM_DELETE}</h1> @@ -431,7 +431,7 @@ <tr> <td style="width: 5%; text-align: center;">{forums.FOLDER_IMAGE}</td> <td> - <!-- IF forums.FORUM_IMAGE --><div style="float: left; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF --> + <!-- IF forums.FORUM_IMAGE --><div style="float: {S_CONTENT_FLOW_BEGIN}; margin-right: 5px;">{forums.FORUM_IMAGE}</div><!-- ENDIF --> <strong><!-- IF forums.S_FORUM_LINK -->{forums.FORUM_NAME}<!-- ELSE --><a href="{forums.U_FORUM}">{forums.FORUM_NAME}</a><!-- ENDIF --></strong> <!-- IF forums.FORUM_DESCRIPTION --><br /><span>{forums.FORUM_DESCRIPTION}</span><!-- ENDIF --> <!-- IF forums.S_FORUM_POST --><br /><br /><span>{L_TOPICS}: <strong>{forums.FORUM_TOPICS}</strong> / {L_POSTS}: <b>{forums.FORUM_POSTS}</b></span><!-- ENDIF --> diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 3bdeaeaad0..a659207f9e 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -4,7 +4,7 @@ <!-- IF S_EDIT --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_ACP_GROUPS_MANAGE}</h1> @@ -160,7 +160,7 @@ <!-- ELSEIF S_LIST --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_GROUP_MEMBERS} :: {GROUP_NAME}</h1> diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 81f56cc299..9c488c9f90 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -41,7 +41,7 @@ </script> <!-- ENDIF --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> @@ -137,7 +137,7 @@ <!-- ELSEIF S_CHOOSE_PAK --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index d15f722e98..c016251d38 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -4,7 +4,7 @@ <!-- IF S_SELECT_METHOD --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_SELECT_DOWNLOAD_FORMAT}</h1> @@ -26,7 +26,7 @@ <!-- ELSEIF S_DETAILS --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_LANGUAGE_PACK_DETAILS}</h1> @@ -107,12 +107,12 @@ <form id="lang_entries" method="post" action="{U_ENTRY_ACTION}"> <!-- IF S_FROM_STORE --> - <fieldset class="quick" style="float: left;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> <input type="submit" name="remove_store" value="{L_REMOVE_FROM_STORAGE_FOLDER}" class="button2" /> </fieldset> <!-- ENDIF --> - <fieldset class="quick" style="float: right;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> <select name="language_file">{S_LANG_OPTIONS}</select> <input type="submit" class="button2" name="change" value="{L_SELECT}" /> </fieldset> @@ -166,7 +166,7 @@ <!-- ELSEIF S_UPLOAD --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_UPLOAD_SETTINGS}</h1> diff --git a/phpBB/adm/style/acp_logs.html b/phpBB/adm/style/acp_logs.html index 19696c014a..e18c4882c5 100644 --- a/phpBB/adm/style/acp_logs.html +++ b/phpBB/adm/style/acp_logs.html @@ -72,8 +72,8 @@ <!-- IF S_CLEARLOGS --> <fieldset class="quick"> - <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> - <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /><br /> + <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /> + <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /><br /> <p class="small"><a href="#" onclick="marklist('list', 'mark', true); return false;">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('list', 'mark', false); return false;">{L_UNMARK_ALL}</a></p> </fieldset> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 24abb5c8d3..3fafd1288b 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -55,7 +55,7 @@ //--> </script> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE} :: {MODULENAME}</h1> @@ -177,7 +177,7 @@ <form id="quick" method="post" action="{U_ACTION}"> - <fieldset class="quick" style="float: right;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> <input type="hidden" name="action" value="quickadd" /> <select name="quick_install">{S_INSTALL_OPTIONS}</select> @@ -188,7 +188,7 @@ <form id="module" method="post" action="{U_ACTION}"> - <fieldset class="quick" style="float: left;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> <input type="hidden" name="action" value="add" /> <input type="hidden" name="module_parent_id" value="{PARENT_ID}" /> diff --git a/phpBB/adm/style/acp_permission_roles.html b/phpBB/adm/style/acp_permission_roles.html index 83256ff78d..e16d7598ab 100644 --- a/phpBB/adm/style/acp_permission_roles.html +++ b/phpBB/adm/style/acp_permission_roles.html @@ -22,7 +22,7 @@ <script type="text/javascript" src="style/permissions.js"></script> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index 862ba6e8d2..5eb9c2eab3 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -108,7 +108,7 @@ <!-- ELSEIF S_SELECT_USERGROUP --> - <div style="float: left; width: 48%;"> + <div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;"> <!-- IF S_CAN_SELECT_USER --> @@ -138,7 +138,7 @@ <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><label><input type="checkbox" class="radio" id="anonymous" name="user_id[]" value="{ANONYMOUS_USER_ID}" /> {L_SELECT_ANONYMOUS}</label></dd> + <dd class="full" style="text-align: left;"><div style="float: {S_CONTENT_FLOW_END};">[ <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> @@ -153,7 +153,7 @@ </div> - <div style="float: right; width: 48%"> + <div style="float: {S_CONTENT_FLOW_END}; width: 48%"> <!-- IF S_CAN_SELECT_GROUP --> @@ -198,7 +198,7 @@ <!-- ELSEIF S_SELECT_USERGROUP_VIEW --> - <div style="float: left; width: 48%;"> + <div style="float: {S_CONTENT_FLOW_BEGIN}; width: 48%;"> <h1>{L_USERS}</h1> @@ -239,7 +239,7 @@ </div> - <div style="float: right; width: 48%"> + <div style="float: {S_CONTENT_FLOW_END}; width: 48%"> <h1>{L_USERGROUPS}</h1> @@ -305,14 +305,14 @@ <br /> - <fieldset class="quick" style="float: right;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> <strong>» {L_PERMISSION_TYPE}</strong> </fieldset> <!-- IF S_PERMISSION_DROPDOWN --> <form id="pselect" method="post" action="{U_ACTION}"> - <fieldset class="quick" style="float: left;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> {S_HIDDEN_FIELDS} {L_SELECT_TYPE}: <select name="type">{S_PERMISSION_DROPDOWN}</select> @@ -340,7 +340,7 @@ <br /><br /> - <fieldset class="quick" style="float: right;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> <input class="button1" type="submit" name="action[apply_all_permissions]" value="{L_APPLY_ALL_PERMISSIONS}" /> <input class="button2" type="button" name="cancel" value="{L_RESET}" onclick="document.forms['set-permissions'].reset(); init_colours(active_pmask + active_fmask);" /> </fieldset> diff --git a/phpBB/adm/style/acp_profile.html b/phpBB/adm/style/acp_profile.html index e14e622080..bd9f0cc9a0 100644 --- a/phpBB/adm/style/acp_profile.html +++ b/phpBB/adm/style/acp_profile.html @@ -4,7 +4,7 @@ <!-- IF S_EDIT --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> @@ -123,11 +123,11 @@ <!-- END option --> </fieldset> - <fieldset class="quick" style="float: left;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> <input class="button1" type="submit" name="prev" value="{L_PROFILE_BASIC_OPTIONS}" /> </fieldset> - <fieldset class="quick" style="float: right"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> {S_HIDDEN_FIELDS} <input class="button1" type="submit" name="next" value="{L_NEXT_STEP}" /> </fieldset> @@ -146,11 +146,11 @@ </fieldset> <!-- END options --> - <fieldset class="quick" style="float: left;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_BEGIN};"> <input class="button1" type="submit" name="prev" value="{L_PROFILE_TYPE_OPTIONS}" /> </fieldset> - <fieldset class="quick" style="float: right;"> + <fieldset class="quick" style="float: {S_CONTENT_FLOW_END};"> {S_HIDDEN_FIELDS} <input class="button1" type="submit" name="save" value="{L_SAVE}" /> </fieldset> diff --git a/phpBB/adm/style/acp_prune_forums.html b/phpBB/adm/style/acp_prune_forums.html index 5629c11ff7..8d8f913b53 100644 --- a/phpBB/adm/style/acp_prune_forums.html +++ b/phpBB/adm/style/acp_prune_forums.html @@ -57,7 +57,7 @@ <!-- ELSE --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_ACP_PRUNE_FORUMS}</h1> diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index a8d496e257..bfb805f3d8 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -4,7 +4,7 @@ <!-- IF S_EDIT --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <script type="text/javascript"> <!-- diff --git a/phpBB/adm/style/acp_reasons.html b/phpBB/adm/style/acp_reasons.html index fc16d5f53c..3ad32e7d39 100644 --- a/phpBB/adm/style/acp_reasons.html +++ b/phpBB/adm/style/acp_reasons.html @@ -4,7 +4,7 @@ <!-- IF S_EDIT_REASON --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> @@ -81,7 +81,7 @@ <!-- BEGIN reasons --> <tr> <td> - <i style="float: right; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i> + <i style="float: {S_CONTENT_FLOW_END}; font-size: .9em;"><!-- IF reasons.S_TRANSLATED -->{L_IS_TRANSLATED}<!-- ELSE -->{L_IS_NOT_TRANSLATED}<!-- ENDIF --></i> <strong>{reasons.REASON_TITLE}<!-- IF reasons.S_OTHER_REASON --> *<!-- ENDIF --></strong> <br /><span>{reasons.REASON_DESCRIPTION}</span> </td> diff --git a/phpBB/adm/style/acp_styles.html b/phpBB/adm/style/acp_styles.html index 58d742ba62..c555071fee 100644 --- a/phpBB/adm/style/acp_styles.html +++ b/phpBB/adm/style/acp_styles.html @@ -4,7 +4,7 @@ <!-- IF S_DELETE --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> @@ -32,7 +32,7 @@ <!-- ELSEIF S_EDIT_IMAGESET --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> @@ -180,7 +180,7 @@ //--> </script> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_EDIT}</h1> @@ -280,7 +280,7 @@ //--> </script> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TEMPLATE_CACHE}</h1> @@ -328,7 +328,7 @@ <!-- ELSEIF S_EXPORT --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> @@ -455,7 +455,7 @@ <!-- ELSEIF S_DETAILS --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_TITLE}</h1> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index 307ddb75e4..a7ac71abed 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -28,7 +28,7 @@ <!-- ELSEIF S_SELECT_FORUM --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_USER_ADMIN}</h1> @@ -52,7 +52,7 @@ <!-- ELSE --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_USER_ADMIN} :: {MANAGED_USERNAME}</h1> @@ -207,7 +207,7 @@ <!-- ELSEIF S_PERMISSIONS --> - <div style="float: right;"> + <div style="float: {S_CONTENT_FLOW_END};"> <a href="{U_USER_PERMISSIONS}">» {L_SET_USERS_PERMISSIONS}</a><br /> <a href="{U_USER_FORUM_PERMISSIONS}">» {L_SET_USERS_FORUM_PERMISSIONS}</a> </div> diff --git a/phpBB/adm/style/acp_users_feedback.html b/phpBB/adm/style/acp_users_feedback.html index 0f64888170..e1d4076e4d 100644 --- a/phpBB/adm/style/acp_users_feedback.html +++ b/phpBB/adm/style/acp_users_feedback.html @@ -52,8 +52,8 @@ <!-- IF S_CLEARLOGS --> <fieldset class="quick"> - <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> - <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /> + <input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" /> + <input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" /> <p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> • <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p> </fieldset> <!-- ENDIF --> diff --git a/phpBB/adm/style/acp_words.html b/phpBB/adm/style/acp_words.html index fa85669595..055a616f70 100644 --- a/phpBB/adm/style/acp_words.html +++ b/phpBB/adm/style/acp_words.html @@ -4,7 +4,7 @@ <!-- IF S_EDIT_WORD --> - <a href="{U_BACK}" style="float: right">« {L_BACK}</a> + <a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a> <h1>{L_ACP_WORDS}</h1> diff --git a/phpBB/adm/style/install_update_diff.html b/phpBB/adm/style/install_update_diff.html index 799ca34292..ce1a241abe 100644 --- a/phpBB/adm/style/install_update_diff.html +++ b/phpBB/adm/style/install_update_diff.html @@ -239,7 +239,7 @@ table.hrdiff caption span { <div id="main"> <!-- IF S_DIFF_CONFLICT_FILE --> - <div style="float: right;"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div> + <div style="float: {S_CONTENT_FLOW_END};"><strong>{L_NUM_CONFLICTS}: {NUM_CONFLICTS}</strong></div> <!-- ENDIF --> {DIFF_CONTENT} </div> diff --git a/phpBB/adm/style/permission_trace.html b/phpBB/adm/style/permission_trace.html index 93ef8553c8..186bb28b67 100644 --- a/phpBB/adm/style/permission_trace.html +++ b/phpBB/adm/style/permission_trace.html @@ -2,7 +2,7 @@ <div style="background-color: #fff; padding: 10px; margin-top: 10px;" class="permissions"> - <!-- IF U_BACK --><a href="{U_BACK}" style="float: right">« {L_BACK}</a><!-- ENDIF --> + <!-- IF U_BACK --><a href="{U_BACK}" style="float: {S_CONTENT_FLOW_END};">« {L_BACK}</a><!-- ENDIF --> <h3>{L_TRACE_FOR}: {PERMISSION_USERNAME} / <!-- IF FORUM_NAME -->{FORUM_NAME} / <!-- ENDIF -->{PERMISSION} </h3> diff --git a/phpBB/adm/swatch.php b/phpBB/adm/swatch.php index 88da54d504..8573b9e530 100644 --- a/phpBB/adm/swatch.php +++ b/phpBB/adm/swatch.php @@ -12,7 +12,7 @@ * @ignore */ define('IN_PHPBB', true); -$phpbb_root_path = './../'; +$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); |