Changeset 2758
- Timestamp:
- 09/03/10 21:01:18 (17 months ago)
- Location:
- branches/5.2.1/www
- Files:
-
- 10 added
- 1 deleted
- 2 edited
-
default/includes/themes/merced/css/fckstyles.xml (deleted)
-
default/includes/themes/merced/js/editor (added)
-
default/includes/themes/merced/js/editor/dialogs (added)
-
default/includes/themes/merced/js/editor/dialogs/templates.js (added)
-
default/includes/themes/merced/js/editor/styles.js (added)
-
default/includes/themes/merced/js/editor/templates (added)
-
default/includes/themes/merced/js/editor/templates/default.js (added)
-
default/includes/themes/merced/js/editor/templates/images (added)
-
default/includes/themes/merced/js/editor/templates/images/template1.gif (added)
-
default/includes/themes/merced/js/editor/templates/images/template2.gif (added)
-
default/includes/themes/merced/js/editor/templates/images/template3.gif (added)
-
tasks/widgets/ckeditor/config.js (modified) (5 diffs)
-
tasks/widgets/ckeditor/skins/mura/dialog.css (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/5.2.1/www/tasks/widgets/ckeditor/config.js
r2720 r2758 6 6 CKEDITOR.editorConfig = function( config ) 7 7 { 8 8 9 config.startupFocus = 'false'; 10 9 11 //config.uiColor = '#AADC6E'; 10 12 CKEditorBasePath=context + '/tasks/widgets'; … … 20 22 config.format_h6 = { element : '' }; 21 23 22 // config.stylesCombo_stylesSet = 'default:' + CKEditorBasePath + '/ckeditor/plugins/styles/styles/default.js'24 // config.stylesCombo_stylesSet = 'default:' + '/[siteid]/includes/themes/[theme]/js/editor/styles.js' 23 25 24 26 config.templates_files = [ CKEditorBasePath + '/ckeditor/plugins/templates/templates/default.js' ]; 27 // config.templates_files = [ '/[siteid]/includes/themes/[theme]/js/editor/templates/default.js' ]; 25 28 config.templates = 'default'; 29 30 // config.ignoreEmptyParagraph = 'false'; 31 32 /* Pasting into Editor Options */ 33 // config.forcePasteAsPlainText = 'true'; 34 config.pasteFromWordPromptCleanup = 'true'; 35 config.pasteFromWordNumberedHeadingToList = 'true'; 36 config.pasteFromWordRemoveFontStyles = 'true'; 37 config.pasteFromWordRemoveStyles = 'true'; 38 26 39 27 40 config.toolbar_Default = [ 28 41 ['Source'], 29 ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print','SpellChecker' ],42 ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print','SpellChecker','Scayt'], 30 43 ['Undo','Redo','-','Find','Replace','-','RemoveFormat'], 31 44 ['BidiLtr','BidiRtl'], 32 45 ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'], 33 [' OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'],46 ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'], 34 47 ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], 35 48 ['Link','Unlink','Anchor'], … … 40 53 config.toolbar_Summary = [ 41 54 ['Source'], 42 ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print','SpellChecker' ],55 ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print','SpellChecker','Scayt'], 43 56 ['Undo','Redo','-','Find','Replace','-','RemoveFormat'], 44 57 ['BidiLtr','BidiRtl'], 45 58 ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'], 46 [' OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'],59 ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'], 47 60 ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], 48 61 ['Link','Unlink','Anchor'], 49 ['Image','Flash','flvPlayer','-','Table',' Rule','SpecialChar','PageBreak'],62 ['Image','Flash','flvPlayer','-','Table','HorizontalRule','SpecialChar','PageBreak'], 50 63 ['Selectlink','SelectComponent','Templates','-','Styles','Format','-','Maximize','ShowBlocks','-','About'] 51 64 ] ; … … 53 66 config.toolbar_Form = [ 54 67 ['Source'], 55 ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print','SpellChecker' ],68 ['Cut','Copy','Paste','PasteText','PasteFromWord','-','Print','SpellChecker','Scayt'], 56 69 ['Undo','Redo','-','Find','Replace','-','RemoveFormat'], 57 70 ['BidiLtr','BidiRtl'], 58 71 ['Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'], 59 [' OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'],72 ['NumberedList','BulletedList','-','Outdent','Indent','Blockquote','CreateDiv'], 60 73 ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], 61 74 ['Link','Unlink','Anchor'], … … 66 79 67 80 config.toolbar_Basic = [ 68 ['Bold','Italic','-',' OrderedList','UnorderedList','-','Link','Unlink']81 ['Bold','Italic','-','NumberedList','BulletedList','-','Link','Unlink'] 69 82 ] ; 70 83 71 84 config.toolbar_htmlEditor = [ 72 ['Bold','Italic','-',' OrderedList','UnorderedList','-','Link','Unlink','-','Image']85 ['Bold','Italic','-','NumberedList','BulletedList','-','Link','Unlink','-','Image'] 73 86 ] ; 74 87 -
branches/5.2.1/www/tasks/widgets/ckeditor/skins/mura/dialog.css
r2733 r2758 643 643 border: 1px solid white; 644 644 } 645 646 table.cke_dialog_contents table { 647 margin: 0 !important; 648 } 649 650 table.cke_dialog_contents table td { 651 vertical-align: top; 652 text-align: left; 653 }
Note: See TracChangeset
for help on using the changeset viewer.
