[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[28741] trunk/lib

[<jon...@us...>]

Revision: 28741
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28741&view=rev
Author:   jonnybradley
Date:     2010-08-28 11:09:41 +0000 (Sat, 28 Aug 2010)

Log Message:
-----------
[ENH] ckeditor: More prefs (skin, fonts etc) deployed, theme css used for editor contents, styles menu started (needs more), and placeholder for templates menu added.

Modified Paths:
--------------
    trunk/lib/prefs/wysiwyg.php
    trunk/lib/smarty_tiki/block.textarea.php

Added Paths:
-----------
    trunk/lib/ckeditor_tiki/tikistyles.js
    trunk/lib/ckeditor_tiki/tikitemplates.js

Added: trunk/lib/ckeditor_tiki/tikistyles.js
===================================================================
--- trunk/lib/ckeditor_tiki/tikistyles.js	                        (rev 0)
+++ trunk/lib/ckeditor_tiki/tikistyles.js	2010-08-28 11:09:41 UTC (rev 28741)
@@ -0,0 +1,19 @@
+/* 
+ * $Id$
+ * (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project
+ * 
+ * All Rights Reserved. See copyright.txt for details and a complete list of authors.
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+ * 
+ * Ckeditor styles definition for Tiki 6
+ */
+
+
+CKEDITOR.stylesSet.add('tikistyles',
+	[
+	 {name:'Normal',element:'p'},
+	 {name:'Title Bar',element:'div',attributes:{'class':'titlebar'}},
+	 {name:'Simple Box',element:'div',attributes:{'class':'simplebox'}},
+	 {name:'Code',element:'div',attributes:{'class':'code'}}
+	]);
+


Property changes on: trunk/lib/ckeditor_tiki/tikistyles.js
___________________________________________________________________
Added: svn:keywords
   + Id

Added: trunk/lib/ckeditor_tiki/tikitemplates.js
===================================================================
--- trunk/lib/ckeditor_tiki/tikitemplates.js	                        (rev 0)
+++ trunk/lib/ckeditor_tiki/tikitemplates.js	2010-08-28 11:09:41 UTC (rev 28741)
@@ -0,0 +1,11 @@
+/* 
+ * $Id$
+ * (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project
+ * 
+ * All Rights Reserved. See copyright.txt for details and a complete list of authors.
+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+ * 
+ * Ckeditor templates definition for Tiki 6
+ * 
+ * TODO: Needs tying in to the content templates somehow - placeholder here for now...
+ */
\ No newline at end of file


Property changes on: trunk/lib/ckeditor_tiki/tikitemplates.js
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: trunk/lib/prefs/wysiwyg.php
===================================================================
--- trunk/lib/prefs/wysiwyg.php	2010-08-28 03:59:14 UTC (rev 28740)
+++ trunk/lib/prefs/wysiwyg.php	2010-08-28 11:09:41 UTC (rev 28741)
@@ -6,6 +6,8 @@
 // $Id$
 
 function prefs_wysiwyg_list() {
+	global $prefs;
+	
 	return array(
 		'wysiwyg_optional' => array(
 			'name' => tra('Wysiwyg Editor is optional'),
@@ -36,10 +38,14 @@
 		'wysiwyg_toolbar_skin' => array(
 			'name' => tra('Toolbar skin'),
 			'type' => 'list',
-			'options' => array(
+			'options' => $prefs['wysiwyg_ckeditor'] != 'y' ? array(
 				'default' => tra('Default'),
 				'office2003' => tra('Office 2003'),
 				'silver' => tra('Silver'),
+			) : array(
+				'kama' => tra('Kama (Default)'),
+				'office2003' => tra('Office 2003'),
+				'v2' => tra('V2 (FCKEditor appearance)'),
 			),
 		),
 		'wysiwyg_ckeditor' => array(

Modified: trunk/lib/smarty_tiki/block.textarea.php
===================================================================
--- trunk/lib/smarty_tiki/block.textarea.php	2010-08-28 03:59:14 UTC (rev 28740)
+++ trunk/lib/smarty_tiki/block.textarea.php	2010-08-28 11:09:41 UTC (rev 28741)
@@ -196,13 +196,35 @@
 ajaxLoadingShow("'.$as_id.'");
 ', 5);	// before dialog tools init (10)
 			}
+			
+			// work out current theme/option (surely in tikilib somewhere?)
+			global $tikilib, $tc_theme, $tc_theme_option;
+			$ckstyleoption = '';
+			if (!empty($tc_theme)) {
+				$ckstyle = $tikilib->get_style_path('', '', $tc_theme);
+				if (!empty($tc_theme_option)) {
+					$ckstyleoption = $tikilib->get_style_path($tc_theme, $tc_theme_option, $tc_theme_option);
+				}
+			} else {
+				$ckstyle = $tikilib->get_style_path('', '', $prefs['style']);
+				if (!empty($prefs['style_option'])) {
+					$ckstyleoption = $tikilib->get_style_path($prefs['style'], $prefs['style_option'], $prefs['style_option']);
+				}
+			}
+
 			$headerlib->add_jq_onready('
 $( "#'.$as_id.'" ).ckeditor(CKeditor_OnComplete, {
 	toolbar_Tiki: '.$cktools.',
 	toolbar: "Tiki",
 	language: "'.$prefs['language'].'",
 	customConfig: "",
-	autoSaveSelf: "'.$auto_save_referrer.'"		// unique reference for each page set up in ensureReferrer()
+	autoSaveSelf: "'.$auto_save_referrer.'",		// unique reference for each page set up in ensureReferrer()
+	font_names: "' . $prefs['wysiwyg_fonts'] . '",
+	stylesSet: "tikistyles:' . $tikiroot . 'lib/ckeditor_tiki/tikistyles.js",
+	templates_files: "' . $tikiroot . 'lib/ckeditor_tiki/tikitemplates.js",
+	contentsCss: ["' . $tikiroot . $ckstyle . '","' . $tikiroot . $ckstyleoption . '"],
+	skin: "' . $prefs['wysiwyg_toolbar_skin'] . '"
+	
 });
 ', 20);	// after dialog tools init (10)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.