added code, quote styles to editor

diff --git a/include/bbcode.php b/include/bbcode.php
index 60809a7e2432565e633328e12acf59471319908c..674c44ec29e0985b425a4ba791cf340f453fb717 100644 (file)
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -59,38 +59,11 @@
             $Text = preg_replace("(\[font=(.+?)\](.+?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text);
 
             // Declare the format for [code] layout
-            $CodeLayout = '<table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td class="quotecodeheader"> Code:</td>
-                                </tr>
-                                <tr>
-                                    <td class="codebody">$1</td>
-                                </tr>
-                           </table>';
+            $CodeLayout = '<code>$1</code>';
             // Check for [code] text
             $Text = preg_replace("/\[code\](.+?)\[\/code\]/is","$CodeLayout", $Text);
-            // Declare the format for [php] layout
-            $phpLayout = '<table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td class="quotecodeheader"> Code:</td>
-                                </tr>
-                                <tr>
-                                    <td class="codebody">$1</td>
-                                </tr>
-                           </table>';
-            // Check for [php] text
-            $Text = preg_replace("/\[php\](.+?)\[\/php\]/is",$phpLayout, $Text);
-
             // Declare the format for [quote] layout
-            $QuoteLayout = '<table width="90%" border="0" align="center" cellpadding="0" cellspacing="0">
-                                <tr>
-                                    <td class="quotecodeheader"> Quote:</td>
-                                </tr>
-                                <tr>
-                                    <td class="quotebody">$1</td>
-                                </tr>
-                           </table>';
-                     
+            $QuoteLayout = '<blockquote>$1</blockquote>';                     
             // 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 5586637f3335bee2ccf92d003d90dbfc7666a546..86f9e3d6286616ae5ef594d9dc7f2f5d6245d95d 100644 (file)
--- 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\r
  */\r
 \r
+/* Macgirvin Aug-2010 changed from punbb to dfrn dialect */\r
+\r
 (function() {\r
        tinymce.create('tinymce.plugins.BBCodePlugin', {\r
                init : function(ed, url) {\r
-                       var t = this, dialect = ed.getParam('bbcode_dialect', 'punbb').toLowerCase();\r
+                       var t = this, dialect = ed.getParam('bbcode_dialect', 'dfrn').toLowerCase();\r
 \r
                        ed.onBeforeSetContent.add(function(ed, o) {\r
                                o.content = t['_' + dialect + '_bbcode2html'](o.content);\r
@@ -38,8 +40,8 @@
 \r
                // Private methods\r
 \r
-               // HTML -> BBCode in PunBB dialect\r
-               _punbb_html2bbcode : function(s) {\r
+               // HTML -> BBCode in DFRN dialect\r
+               _dfrn_html2bbcode : function(s) {\r
                        s = tinymce.trim(s);\r
 \r
                        function rep(re, str) {\r
@@ -48,23 +50,10 @@
 \r
                        // example: <strong> to [b]\r
                        rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");\r
-                       rep(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");\r
-                       rep(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");\r
-                       rep(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");\r
-                       rep(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");\r
-                       rep(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");\r
-                       rep(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");\r
                        rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");\r
                        rep(/<font>(.*?)<\/font>/gi,"$1");\r
                        rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");\r
-                       rep(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");\r
-                       rep(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");\r
-                       rep(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");\r
-                       rep(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");\r
-                       rep(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");\r
-                       rep(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");\r
-                       rep(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");\r
-                       rep(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");\r
+                       rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");\r
                        rep(/<\/(strong|b)>/gi,"[/b]");\r
                        rep(/<(strong|b)>/gi,"[b]");\r
                        rep(/<\/(em|i)>/gi,"[/i]");\r
@@ -88,8 +77,8 @@
                        return s; \r
                },\r
 \r
-               // BBCode -> HTML from PunBB dialect\r
-               _punbb_bbcode2html : function(s) {\r
+               // BBCode -> HTML from DFRN dialect\r
+               _dfrn_bbcode2html : function(s) {\r
                        s = tinymce.trim(s);\r
 \r
                        function rep(re, str) {\r
@@ -108,8 +97,8 @@
                        rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");\r
                        rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");\r
                        rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<font color=\"$1\">$2</font>");\r
-                       rep(/\[code\](.*?)\[\/code\]/gi,"<span class=\"codeStyle\">$1</span>&nbsp;");\r
-                       rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<span class=\"quoteStyle\">$1</span>&nbsp;");\r
+                       rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");\r
+                       rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");\r
 \r
                        return s; \r
                }\r

diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index e2b196dc3e7ac2427912edbc7bd2d732e404036e..22e425463c618bdd524c0fdcb0baf3c944a0ff5d 100644 (file)
--- 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 70f6f45f97650447ebf17d18fa0bf5adb9b931f7..b58c8e101cdc7e502cc6430e99c18ec596a153f2 100644 (file)
--- 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;