diff --git a/include/bbcode.php b/include/bbcode.php index 60809a7e24..674c44ec29 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -59,38 +59,11 @@ $Text = preg_replace("(\[font=(.+?)\](.+?)\[\/font\])","$2",$Text); // Declare the format for [code] layout - $CodeLayout = ' - - - - - - -
Code:
$1
'; + $CodeLayout = '$1'; // Check for [code] text $Text = preg_replace("/\[code\](.+?)\[\/code\]/is","$CodeLayout", $Text); - // Declare the format for [php] layout - $phpLayout = ' - - - - - - -
Code:
$1
'; - // Check for [php] text - $Text = preg_replace("/\[php\](.+?)\[\/php\]/is",$phpLayout, $Text); - // Declare the format for [quote] layout - $QuoteLayout = ' - - - - - - -
Quote:
$1
'; - + $QuoteLayout = '
$1
'; // Check for [quote] text $Text = preg_replace("/\[quote\](.+?)\[\/quote\]/is","$QuoteLayout", $Text); diff --git a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js index 5586637f33..86f9e3d628 100644 --- a/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js +++ b/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js @@ -8,10 +8,12 @@ * Contributing: http://tinymce.moxiecode.com/contributing */ +/* Macgirvin Aug-2010 changed from punbb to dfrn dialect */ + (function() { tinymce.create('tinymce.plugins.BBCodePlugin', { init : function(ed, url) { - var t = this, dialect = ed.getParam('bbcode_dialect', 'punbb').toLowerCase(); + var t = this, dialect = ed.getParam('bbcode_dialect', 'dfrn').toLowerCase(); ed.onBeforeSetContent.add(function(ed, o) { o.content = t['_' + dialect + '_bbcode2html'](o.content); @@ -38,8 +40,8 @@ // Private methods - // HTML -> BBCode in PunBB dialect - _punbb_html2bbcode : function(s) { + // HTML -> BBCode in DFRN dialect + _dfrn_html2bbcode : function(s) { s = tinymce.trim(s); function rep(re, str) { @@ -48,23 +50,10 @@ // example: to [b] rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]"); - rep(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"); - rep(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"); - rep(/(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]"); - rep(/(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]"); - rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]"); - rep(/(.*?)<\/font>/gi,"[color=$1]$2[/color]"); rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]"); rep(/(.*?)<\/font>/gi,"$1"); rep(//gi,"[img]$1[/img]"); - rep(/(.*?)<\/span>/gi,"[code]$1[/code]"); - rep(/(.*?)<\/span>/gi,"[quote]$1[/quote]"); - rep(/(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]"); - rep(/(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]"); - rep(/(.*?)<\/em>/gi,"[code][i]$1[/i][/code]"); - rep(/(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]"); - rep(/(.*?)<\/u>/gi,"[code][u]$1[/u][/code]"); - rep(/(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]"); + rep(/(.*?)<\/code>/gi,"[code]$1[/code]"); rep(/<\/(strong|b)>/gi,"[/b]"); rep(/<(strong|b)>/gi,"[b]"); rep(/<\/(em|i)>/gi,"[/i]"); @@ -88,8 +77,8 @@ return s; }, - // BBCode -> HTML from PunBB dialect - _punbb_bbcode2html : function(s) { + // BBCode -> HTML from DFRN dialect + _dfrn_bbcode2html : function(s) { s = tinymce.trim(s); function rep(re, str) { @@ -108,8 +97,8 @@ rep(/\[url\](.*?)\[\/url\]/gi,"$1"); rep(/\[img\](.*?)\[\/img\]/gi,""); rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"$2"); - rep(/\[code\](.*?)\[\/code\]/gi,"$1 "); - rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"$1 "); + rep(/\[code\](.*?)\[\/code\]/gi,"$1"); + rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"
$1
"); return s; } diff --git a/view/jot-header.tpl b/view/jot-header.tpl index e2b196dc3e..22e425463c 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -7,13 +7,12 @@ tinyMCE.init({ mode : "specific_textareas", editor_selector: /(profile-jot-text|prvmail-text)/, plugins : "bbcode", - theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor", + theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "center", - theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle", - content_css : "bbcode.css", + theme_advanced_blockformats : "blockquote,code", entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, diff --git a/view/style.css b/view/style.css index 70f6f45f97..b58c8e101c 100644 --- a/view/style.css +++ b/view/style.css @@ -16,6 +16,21 @@ img { width: 600px; } +code { + font-family: monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1; + background: #000000; + color: #44FF44; + padding: 10px; +} + +blockquote:before { + content: '>> '; +} + body { background: #FEFEFE; color: #444444;