From 2ee2701eb1740d6f908e1ba905c8f7ab78ded061 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Sat, 6 May 2006 15:15:40 +0000 Subject: [PATCH] - introduce LA_, UA_ and A_ template variables (they allow styles to use template variables used for javascript in subSilver outside javascript in their own template while they won't break our javascript if they contain quotes) also fixes [Bug #1116] - corrected page title for search indexing progress bar [Bug #1695] - correct poster name for the anonymous user in mcp_queue and mcp_reports git-svn-id: file:///svn/phpbb/trunk@5888 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/adm/style/acp_ban.html | 12 ++++---- phpBB/adm/style/acp_modules.html | 4 +-- phpBB/adm/style/acp_permissions.html | 2 +- phpBB/adm/style/acp_search.html | 2 +- phpBB/adm/style/acp_users.html | 28 ++++++++--------- phpBB/adm/style/overall_header.html | 4 +-- phpBB/adm/style/simple_header.html | 4 +-- phpBB/includes/acp/acp_ban.php | 9 ++++-- phpBB/includes/acp/acp_groups.php | 3 +- phpBB/includes/acp/acp_modules.php | 8 +++-- phpBB/includes/acp/acp_search.php | 12 +++++--- phpBB/includes/acp/acp_users.php | 1 + phpBB/includes/functions.php | 4 +-- phpBB/includes/functions_posting.php | 13 ++++---- phpBB/includes/mcp/mcp_queue.php | 4 +-- phpBB/includes/mcp/mcp_reports.php | 7 ++++- phpBB/includes/ucp/ucp_groups.php | 3 +- phpBB/includes/ucp/ucp_prefs.php | 1 + phpBB/memberlist.php | 2 +- phpBB/posting.php | 3 +- phpBB/styles/subSilver/template/mcp_ban.html | 12 ++++---- .../subSilver/template/memberlist_email.html | 4 +-- .../subSilver/template/overall_header.html | 4 +-- .../template/posting_attach_body.html | 2 +- .../subSilver/template/posting_body.html | 30 +++++++++---------- .../subSilver/template/posting_smilies.html | 2 +- .../subSilver/template/ucp_groups_manage.html | 2 +- .../subSilver/template/ucp_pm_popup.html | 2 +- .../template/ucp_prefs_personal.html | 2 +- .../template/ucp_profile_signature.html | 26 ++++++++-------- 30 files changed, 116 insertions(+), 96 deletions(-) diff --git a/phpBB/adm/style/acp_ban.html b/phpBB/adm/style/acp_ban.html index 735afc9417..4c645be178 100644 --- a/phpBB/adm/style/acp_ban.html +++ b/phpBB/adm/style/acp_ban.html @@ -14,19 +14,19 @@ var ban_length = new Array(); ban_length[-1] = ""; - ban_length['{ban_length.BAN_ID}'] = "{ban_length.LENGTH}"; + ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}"; var ban_reason = new Array(); ban_reason[-1] = ""; - ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.REASON}"; + ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}"; var ban_give_reason = new Array(); ban_give_reason[-1] = ""; - ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.REASON}"; + ban_give_reason['{ban_give_reason.BAN_ID}'] = "{ban_give_reason.A_REASON}"; function display_details(option) @@ -88,15 +88,15 @@
-
+
-
+
-
+
diff --git a/phpBB/adm/style/acp_modules.html b/phpBB/adm/style/acp_modules.html index 4dca3d404d..20b2fd4399 100644 --- a/phpBB/adm/style/acp_modules.html +++ b/phpBB/adm/style/acp_modules.html @@ -36,8 +36,8 @@ if (value == '{m_names.NAME}') { - item.options[j] = new Option('{m_names.modes.VALUE}'); - item.options[j].value = '{m_names.modes.OPTION}'; + item.options[j] = new Option('{m_names.modes.A_VALUE}'); + item.options[j].value = '{m_names.modes.A_OPTION}'; j++; } diff --git a/phpBB/adm/style/acp_permissions.html b/phpBB/adm/style/acp_permissions.html index e54eb81d47..2d4fcfd28c 100644 --- a/phpBB/adm/style/acp_permissions.html +++ b/phpBB/adm/style/acp_permissions.html @@ -347,7 +347,7 @@ diff --git a/phpBB/adm/style/acp_search.html b/phpBB/adm/style/acp_search.html index 3ec8095720..a4f0a7b1f0 100644 --- a/phpBB/adm/style/acp_search.html +++ b/phpBB/adm/style/acp_search.html @@ -63,7 +63,7 @@ function popup_progress_bar(progress_type) { close_waitscreen = 0; - window.open('{U_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400'); + window.open('{UA_PROGRESS_BAR}&type=' + progress_type, '_index', 'HEIGHT=300,resizable=yes,scrollbars=no,WIDTH=400'); } //--> diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html index a7a66f5d5e..a672db3c4c 100644 --- a/phpBB/adm/style/acp_users.html +++ b/phpBB/adm/style/acp_users.html @@ -348,7 +348,7 @@

{L_BOARD_DATE_FORMAT_EXPLAIN}
-
+
style="display:none;">
@@ -539,19 +539,19 @@ imageTag = false; // Helpline messages - b_help = "{L_BBCODE_B_HELP}"; - i_help = "{L_BBCODE_I_HELP}"; - u_help = "{L_BBCODE_U_HELP}"; - q_help = "{L_BBCODE_Q_HELP}"; - c_help = "{L_BBCODE_C_HELP}"; - l_help = "{L_BBCODE_L_HELP}"; - o_help = "{L_BBCODE_O_HELP}"; - p_help = "{L_BBCODE_P_HELP}"; - w_help = "{L_BBCODE_W_HELP}"; - a_help = "{L_BBCODE_A_HELP}"; - s_help = "{L_BBCODE_S_HELP}"; - f_help = "{L_BBCODE_F_HELP}"; - e_help = "{L_BBCODE_E_HELP}"; + b_help = "{LA_BBCODE_B_HELP}"; + i_help = "{LA_BBCODE_I_HELP}"; + u_help = "{LA_BBCODE_U_HELP}"; + q_help = "{LA_BBCODE_Q_HELP}"; + c_help = "{LA_BBCODE_C_HELP}"; + l_help = "{LA_BBCODE_L_HELP}"; + o_help = "{LA_BBCODE_O_HELP}"; + p_help = "{LA_BBCODE_P_HELP}"; + w_help = "{LA_BBCODE_W_HELP}"; + a_help = "{LA_BBCODE_A_HELP}"; + s_help = "{LA_BBCODE_S_HELP}"; + f_help = "{LA_BBCODE_F_HELP}"; + e_help = "{LA_BBCODE_E_HELP}"; //--> diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html index 232e8bd3ea..41d3991810 100644 --- a/phpBB/adm/style/overall_header.html +++ b/phpBB/adm/style/overall_header.html @@ -12,7 +12,7 @@ diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index 077e60270e..a0246e7b3a 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -16,24 +16,24 @@ bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]',' imageTag = false; // Helpline messages -b_help = "{L_BBCODE_B_HELP}"; -i_help = "{L_BBCODE_I_HELP}"; -u_help = "{L_BBCODE_U_HELP}"; -q_help = "{L_BBCODE_Q_HELP}"; -c_help = "{L_BBCODE_C_HELP}"; -l_help = "{L_BBCODE_L_HELP}"; -o_help = "{L_BBCODE_O_HELP}"; -p_help = "{L_BBCODE_P_HELP}"; -w_help = "{L_BBCODE_W_HELP}"; -a_help = "{L_BBCODE_A_HELP}"; -s_help = "{L_BBCODE_S_HELP}"; -f_help = "{L_BBCODE_F_HELP}"; -e_help = "{L_BBCODE_E_HELP}"; +b_help = "{LA_BBCODE_B_HELP}"; +i_help = "{LA_BBCODE_I_HELP}"; +u_help = "{LA_BBCODE_U_HELP}"; +q_help = "{LA_BBCODE_Q_HELP}"; +c_help = "{LA_BBCODE_C_HELP}"; +l_help = "{LA_BBCODE_L_HELP}"; +o_help = "{LA_BBCODE_O_HELP}"; +p_help = "{LA_BBCODE_P_HELP}"; +w_help = "{LA_BBCODE_W_HELP}"; +a_help = "{LA_BBCODE_A_HELP}"; +s_help = "{LA_BBCODE_S_HELP}"; +f_help = "{LA_BBCODE_F_HELP}"; +e_help = "{LA_BBCODE_E_HELP}"; function checkForm() { if (document.post.message.value.length < 2) { - alert('{L_EMPTY_MESSAGE}'); + alert('{LA_EMPTY_MESSAGE}'); return false; } else { // document.post.post.disabled = true; @@ -217,7 +217,7 @@ function checkForm() {L_SMILIES} - {smiley.SMILEY_DESC} + {smiley.SMILEY_DESC} diff --git a/phpBB/styles/subSilver/template/posting_smilies.html b/phpBB/styles/subSilver/template/posting_smilies.html index 854c57a5b5..81ff78e950 100644 --- a/phpBB/styles/subSilver/template/posting_smilies.html +++ b/phpBB/styles/subSilver/template/posting_smilies.html @@ -24,7 +24,7 @@ function smiley(text) { {L_SMILIES} - {smiley.SMILEY_DESC}
{L_CLOSE_WINDOW} + {smiley.SMILEY_DESC}
{L_CLOSE_WINDOW} diff --git a/phpBB/styles/subSilver/template/ucp_groups_manage.html b/phpBB/styles/subSilver/template/ucp_groups_manage.html index 125ebad9df..7d4b3f6c1a 100644 --- a/phpBB/styles/subSilver/template/ucp_groups_manage.html +++ b/phpBB/styles/subSilver/template/ucp_groups_manage.html @@ -5,7 +5,7 @@ diff --git a/phpBB/styles/subSilver/template/ucp_pm_popup.html b/phpBB/styles/subSilver/template/ucp_pm_popup.html index dd496cafb3..60f9ca7643 100644 --- a/phpBB/styles/subSilver/template/ucp_pm_popup.html +++ b/phpBB/styles/subSilver/template/ucp_pm_popup.html @@ -4,7 +4,7 @@ diff --git a/phpBB/styles/subSilver/template/ucp_prefs_personal.html b/phpBB/styles/subSilver/template/ucp_prefs_personal.html index 595d978f6f..80c894f4cd 100644 --- a/phpBB/styles/subSilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/subSilver/template/ucp_prefs_personal.html @@ -72,7 +72,7 @@ function dE(n,s){ {L_BOARD_DATE_FORMAT}:
{L_BOARD_DATE_FORMAT_EXPLAIN} - {S_DATEFORMAT_OPTIONS}
style="display:none;">
diff --git a/phpBB/styles/subSilver/template/ucp_profile_signature.html b/phpBB/styles/subSilver/template/ucp_profile_signature.html index 316fb89266..21ae225559 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_signature.html +++ b/phpBB/styles/subSilver/template/ucp_profile_signature.html @@ -12,19 +12,19 @@ bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]',' imageTag = false; // Helpline messages -b_help = "{L_BBCODE_B_HELP}"; -i_help = "{L_BBCODE_I_HELP}"; -u_help = "{L_BBCODE_U_HELP}"; -q_help = "{L_BBCODE_Q_HELP}"; -c_help = "{L_BBCODE_C_HELP}"; -l_help = "{L_BBCODE_L_HELP}"; -o_help = "{L_BBCODE_O_HELP}"; -p_help = "{L_BBCODE_P_HELP}"; -w_help = "{L_BBCODE_W_HELP}"; -a_help = "{L_BBCODE_A_HELP}"; -s_help = "{L_BBCODE_S_HELP}"; -f_help = "{L_BBCODE_F_HELP}"; -e_help = "{L_BBCODE_E_HELP}"; +b_help = "{LA_BBCODE_B_HELP}"; +i_help = "{LA_BBCODE_I_HELP}"; +u_help = "{LA_BBCODE_U_HELP}"; +q_help = "{LA_BBCODE_Q_HELP}"; +c_help = "{LA_BBCODE_C_HELP}"; +l_help = "{LA_BBCODE_L_HELP}"; +o_help = "{LA_BBCODE_O_HELP}"; +p_help = "{LA_BBCODE_P_HELP}"; +w_help = "{LA_BBCODE_W_HELP}"; +a_help = "{LA_BBCODE_A_HELP}"; +s_help = "{LA_BBCODE_S_HELP}"; +f_help = "{LA_BBCODE_F_HELP}"; +e_help = "{LA_BBCODE_E_HELP}"; //-->