diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-06 14:03:56 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-06 14:03:56 +0000 |
| commit | c01597499cbfbce0a429b7196a315e1643d9e5c2 (patch) | |
| tree | a93e25f2581db47848a99cbde681193e35f6f74f /phpBB/styles/subSilver | |
| parent | 14b6714c93944b6af9ec01d978cfe7f387dc7e9a (diff) | |
| download | forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.gz forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.bz2 forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.tar.xz forums-c01597499cbfbce0a429b7196a315e1643d9e5c2.zip | |
- added "display_on_posting" setting to custom bbcodes (creates a button with the bbcode tag)
- fixed forum editing and parent id selection
- completely removed HTML support (it only creates security problems)
- changed cache_moderators() to reflect permission changes
git-svn-id: file:///svn/phpbb/trunk@5603 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles/subSilver')
| -rw-r--r-- | phpBB/styles/subSilver/template/posting_body.html | 27 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/ucp_prefs_post.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/subSilver/template/ucp_profile_signature.html | 9 |
3 files changed, 13 insertions, 27 deletions
diff --git a/phpBB/styles/subSilver/template/posting_body.html b/phpBB/styles/subSilver/template/posting_body.html index 389763231d..83162921b6 100644 --- a/phpBB/styles/subSilver/template/posting_body.html +++ b/phpBB/styles/subSilver/template/posting_body.html @@ -14,7 +14,7 @@ var text_name = 'message'; // Define the bbCode tags bbcode = new Array(); -bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]'); +bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[flash=]', '[/flash]','[size=]','[/size]'<!-- BEGIN custom_tags -->, {custom_tags.BBCODE_NAME}<!-- END custom_tags -->); imageTag = false; // Helpline messages @@ -234,21 +234,30 @@ function checkForm() <td colspan="2"><input type="button" class="btnbbcode" accesskey="b" name="addbbcode0" value=" B " style="font-weight:bold; width: 30px;" onclick="bbstyle(0)" onmouseover="helpline('b')" /> <input type="button" class="btnbbcode" accesskey="i" name="addbbcode2" value=" i " style="font-style:italic; width: 30px;" onclick="bbstyle(2)" onmouseover="helpline('i')" /> <input type="button" class="btnbbcode" accesskey="u" name="addbbcode4" value=" u " style="text-decoration: underline; width: 30px;" onclick="bbstyle(4)" onmouseover="helpline('u')" /> - <input type="button" class="btnbbcode" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" /> + <!-- IF S_BBCODE_QUOTE --><input type="button" class="btnbbcode" accesskey="q" name="addbbcode6" value="Quote" style="width: 50px" onclick="bbstyle(6)" onmouseover="helpline('q')" /><!-- ENDIF --> <input type="button" class="btnbbcode" accesskey="c" name="addbbcode8" value="Code" style="width: 40px" onclick="bbstyle(8)" onmouseover="helpline('c')" /> <input type="button" class="btnbbcode" accesskey="l" name="addbbcode10" value="List" style="width: 40px" onclick="bbstyle(10)" onmouseover="helpline('l')" /> <input type="button" class="btnbbcode" accesskey="o" name="addbbcode12" value="List=" style="width: 40px" onclick="bbstyle(12)" onmouseover="helpline('o')" /> - <input type="button" class="btnbbcode" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" /> + <!-- IF S_BBCODE_IMG --><input type="button" class="btnbbcode" accesskey="p" name="addbbcode14" value="Img" style="width: 40px" onclick="bbstyle(14)" onmouseover="helpline('p')" /><!-- ENDIF --> <input type="button" class="btnbbcode" accesskey="w" name="addbbcode16" value="URL" style="text-decoration: underline; width: 40px" onclick="bbstyle(16)" onmouseover="helpline('w')" /> + <!-- IF S_BBCODE_FLASH --><input type="button" class="btnbbcode" accesskey="f" name="addbbcode18" value="Flash" onclick="bbstyle(18)" /><!-- ENDIF --> <span class="genmed" style="white-space: nowrap;">{L_FONT_SIZE}: <select class="gensmall" name="addbbcode20" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" onmouseover="helpline('f')"> <option value="7">{L_FONT_TINY}</option> <option value="9">{L_FONT_SMALL}</option> <option value="12" selected="selected">{L_FONT_NORMAL}</option> <option value="18">{L_FONT_LARGE}</option> <option value="24">{L_FONT_HUGE}</option> - </select> | <a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a></span> + </select> | <a href="javascript:bbstyle(-1)" onmouseover="helpline('a')">{L_CLOSE_TAGS}</a></span> </td> </tr> + <!-- IF .custom_tags --> + <tr valign="middle" align="left"> + <td colspan="2"> + <!-- BEGIN custom_tags --> + <input type="button" class="btnbbcode" name="addbbcode{custom_tags.BBCODE_ID}" value="{custom_tags.BBCODE_TAG}" onclick="bbstyle({custom_tags.BBCODE_ID})" /> + <!-- END custom_tags --> + </td> + <!-- ENDIF --> <tr> <td><input type="text" name="helpbox" style="width:100%" maxlength="100" class="helpline" value="{L_STYLES_TIP}" /></td> <td class="genmed" align="center">{L_FONT_COLOR}</td> @@ -275,9 +284,6 @@ function checkForm() <tr> <td class="row1" valign="top"><b class="genmed">{L_OPTIONS}:</b><br /><table cellspacing="2" cellpadding="0" border="0"> <tr> - <td class="gensmall">{HTML_STATUS}</td> - </tr> - <tr> <td class="gensmall">{BBCODE_STATUS}</td> </tr> <tr> @@ -291,13 +297,6 @@ function checkForm() </tr> </table></td> <td class="row2"><table cellpadding="1"> - <!-- IF S_HTML_ALLOWED --> - <tr> - <td><input type="checkbox" name="disable_html"{S_HTML_CHECKED} class="radio" /></td> - <td class="gen">{L_DISABLE_HTML}</td> - </tr> - <!-- ENDIF --> - <!-- IF S_BBCODE_ALLOWED --> <tr> <td><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} class="radio" /></td> diff --git a/phpBB/styles/subSilver/template/ucp_prefs_post.html b/phpBB/styles/subSilver/template/ucp_prefs_post.html index 4b3bb1537e..8dc01174eb 100644 --- a/phpBB/styles/subSilver/template/ucp_prefs_post.html +++ b/phpBB/styles/subSilver/template/ucp_prefs_post.html @@ -16,10 +16,6 @@ <td class="row2"><input type="radio" name="bbcode" value="1"{DEFAULT_BBCODE_YES} /><span class="gen">{L_YES}</span> <input type="radio" name="bbcode" value="0"{DEFAULT_BBCODE_NO} /><span class="gen">{L_NO}</span></td> </tr> <tr> - <td class="row1" width="50%"><b class="genmed">{L_DEFAULT_HTML}:</b></td> - <td class="row2"><input type="radio" name="html" value="1"{DEFAULT_HTML_YES} /><span class="gen">{L_YES}</span> <input type="radio" name="html" value="0"{DEFAULT_HTML_NO} /><span class="gen">{L_NO}</span></td> - </tr> - <tr> <td class="row1" width="50%"><b class="genmed">{L_DEFAULT_SMILIES}:</b></td> <td class="row2"><input type="radio" name="smilies" value="1"{DEFAULT_SMILIES_YES} /><span class="gen">{L_YES}</span> <input type="radio" name="smilies" value="0"{DEFAULT_SMILIES_NO} /><span class="gen">{L_NO}</span></td> </tr> diff --git a/phpBB/styles/subSilver/template/ucp_profile_signature.html b/phpBB/styles/subSilver/template/ucp_profile_signature.html index 05fc81526b..e121b86395 100644 --- a/phpBB/styles/subSilver/template/ucp_profile_signature.html +++ b/phpBB/styles/subSilver/template/ucp_profile_signature.html @@ -101,9 +101,6 @@ function marklist(form_name, status) <tr> <td class="row1" valign="top"><b class="genmed">{L_OPTIONS}</b><br /><table cellspacing="2" cellpadding="0" border="0"> <tr> - <td class="gensmall">{HTML_STATUS}</td> - </tr> - <tr> <td class="gensmall">{BBCODE_STATUS}</td> </tr> <tr> @@ -117,12 +114,6 @@ function marklist(form_name, status) </tr> </table></td> <td class="row2" valign="top"><table cellspacing="0" cellpadding="1" border="0"> - <!-- IF S_HTML_ALLOWED --> - <tr> - <td><input type="checkbox" name="disable_html"{S_HTML_CHECKED} /></td> - <td class="gen">{L_DISABLE_HTML}</td> - </tr> - <!-- ENDIF --> <!-- IF S_BBCODE_ALLOWED --> <tr> <td><input type="checkbox" name="disable_bbcode"{S_BBCODE_CHECKED} /></td> |
