jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jalka...@apache.org
Subject svn commit: r673460 - in /incubator/jspwiki/trunk: ./ src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/render/ src/webdocs/scripts/ src/webdocs/scripts/fckeditor/
Date Wed, 02 Jul 2008 18:39:05 GMT
Author: jalkanen
Date: Wed Jul  2 11:39:04 2008
New Revision: 673460

URL: http://svn.apache.org/viewvc?rev=673460&view=rev
Log:
JSPWIKI-61: David Au's patch to fix FCK editor compatibility to 2.6.1 level.

Removed:
    incubator/jspwiki/trunk/src/webdocs/scripts/fckeditor/fckeditor.js
Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java
    incubator/jspwiki/trunk/src/webdocs/scripts/fckconfig.js
    incubator/jspwiki/trunk/src/webdocs/scripts/fckstyles.xml
    incubator/jspwiki/trunk/src/webdocs/scripts/fcktemplates.xml

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=673460&r1=673459&r2=673460&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Jul  2 11:39:04 2008
@@ -1,3 +1,13 @@
+2008-07-02  Janne Jalkanen <jalkanen@apache.org>
+
+        * 2.7.0-alpha-2.  Yes, the last version number was an 
+        anxious mistake.  It's really 2.7 alpha, not 2.8 alpha.
+        
+        * JSPWIKI-61: Added patch from David Au to add FCK 2.6.1
+        support.  Please see the following page to enable it:
+        
+        http://www.jspwiki.org/wiki/HowToManuallyIntegrateFCKEditor
+
 2008-06-30  Janne Jalkanen <jalkanen@apache.org>
 
         * 2.8.0-alpha-1

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=673460&r1=673459&r2=673460&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Wed Jul  2 11:39:04 2008
@@ -63,7 +63,7 @@
     public static final int        VERSION       = 2;
 
     /** The JSPWiki revision. */
-    public static final int        REVISION      = 8;
+    public static final int        REVISION      = 7;
 
     /** The minor revision.  */
     public static final int        MINORREVISION = 0;
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "1";
+    public static final String     BUILD         = "2";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java?rev=673460&r1=673459&r2=673460&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java Wed Jul
 2 11:39:04 2008
@@ -128,15 +128,7 @@
                         }
                     }
                 } // end of check for "a" element
-                else if( elementName.equals( PRE_ELEMENT ) )
-                {
-                    // We need to trim the surrounding whitespace to accomodate a FCK bug:
when the first line
-                    // of a <pre> tag contains only whitespace, then all the linebreaks
in the <pre>
-                    // tag will be lost due to FCK's html tidying.
-                    String text = element.getTextTrim();
-                    element.setText( text );
-                }
-
+                
                 processChildren( element );
             }
         }

Modified: incubator/jspwiki/trunk/src/webdocs/scripts/fckconfig.js
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/fckconfig.js?rev=673460&r1=673459&r2=673460&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/fckconfig.js (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/fckconfig.js Wed Jul  2 11:39:04 2008
@@ -1,37 +1,29 @@
 /*
  * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2007 Frederico Caldeira Knabben
- * 
+ * Copyright (C) 2003-2008 Frederico Caldeira Knabben
+ *
  * == BEGIN LICENSE ==
- * 
+ *
  * Licensed under the terms of any of the following licenses at your
  * choice:
- * 
+ *
  *  - GNU General Public License Version 2 or later (the "GPL")
  *    http://www.gnu.org/licenses/gpl.html
- * 
+ *
  *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
  *    http://www.gnu.org/licenses/lgpl.html
- * 
+ *
  *  - Mozilla Public License Version 1.1 or later (the "MPL")
  *    http://www.mozilla.org/MPL/MPL-1.1.html
- * 
+ *
  * == END LICENSE ==
- * 
- * File Name: fckconfig.js
- * 	Editor configuration settings.
- * 	
- * 	Follow this link for more information:
- * 	http://wiki.fckeditor.net/Developer%27s_Guide/Configuration/Configurations_Settings
- * 
- * File Authors:
- * 		Frederico Caldeira Knabben (www.fckeditor.net)
+ *
+ * Editor configuration settings.
+ *
+ * Follow this link for more information:
+ * http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
  */
 
-// Disable the custom Enter Key Handler (this configuration will be removed in
-// version 2.5).
-FCKConfig.DisableEnterKeyHandler = false ;
-
 // JSPWiki: this option is dynamically configured in the 'FCK.jsp' file
 // to point to this very 'fckconfig.js' file that you are viewing right now.
 //FCKConfig.CustomConfigurationsPath = '' ;
@@ -40,7 +32,7 @@
 // The 'jspwiki.css' file for the active jspwiki template will be used.
 //FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ;
 
-
+FCKConfig.EditorAreaStyles = '' ;
 FCKConfig.ToolbarComboPreviewCSS = '' ;
 
 FCKConfig.DocType = '' ;
@@ -51,15 +43,22 @@
 
 FCKConfig.FullPage = false ;
 
+// The following option determines whether the "Show Blocks" feature is enabled or not at
startup.
+FCKConfig.StartupShowBlocks = false ;
+
 FCKConfig.Debug = false ;
 FCKConfig.AllowQueryStringDebug = true ;
 
 FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ;
+FCKConfig.SkinEditorCSS = '' ;	// FCKConfig.SkinPath + "|<minified css>" ;
+FCKConfig.SkinDialogCSS = '' ;	// FCKConfig.SkinPath + "|<minified css>" ;
+
 FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCKConfig.SkinPath
+ 'images/toolbar.buttonarrow.gif' ] ;
 
 FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
 
 // FCKConfig.Plugins.Add( 'autogrow' ) ;
+// FCKConfig.Plugins.Add( 'dragresizetable' );
 FCKConfig.AutoGrowMax = 400 ;
 
 // FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ;	// ASP style server side code
<%...%>
@@ -87,16 +86,13 @@
 FCKConfig.FormatOutput		= true ;
 FCKConfig.FormatIndentator	= '    ' ;
 
-FCKConfig.ForceStrongEm = true ;
-
-// JSPWiki: enabled this option so that Gecko-based browsers would work with span tags.
-FCKConfig.GeckoUseSPAN	= true ;
 
 // JSPWiki: changed StartupFocus from false to true.
 FCKConfig.StartupFocus	= true ;
 
 FCKConfig.ForcePasteAsPlainText	= false ;
 FCKConfig.AutoDetectPasteFromWord = true ;	// IE only.
+FCKConfig.ShowDropDialog = true ;
 FCKConfig.ForceSimpleAmpersand	= false ;
 FCKConfig.TabSpaces		= 0 ;
 FCKConfig.ShowBorders	= true ;
@@ -104,8 +100,8 @@
 FCKConfig.ToolbarStartExpanded	= true ;
 FCKConfig.ToolbarCanCollapse	= true ;
 FCKConfig.IgnoreEmptyParagraphValue = true ;
-FCKConfig.PreserveSessionOnFileBrowser = false ;
 FCKConfig.FloatingPanelsZIndex = 10000 ;
+FCKConfig.HtmlEncodeOutput = false ;
 
 
 // JSPWiki: set to false so that we don't replace the entire page when inserting plugins
@@ -125,10 +121,16 @@
 
 	['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
 	['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
-	['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
+	
+	// JSPWiki: hide the form buttons since the typical user for this editor isn't likely to
utilize the WikiForm plugins.
+	//['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
 	'/',
 	['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
-	['OrderedList','UnorderedList','-','Outdent','Indent'],
+    
+    // JSPWiki: disabled the Blockquote button
+    ['OrderedList','UnorderedList','-','Outdent','Indent'],
+	//['OrderedList','UnorderedList','-','Outdent','Indent','Blockquote'],
+    
 	['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
 	['Link','Unlink','Anchor'],
    
@@ -138,7 +140,7 @@
 	'/',
 	['Style','FontFormat','FontName','FontSize'],
 	['TextColor','BGColor'],
-	['FitWindow','-','About']
+	['FitWindow','ShowBlocks','-','About']		// No comma for the last row.
 ] ;
 
 FCKConfig.ToolbarSets["Basic"] = [
@@ -153,9 +155,13 @@
 	[ CTRL + 67 /*C*/, true ],
 	[ CTRL + 70 /*F*/, true ],
 	[ CTRL + 83 /*S*/, true ],
+	[ CTRL + 84 /*T*/, true ],
 	[ CTRL + 88 /*X*/, true ],
 	[ CTRL + 86 /*V*/, 'Paste' ],
+	[ CTRL + 45 /*INS*/, true ],
 	[ SHIFT + 45 /*INS*/, 'Paste' ],
+	[ CTRL + 88 /*X*/, 'Cut' ],
+	[ SHIFT + 46 /*DEL*/, 'Cut' ],
 	[ CTRL + 90 /*Z*/, 'Undo' ],
 	[ CTRL + 89 /*Y*/, 'Redo' ],
 	[ CTRL + SHIFT + 90 /*Z*/, 'Redo' ],
@@ -164,26 +170,26 @@
 	[ CTRL + 73 /*I*/, 'Italic' ],
 	[ CTRL + 85 /*U*/, 'Underline' ],
 	[ CTRL + SHIFT + 83 /*S*/, 'Save' ],
-	[ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ],
-	[ CTRL + 9 /*TAB*/, 'Source' ]
+	[ CTRL + ALT + 13 /*ENTER*/, 'FitWindow' ]
 ] ;
 
 // JSPWiki: disabled the context menu items that won't work.
 FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','Table','Form']
;
 //FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form']
;
 
+FCKConfig.BrowserContextMenuOnCtrl = false ;
+FCKConfig.EnableMoreFontColors = true ;
 FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF'
;
 
-// JSPWiki: added additional fonts.
-FCKConfig.FontNames     = 'Arial;Comic Sans MS;Courier New;Georgia;Impact;Tahoma;Times New
Roman;Verdana' ;
-//FCKConfig.FontNames		= 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana'
;
-
-FCKConfig.FontSizes		= '1/xx-small;2/x-small;3/small;4/medium;5/large;6/x-large;7/xx-large'
;
-
 // JSPWiki: disabled h1, h5, h6 since jspwiki does not support them.
 FCKConfig.FontFormats	= 'p;div;h2;h3;h4;pre;address' ;
 //FCKConfig.FontFormats	= 'p;div;pre;address;h1;h2;h3;h4;h5;h6' ;
 
+// JSPWiki: added additional fonts.
+FCKConfig.FontNames     = 'Arial;Comic Sans MS;Courier New;Georgia;Impact;Tahoma;Times New
Roman;Verdana' ;
+//FCKConfig.FontNames		= 'Arial;Comic Sans MS;Courier New;Tahoma;Times New Roman;Verdana'
;
+
+FCKConfig.FontSizes		= 'smaller;larger;xx-small;x-small;small;medium;large;x-large;xx-large'
;
 
 // JSPWiki: these options are dynamically configured in the 'FCK.jsp' file.
 //FCKConfig.StylesXmlPath		= FCKConfig.EditorPath + 'fckstyles.xml' ;
@@ -192,6 +198,7 @@
 FCKConfig.SpellChecker			= 'ieSpell' ;	// 'ieSpell' | 'SpellerPages'
 FCKConfig.IeSpellDownloadUrl	= 'http://www.iespell.com/download.php' ;
 FCKConfig.SpellerPagesServerScript = 'server-scripts/spellchecker.php' ;	// Available extension:
.php .cfm .pl
+FCKConfig.FirefoxSpellChecker	= false ;
 
 FCKConfig.MaxUndoLevels = 15 ;
 
@@ -214,50 +221,144 @@
 FCKConfig.BodyId = '' ;
 FCKConfig.BodyClass = '' ;
 
+FCKConfig.DefaultStyleLabel = '' ;
+FCKConfig.DefaultFontFormatLabel = '' ;
+FCKConfig.DefaultFontLabel = '' ;
+FCKConfig.DefaultFontSizeLabel = '' ;
+
+FCKConfig.DefaultLinkTarget = '' ;
+
 // The option switches between trying to keep the html structure or do the changes so the
content looks like it was in Word
 FCKConfig.CleanWordKeepsStructure = false ;
 
-// The following value defines which File Browser connector and Quick Upload 
+// Only inline elements are valid.
+FCKConfig.RemoveFormatTags = 'b,big,code,del,dfn,em,font,i,ins,kbd,q,samp,small,span,strike,strong,sub,sup,tt,u,var'
;
+
+// Attributes that will be removed
+FCKConfig.RemoveAttributes = 'class,style,lang,width,height,align,hspace,valign' ;
+
+
+FCKConfig.CustomStyles =
+{
+// JSPWiki: the CustomStyles for JSPWiki are defined using the fckstyles.xml file instead.

+//	'Red Title'	: { Element : 'h3', Styles : { 'color' : 'Red' } },
+};
+
+
+	
+// Do not add, rename or remove styles here. Only apply definition changes.
+FCKConfig.CoreStyles =
+{
+	// Basic Inline Styles.
+	'Bold'			: { Element : 'strong', Overrides : 'b' },
+	'Italic'		: { Element : 'em', Overrides : 'i' },
+    
+    // JSPWiki: use the JSPWiki styles for underline, strikethrough, subscript, and superscript
instead of the html tags.
+    'Underline'	: { Element : 'span', Styles : { 'text-decoration' : 'underline' }, Overrides:
'u' },    
+	//'Underline'		: { Element : 'u' },    
+	
+    'StrikeThrough'	: { Element : 'span', Attributes : { 'class' : 'strike' }, Overrides:
'strike' },    
+    //'StrikeThrough'	: { Element : 'strike' },
+    
+	'Subscript'	: { Element : 'span', Attributes : { 'class' : 'sub' }, Overrides: 'sub' },
   
+	//'Subscript'		: { Element : 'sub' },
+    
+    'Superscript'	: { Element : 'span', Attributes : { 'class' : 'sup' }, Overrides: 'sup'
},
+	//'Superscript'	: { Element : 'sup' },
+    
+
+	// Basic Block Styles (Font Format Combo).
+	'p'				: { Element : 'p' },
+	'div'			: { Element : 'div' },
+	'pre'			: { Element : 'pre' },
+	'address'		: { Element : 'address' },
+	'h1'			: { Element : 'h1' },
+	'h2'			: { Element : 'h2' },
+	'h3'			: { Element : 'h3' },
+	'h4'			: { Element : 'h4' },
+	'h5'			: { Element : 'h5' },
+	'h6'			: { Element : 'h6' },
+
+	// Other formatting features.
+	'FontFace' :
+	{
+		Element		: 'span',
+		Styles		: { 'font-family' : '#("Font")' },
+		Overrides	: [ { Element : 'font', Attributes : { 'face' : null } } ]
+	},
+
+	'Size' :
+	{
+		Element		: 'span',
+		Styles		: { 'font-size' : '#("Size","fontSize")' },
+		Overrides	: [ { Element : 'font', Attributes : { 'size' : null } } ]
+	},
+
+	'Color' :
+	{
+		Element		: 'span',
+		Styles		: { 'color' : '#("Color","color")' },
+		Overrides	: [ { Element : 'font', Attributes : { 'color' : null } } ]
+	},
+
+	'BackColor'		: { Element : 'span', Styles : { 'background-color' : '#("Color","color")'
} },
+
+	'SelectionHighlight' : { Element : 'span', Styles : { 'background-color' : 'navy', 'color'
: 'white' } }
+};
+
+// The distance of an indentation step.
+FCKConfig.IndentLength = 40 ;
+FCKConfig.IndentUnit = 'px' ;
+
+// Alternatively, FCKeditor allows the use of CSS classes for block indentation.
+// This overrides the IndentLength/IndentUnit settings.
+FCKConfig.IndentClasses = [] ;
+
+// [ Left, Center, Right, Justified ]
+FCKConfig.JustifyClasses = [] ;
+
+// The following value defines which File Browser connector and Quick Upload
 // "uploader" to use. It is valid for the default implementaion and it is here
-// just to make this configuration file cleaner. 
-// It is not possible to change this value using an external file or even 
-// inline when creating the editor instance. In that cases you must set the 
+// just to make this configuration file cleaner.
+// It is not possible to change this value using an external file or even
+// inline when creating the editor instance. In that cases you must set the
 // values of LinkBrowserURL, ImageBrowserURL and so on.
 // Custom implementations should just ignore it.
-var _FileBrowserLanguage	= 'asp' ;	// asp | aspx | cfm | lasso | perl | php | py
-var _QuickUploadLanguage	= 'asp' ;	// asp | aspx | cfm | lasso | php
+var _FileBrowserLanguage	= 'php' ;	// asp | aspx | cfm | lasso | perl | php | py
+var _QuickUploadLanguage	= 'php' ;	// asp | aspx | cfm | lasso | perl | php | py
 
-// Don't care about the following line. It just calculates the correct connector 
+// Don't care about the following two lines. It just calculates the correct connector
 // extension to use for the default File Browser (Perl uses "cgi").
 var _FileBrowserExtension = _FileBrowserLanguage == 'perl' ? 'cgi' : _FileBrowserLanguage
;
+var _QuickUploadExtension = _QuickUploadLanguage == 'perl' ? 'cgi' : _QuickUploadLanguage
;
 
 // JSPWiki: disabled since the FCKeditor.Java package isn't used.
 FCKConfig.LinkBrowser = false ;
 
-FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector=connectors/'
+ _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
+FCKConfig.LinkBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Connector='
+ encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage
+ '/connector.' + _FileBrowserExtension ) ;
 FCKConfig.LinkBrowserWindowWidth	= FCKConfig.ScreenWidth * 0.7 ;		// 70%
 FCKConfig.LinkBrowserWindowHeight	= FCKConfig.ScreenHeight * 0.7 ;	// 70%
 
 // JSPWiki: disabled since the FCKeditor.Java package isn't being used.
 FCKConfig.ImageBrowser = false ;
 
-FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector=connectors/'
+ _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
+FCKConfig.ImageBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Image&Connector='
+ encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage
+ '/connector.' + _FileBrowserExtension ) ;
 FCKConfig.ImageBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;	// 70% ;
 FCKConfig.ImageBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;	// 70% ;
 
 // JSPWiki: disabled since the FCKeditor.Java package isn't being used.
 FCKConfig.FlashBrowser = false ;
 
-FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector=connectors/'
+ _FileBrowserLanguage + '/connector.' + _FileBrowserExtension ;
+FCKConfig.FlashBrowserURL = FCKConfig.BasePath + 'filemanager/browser/default/browser.html?Type=Flash&Connector='
+ encodeURIComponent( FCKConfig.BasePath + 'filemanager/connectors/' + _FileBrowserLanguage
+ '/connector.' + _FileBrowserExtension ) ;
 FCKConfig.FlashBrowserWindowWidth  = FCKConfig.ScreenWidth * 0.7 ;	//70% ;
 FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ;	//70% ;
 
 // JSPWiki: disabled since the FCKeditor.Java package isn't being used.
 FCKConfig.LinkUpload = false ;
 
-FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage
+ '/upload.' + _QuickUploadLanguage ;
-FCKConfig.LinkUploadAllowedExtensions	= "" ;			// empty for all
-FCKConfig.LinkUploadDeniedExtensions	= ".(html|htm|php|php2|php3|php4|php5|phtml|pwml|inc|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|com|dll|vbs|js|reg|cgi|htaccess|asis)$"
;	// empty for no one
+FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/connectors/' + _QuickUploadLanguage
+ '/upload.' + _QuickUploadExtension ;
+FCKConfig.LinkUploadAllowedExtensions	= ".(7z|aiff|asf|avi|bmp|csv|doc|fla|flv|gif|gz|gzip|jpeg|jpg|mid|mov|mp3|mp4|mpc|mpeg|mpg|ods|odt|pdf|png|ppt|pxd|qt|ram|rar|rm|rmi|rmvb|rtf|sdc|sitd|swf|sxc|sxw|tar|tgz|tif|tiff|txt|vsd|wav|wma|wmv|xls|xml|zip)$"
;			// empty for all
+FCKConfig.LinkUploadDeniedExtensions	= "" ;	// empty for no one
 
 // JSPWiki: disabled since the FCKeditor.Java package isn't being used.
 FCKConfig.ImageUpload = false ;
@@ -282,4 +383,7 @@
 FCKConfig.SmileyImages	= ['regular_smile.gif','sad_smile.gif','wink_smile.gif','teeth_smile.gif','confused_smile.gif','tounge_smile.gif','embaressed_smile.gif','omg_smile.gif','whatchutalkingabout_smile.gif','angry_smile.gif','angel_smile.gif','shades_smile.gif','devil_smile.gif','cry_smile.gif','lightbulb.gif','thumbs_down.gif','thumbs_up.gif','heart.gif','broken_heart.gif','kiss.gif','envelope.gif']
;
 FCKConfig.SmileyColumns = 8 ;
 FCKConfig.SmileyWindowWidth		= 320 ;
-FCKConfig.SmileyWindowHeight	= 240 ;
+FCKConfig.SmileyWindowHeight	= 210 ;
+
+FCKConfig.BackgroundBlockerColor = '#ffffff' ;
+FCKConfig.BackgroundBlockerOpacity = 0.50 ;

Modified: incubator/jspwiki/trunk/src/webdocs/scripts/fckstyles.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/fckstyles.xml?rev=673460&r1=673459&r2=673460&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/fckstyles.xml (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/fckstyles.xml Wed Jul  2 11:39:04 2008
@@ -17,31 +17,13 @@
     <Style name="Comment Box" element="div" >
         <Attribute name="class" value="commentbox" />
     </Style>
+    <Style name="Quote" element="div" >
+        <Attribute name="class" value="quote" />
+    </Style>
     <Style name="Left-to-right text" element="div" >
         <Attribute name="class" value="ltr" />
     </Style>
     <Style name="Right-to-left text" element="div" >
         <Attribute name="class" value="rtl" />
     </Style>
-    <Style name="Strikethrough" element="span" >
-        <Attribute name="class" value="strike" />
-    </Style>
-    <Style name="Superscript" element="span" >
-        <Attribute name="class" value="sup" />
-    </Style>
-    <Style name="Subscript" element="span" >
-        <Attribute name="class" value="sub" />
-    </Style>
-    <Style name="Centered" element="div" >
-        <Attribute name="style" value="text-align:center" />
-    </Style>
-    <Style name="Align Left" element="div" >
-        <Attribute name="style" value="text-align:left" />
-    </Style>
-    <Style name="Align Right" element="div" >
-        <Attribute name="style" value="text-align:right" />
-    </Style>
-    <Style name="Justify" element="div" >
-        <Attribute name="style" value="text-align:justify" />
-    </Style>
 </Styles>

Modified: incubator/jspwiki/trunk/src/webdocs/scripts/fcktemplates.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/scripts/fcktemplates.xml?rev=673460&r1=673459&r2=673460&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/scripts/fcktemplates.xml (original)
+++ incubator/jspwiki/trunk/src/webdocs/scripts/fcktemplates.xml Wed Jul  2 11:39:04 2008
@@ -62,6 +62,47 @@
                                 <td>&nbsp;</td>
                                 <td>&nbsp;</td>
                             </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            ]]>
+        </Html>
+    </Template>
+
+        <Template title="Zebra Table">
+        <Description>
+        Insert a new table that has alternating background colors for each row.
+        </Description>
+        <Html>
+            <![CDATA[
+                <div class="zebra-table">
+                    <table border="1" class="wikitable">
+                        <tbody>
                             <tr class="odd">
                                 <td>&nbsp;</td>
                                 <td>&nbsp;</td>
@@ -87,6 +128,16 @@
                                 <td>&nbsp;</td>
                                 <td>&nbsp;</td>
                             </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                            <tr class="odd">
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>                            
                         </tbody>
                     </table>
                 </div>



Mime
View raw message