diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-05-06 15:15:40 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-05-06 15:15:40 +0000 |
| commit | 2ee2701eb1740d6f908e1ba905c8f7ab78ded061 (patch) | |
| tree | d208b7b763e7293f71e013c69a00cd4ff78dde52 /phpBB/styles/subSilver | |
| parent | 3640410cc0d753ab81612c7e5c914ecfb47b27fe (diff) | |
| download | forums-2ee2701eb1740d6f908e1ba905c8f7ab78ded061.tar forums-2ee2701eb1740d6f908e1ba905c8f7ab78ded061.tar.gz forums-2ee2701eb1740d6f908e1ba905c8f7ab78ded061.tar.bz2 forums-2ee2701eb1740d6f908e1ba905c8f7ab78ded061.tar.xz forums-2ee2701eb1740d6f908e1ba905c8f7ab78ded061.zip | |
- 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
Diffstat (limited to 'phpBB/styles/subSilver')
10 files changed, 43 insertions, 43 deletions
diff --git a/phpBB/styles/subSilver/template/mcp_ban.html b/phpBB/styles/subSilver/template/mcp_ban.html index 62b45e90dd..5c55bbd62c 100644 --- a/phpBB/styles/subSilver/template/mcp_ban.html +++ b/phpBB/styles/subSilver/template/mcp_ban.html @@ -6,19 +6,19 @@ var ban_length = new Array(); ban_length[-1] = ""; <!-- BEGIN ban_length --> - ban_length['{ban_length.BAN_ID}'] = "{ban_length.LENGTH}"; + ban_length['{ban_length.BAN_ID}'] = "{ban_length.A_LENGTH}"; <!-- END ban_length --> var ban_reason = new Array(); ban_reason[-1] = ""; <!-- BEGIN ban_reason --> - ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.REASON}"; + ban_reason['{ban_reason.BAN_ID}'] = "{ban_reason.A_REASON}"; <!-- END ban_reason --> var ban_give_reason = new Array(); ban_give_reason[-1] = ""; <!-- BEGIN ban_give_reason --> - 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}"; <!-- END ban_give_reason --> function display_details(option) @@ -84,15 +84,15 @@ </tr> <tr> <td class="row1" valign="top"><b>{L_BAN_LENGTH}:</b></td> - <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanlength" /></td> + <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanlength" disabled="disabled" /></td> </tr> <tr> <td class="row1" valign="top"><b>{L_BAN_REASON}:</b></td> - <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanreason" /></td> + <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbanreason" disabled="disabled" /></td> </tr> <tr> <td class="row1" valign="top"><b>{L_BAN_GIVE_REASON}:</b></td> - <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbangivereason" /></td> + <td class="row2"><input style="border: 0px; width: 100%" type="text" name="unbangivereason" disabled="disabled" /></td> </tr> <tr> <td class="cat" colspan="2" align="center"><input type="submit" name="unbansubmit" value="{L_SUBMIT}" class="btnmain" /> <input type="reset" value="{L_RESET}" class="btnlite" /> </td> diff --git a/phpBB/styles/subSilver/template/memberlist_email.html b/phpBB/styles/subSilver/template/memberlist_email.html index b7fa3259fa..358afeaa83 100644 --- a/phpBB/styles/subSilver/template/memberlist_email.html +++ b/phpBB/styles/subSilver/template/memberlist_email.html @@ -9,11 +9,11 @@ function checkForm(formObj) { formErrors = false; if (formObj.message.value.length < 2) { - formErrors = "{L_EMPTY_MESSAGE_EMAIL}"; + formErrors = "{LA_EMPTY_MESSAGE_EMAIL}"; } else if ( formObj.subject.value.length < 2) { - formErrors = "{L_EMPTY_SUBJECT_EMAIL}"; + formErrors = "{LA_EMPTY_SUBJECT_EMAIL}"; } if (formErrors) { diff --git a/phpBB/styles/subSilver/template/overall_header.html b/phpBB/styles/subSilver/template/overall_header.html index 0ea0ed442d..ca3a06c871 100644 --- a/phpBB/styles/subSilver/template/overall_header.html +++ b/phpBB/styles/subSilver/template/overall_header.html @@ -27,7 +27,7 @@ <!-- IF S_USER_PM_POPUP --> if ({S_NEW_PM}) { - window.open('{U_JS_POPUP_PM}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400'); + window.open('{UA_POPUP_PM}', '_phpbbprivmsg', 'HEIGHT=225,resizable=yes,WIDTH=400'); } <!-- ENDIF --> @@ -39,7 +39,7 @@ function popup(url, width, height) function jumpto() { - var page = prompt('{L_JUMP_PAGE}:', '{ON_PAGE}'); + var page = prompt('{LA_JUMP_PAGE}:', '{ON_PAGE}'); var perpage = '{PER_PAGE}'; var base_url = '{BASE_URL}'; diff --git a/phpBB/styles/subSilver/template/posting_attach_body.html b/phpBB/styles/subSilver/template/posting_attach_body.html index b0ece56d50..6fc214c976 100644 --- a/phpBB/styles/subSilver/template/posting_attach_body.html +++ b/phpBB/styles/subSilver/template/posting_attach_body.html @@ -3,7 +3,7 @@ function popup_progress_bar() { close_waitscreen = 0; - window.open('{U_PROGRESS_BAR}', '_upload', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400'); + window.open('{UA_PROGRESS_BAR}', '_upload', 'HEIGHT=200,resizable=yes,scrollbars=no,WIDTH=400'); } //--> </script> 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() <td class="gensmall" align="center"><b>{L_SMILIES}</b></td> </tr> <tr> - <td align="center"><!-- BEGIN smiley --><a href="javascript:smiley('{smiley.SMILEY_CODE}')" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" onclick="smiley('{smiley.SMILEY_CODE}');return false" hspace="2" vspace="2" /></a> <!-- END smiley --></td> + <td align="center"><!-- BEGIN smiley --><a href="javascript:smiley('{smiley.A_SMILEY_CODE}')" style="line-height: 20px;"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" onclick="smiley('{smiley.A_SMILEY_CODE}');return false" hspace="2" vspace="2" /></a> <!-- END smiley --></td> </tr> <!-- IF S_SHOW_SMILEY_LINK --> 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) { <th height="28">{L_SMILIES}</th> </tr> <tr> - <td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="javascript:smiley('{smiley.SMILEY_CODE}')"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" onclick="smiley('{smiley.SMILEY_CODE}');return false" /></a> <!-- END smiley --><br /><a class="nav" href="javascript:window.close();">{L_CLOSE_WINDOW}</a></td> + <td class="row1" align="center" valign="middle"><!-- BEGIN smiley --> <a href="javascript:smiley('{smiley.A_SMILEY_CODE}')"><img src="{smiley.SMILEY_IMG}" width="{smiley.SMILEY_WIDTH}" height="{smiley.SMILEY_HEIGHT}" border="0" alt="{smiley.SMILEY_DESC}" title="{smiley.SMILEY_DESC}" hspace="2" vspace="2" onclick="smiley('{smiley.A_SMILEY_CODE}');return false" /></a> <!-- END smiley --><br /><a class="nav" href="javascript:window.close();">{L_CLOSE_WINDOW}</a></td> </tr> </table></td> </tr> 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 @@ <script type="text/javascript"> function swatch() { - window.open('{U_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636'); + window.open('{UA_SWATCH}', '_swatch', 'height=115, resizable=yes, scrollbars=no, width=636'); return false; } </script> 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 @@ <!-- function jump_to_inbox() { - opener.document.location.href = "{U_JS_RETURN_INBOX}"; + opener.document.location.href = "{UA_RETURN_INBOX}"; window.close(); } //--> 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){ <tr> <td class="row1" width="50%"><b class="genmed">{L_BOARD_DATE_FORMAT}:</b><br /><span class="gensmall">{L_BOARD_DATE_FORMAT_EXPLAIN}</span></td> <td class="row2"> - <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 = '{DEFAULT_DATEFORMAT}'; } else { document.getElementById('dateformat').value = this.value; }"> + <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> <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" class="post" style="margin-top: 3px;" /></div> 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}"; //--> </script> |