From: <se...@us...> - 2009-08-07 18:40:56
|
Revision: 20680 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=20680&view=rev Author: sept_7 Date: 2009-08-07 18:40:50 +0000 (Fri, 07 Aug 2009) Log Message: ----------- [ENH] Better handling for Quicktags for htmltowiki and autosave for FCK Modified Paths: -------------- branches/experimental/coe/lib/ajax/tikitohtml.php branches/experimental/coe/setup_fckeditor.php branches/experimental/coe/templates/setup_fckeditor.tpl Modified: branches/experimental/coe/lib/ajax/tikitohtml.php =================================================================== --- branches/experimental/coe/lib/ajax/tikitohtml.php 2009-08-07 18:39:56 UTC (rev 20679) +++ branches/experimental/coe/lib/ajax/tikitohtml.php 2009-08-07 18:40:50 UTC (rev 20680) @@ -13,30 +13,30 @@ function WikiToHTML($data) { global $user,$tikilib, $prefs; - + $options['absolute_links'] = true; $options['noparseplugins'] = false; $options['noheaderinc'] = true; $options['fck'] = 'y'; - $secedit = $prefs['wiki_edit_section']; - $prefs['wiki_edit_section'] = 'n'; // get rid of the section edit icons - $exticons = $prefs['feature_wiki_ext_icon']; - $prefs['feature_wiki_ext_icon'] = 'n'; // and the external link icons - $editplugin = $prefs['wiki_edit_plugin']; - $prefs['wiki_edit_plugin'] = 'n'; // and the external link icons + $secedit = $prefs['wiki_edit_section']; + $prefs['wiki_edit_section'] = 'n'; // get rid of the section edit icons + $exticons = $prefs['feature_wiki_ext_icon']; + $prefs['feature_wiki_ext_icon'] = 'n'; // and the external link icons + $editplugin = $prefs['wiki_edit_plugin']; + $prefs['wiki_edit_plugin'] = 'n'; // and the external link icons $response = new xajaxResponse('UTF-8'); - // remove show/hide headings - $data = preg_replace('/(!!*)[\+\-]/m','$1', $data); + // remove show/hide headings + $data = preg_replace('/(!!*)[\+\-]/m','$1', $data); $content = $tikilib->parse_data($data,$options); // remove spans round img's - $content = preg_replace('/<span class=\"img\">(.*?)<\/span>/im','$1', $content); - $response->script("loadHTMLFromAjax('".urlencode($content)."')"); - $prefs['wiki_edit_section'] = $secedit; - $prefs['feature_wiki_ext_icon'] = $exticons; - $prefs['wiki_edit_plugin'] = $editplugin; + $content = preg_replace('/<span class=\"img\">(.*?)<\/span>/im','$1', $content); + $response->script("loadHTMLFromAjax('".addcslashes(urlencode($content),"'")."')"); + $prefs['wiki_edit_section'] = $secedit; + $prefs['feature_wiki_ext_icon'] = $exticons; + $prefs['wiki_edit_plugin'] = $editplugin; //file_put_contents('/tmp/fckeditor_wiki.txt', $response->getOutput() ); - + return $response; } Modified: branches/experimental/coe/setup_fckeditor.php =================================================================== --- branches/experimental/coe/setup_fckeditor.php 2009-08-07 18:39:56 UTC (rev 20679) +++ branches/experimental/coe/setup_fckeditor.php 2009-08-07 18:40:50 UTC (rev 20680) @@ -11,9 +11,16 @@ $smarty->assign('fckstyle',$fckstyle); $section = isset($_GET['section']) ? $_GET['section'] : 'wiki page'; - $quicktags = QuicktagsList::fromPreference( $section ); -file_put_contents('temp/cache/foo', print_r($quicktags->getWysiwygArray(), true)); -$smarty->assign('toolbar', $quicktags->getWysiwygArray() ); +if ( $prefs['wysiwyg_htmltowiki'] == 'y' ) { + $quicktags->insertTag('source', true); +} +if ( $prefs['feature_ajax_autosave'] == 'y' ) { + $quicktags->insertTag('autosave', true); +} + +$toolbar = $quicktags->getWysiwygArray(); +//file_put_contents('temp/cache/foo', print_r($toolbar, true)); +$smarty->assign('toolbar', $toolbar ); $smarty->display('setup_fckeditor.tpl', null, null, 'application/javascript'); Modified: branches/experimental/coe/templates/setup_fckeditor.tpl =================================================================== --- branches/experimental/coe/templates/setup_fckeditor.tpl 2009-08-07 18:39:56 UTC (rev 20679) +++ branches/experimental/coe/templates/setup_fckeditor.tpl 2009-08-07 18:40:50 UTC (rev 20680) @@ -10,12 +10,6 @@ FCKConfig.FontNames = 'sans serif;serif;monospace;Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana' ; FCKConfig.ToolbarSets["Tiki"] = [ -{if $prefs.wysiwyg_htmltowiki eq 'y'} - ['Source'], -{/if} -{if $prefs.feature_ajax_autosave eq 'y'} - ['ajaxAutoSave'], -{/if} {foreach item=it from=$toolbar name=lines} {foreach item=i from=$it name=item} [{foreach item=m from=$i name=im}'{$m}'{if $smarty.foreach.im.index+1 ne $smarty.foreach.im.total},{/if}{/foreach}]{if $smarty.foreach.lines.index+1 ne $smarty.foreach.lines.total},{/if} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |