[Vtigercrm-commits] [vtiger-commits] r7966 - in /branches/VTIGERCRM-5.0.2-MMBRICH: include/fckeditor/fckconfig.js modules/Users/TemplateMerge.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed Jul 12 08:58:20 EDT 2006
Author: mmbrich
Date: Wed Jul 12 06:58:19 2006
New Revision: 7966
Log:
someone thought it would be a good idea to change fckeditor even though it was a perfectly fine (and working) editor "out of the box"
Modified:
branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckconfig.js
branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/TemplateMerge.php
Modified: branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckconfig.js
==============================================================================
--- branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckconfig.js (original)
+++ branches/VTIGERCRM-5.0.2-MMBRICH/include/fckeditor/fckconfig.js Wed Jul 12 06:58:19 2006
@@ -1,6 +1,6 @@
/*
* FCKeditor - The text editor for internet
- * Copyright (C) 2003-2005 Frederico Caldeira Knabben
+ * Copyright (C) 2003-2006 Frederico Caldeira Knabben
*
* Licensed under the terms of the GNU Lesser General Public License:
* http://www.opensource.org/licenses/lgpl-license.php
@@ -22,7 +22,7 @@
FCKConfig.EditorAreaCSS = FCKConfig.BasePath + 'css/fck_editorarea.css' ;
-FCKConfig.DocType = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' ;
+FCKConfig.DocType = '' ;
FCKConfig.BaseHref = '' ;
@@ -32,22 +32,21 @@
FCKConfig.AllowQueryStringDebug = true ;
FCKConfig.SkinPath = FCKConfig.BasePath + 'skins/default/' ;
+FCKConfig.PreloadImages = [ FCKConfig.SkinPath + 'images/toolbar.start.gif', FCKConfig.SkinPath + 'images/toolbar.buttonarrow.gif' ] ;
FCKConfig.PluginsPath = FCKConfig.BasePath + 'plugins/' ;
-// FCKConfig.Plugins.Add( 'placeholder', 'de,en,fr,it,pl' ) ;
+// FCKConfig.Plugins.Add( 'autogrow' ) ;
+FCKConfig.AutoGrowMax = 400 ;
FCKConfig.ProtectedSource.Add( /<script[\s\S]*?\/script>/gi ) ; // <SCRIPT> tags.
// FCKConfig.ProtectedSource.Add( /<%[\s\S]*?%>/g ) ; // ASP style server side code <%...%>
-// FCKConfig.ProtectedSource.Add( /<\?[\s\S]*?\?>/g ) ; // PHP style server side code <?...?>
+// FCKConfig.ProtectedSource.Add( /<\?[\s\S]*?\?>/g ) ; // PHP style server side code
// FCKConfig.ProtectedSource.Add( /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi ) ; // ASP.Net style tags <asp:control>
FCKConfig.AutoDetectLanguage = true ;
FCKConfig.DefaultLanguage = 'en' ;
FCKConfig.ContentLangDirection = 'ltr' ;
-
-FCKConfig.EnableXHTML = true ; // Unsupported: Do not change.
-FCKConfig.EnableSourceXHTML = true ; // Unsupported: Do not change.
FCKConfig.ProcessHTMLEntities = true ;
FCKConfig.IncludeLatinEntities = true ;
@@ -60,53 +59,45 @@
FCKConfig.FormatIndentator = ' ' ;
FCKConfig.ForceStrongEm = true ;
-FCKConfig.GeckoUseSPAN = true ;
+FCKConfig.GeckoUseSPAN = false ;
FCKConfig.StartupFocus = false ;
FCKConfig.ForcePasteAsPlainText = false ;
FCKConfig.AutoDetectPasteFromWord = true ; // IE only.
FCKConfig.ForceSimpleAmpersand = false ;
FCKConfig.TabSpaces = 0 ;
FCKConfig.ShowBorders = true ;
+FCKConfig.SourcePopup = false ;
FCKConfig.UseBROnCarriageReturn = false ; // IE only.
FCKConfig.ToolbarStartExpanded = true ;
FCKConfig.ToolbarCanCollapse = true ;
-FCKConfig.IEForceVScroll = false ;
FCKConfig.IgnoreEmptyParagraphValue = true ;
FCKConfig.PreserveSessionOnFileBrowser = false ;
FCKConfig.FloatingPanelsZIndex = 10000 ;
+FCKConfig.ToolbarLocation = 'In' ;
+
FCKConfig.ToolbarSets["Default"] = [
- ['Bold','Italic','Underline','-'],
+ ['Source','DocProps','-','Save','NewPage','Preview','-','Templates'],
+ ['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
+ ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
+ ['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
+ '/',
+ ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
['OrderedList','UnorderedList','-','Outdent','Indent'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
- ['Link','Image','SpellCheck'],
+ ['Link','Unlink','Anchor'],
+ ['Image','Flash','Table','Rule','Smiley','SpecialChar','PageBreak','UniversalKey'],
+ '/',
+ ['Style','FontFormat','FontName','FontSize'],
['TextColor','BGColor'],
- '/',
- ['FontFormat','FontName','FontSize'],
-
- ['About']
+ ['FitWindow','-','About']
] ;
-//FCKConfig.ToolbarSets["Default"] = [
-// ['Source','DocProps','-','Save','NewPage','Preview','-','Templates'],
-// ['Cut','Copy','Paste','PasteText','PasteWord','-','Print','SpellCheck'],
-// ['Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'],
-// ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'],
-// ['OrderedList','UnorderedList','-','Outdent','Indent'],
-// ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
-// ['Link','Unlink','Anchor'],
-// ['Image','Flash','Table','Rule','Smiley','SpecialChar','PageBreak','UniversalKey'],
-// ['Form','Checkbox','Radio','TextField','Textarea','Select','Button','ImageButton','HiddenField'],
-// '/',
-// ['Style','FontFormat','FontName','FontSize'],
-// ['TextColor','BGColor'],
-// ['About']
-//] ;
FCKConfig.ToolbarSets["Basic"] = [
['Bold','Italic','-','OrderedList','UnorderedList','-','Link','Unlink','-','About']
] ;
-FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','TableCell','Table','Form'] ;
+FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form'] ;
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' ;
@@ -118,12 +109,12 @@
FCKConfig.TemplatesXmlPath = FCKConfig.EditorPath + 'fcktemplates.xml' ;
FCKConfig.SpellChecker = 'ieSpell' ; // 'ieSpell' | 'SpellerPages'
-FCKConfig.IeSpellDownloadUrl = 'http://www.iespell.com/rel/ieSpellSetup211325.exe' ;
+FCKConfig.IeSpellDownloadUrl = 'http://iespell.huhbw.com/ieSpellSetup220647.exe' ;
FCKConfig.MaxUndoLevels = 15 ;
-FCKConfig.DisableImageHandles = false ;
-FCKConfig.DisableTableHandles = false ;
+FCKConfig.DisableObjectResizing = false ;
+FCKConfig.DisableFFTableHandles = true ;
FCKConfig.LinkDlgHideTarget = false ;
FCKConfig.LinkDlgHideAdvanced = false ;
@@ -163,17 +154,17 @@
FCKConfig.FlashBrowserWindowHeight = FCKConfig.ScreenHeight * 0.7 ; //70% ;
FCKConfig.LinkUpload = true ;
-FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + FCKConfig.QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ;
+FCKConfig.LinkUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage ;
FCKConfig.LinkUploadAllowedExtensions = "" ; // empty for all
FCKConfig.LinkUploadDeniedExtensions = ".(php|php3|php5|phtml|asp|aspx|ascx|jsp|cfm|cfc|pl|bat|exe|dll|reg|cgi)$" ; // empty for no one
FCKConfig.ImageUpload = true ;
-FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + FCKConfig.QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ;
+FCKConfig.ImageUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Image' ;
FCKConfig.ImageUploadAllowedExtensions = ".(jpg|gif|jpeg|png)$" ; // empty for all
FCKConfig.ImageUploadDeniedExtensions = "" ; // empty for no one
FCKConfig.FlashUpload = true ;
-FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + FCKConfig.QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ;
+FCKConfig.FlashUploadURL = FCKConfig.BasePath + 'filemanager/upload/' + _QuickUploadLanguage + '/upload.' + _QuickUploadLanguage + '?Type=Flash' ;
FCKConfig.FlashUploadAllowedExtensions = ".(swf|fla)$" ; // empty for all
FCKConfig.FlashUploadDeniedExtensions = "" ; // empty for no one
@@ -181,6 +172,4 @@
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 ;
-
-if( window.console ) window.console.log( 'Config is loaded!' ) ; // @Packager.Compactor.RemoveLine
+FCKConfig.SmileyWindowHeight = 240 ;
Modified: branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/TemplateMerge.php
==============================================================================
--- branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/TemplateMerge.php (original)
+++ branches/VTIGERCRM-5.0.2-MMBRICH/modules/Users/TemplateMerge.php Wed Jul 12 06:58:19 2006
@@ -25,6 +25,6 @@
<script language="javascript">
window.opener.document.getElementById('subject').value = window.document.frmrepstr.subject.value
window.opener.document.getElementById('description').value = window.document.frmrepstr.repstr.value
-opener.oFCKeditor.ReplaceTextarea();
+window.opener.oFCKeditor.ReplaceTextarea();
window.close();
</script>
More information about the vtigercrm-commits
mailing list