Index: lams_admin/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_admin/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:46:58 -0000 1.2 +++ lams_admin/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:51:00 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_central/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.3 -r1.4 --- lams_central/web/WEB-INF/tags/CKEditor.tag 18 Oct 2010 20:51:33 -0000 1.3 +++ lams_central/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:50:55 -0000 1.4 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_central/web/includes/javascript/ckconfig_custom.js =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/ckconfig_custom.js,v diff -u -r1.3 -r1.4 --- lams_central/web/includes/javascript/ckconfig_custom.js 18 Oct 2010 20:51:33 -0000 1.3 +++ lams_central/web/includes/javascript/ckconfig_custom.js 21 Oct 2010 18:50:55 -0000 1.4 @@ -1,36 +1,36 @@ CKEDITOR.config.toolbar_Default = [ - ['Source','-','FitWindow', 'Preview','PasteWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','OrderedList','UnorderedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','TextColor','BGColor','Equation'], - ['Paint_Button','MoviePlayer','VideoRecorder','Image','Link','Table','Rule','Smiley','SpecialChar','Templates','FontFormat','FontName','FontSize','About'] + ['Source','-','Maximize', 'Preview','PasteFromWord','Undo','Redo','Bold','Italic','Underline', '-','Subscript','Superscript','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Equation'], + ['Paint_Button','MoviePlayer','VideoRecorder','Image','Link','Table','HorizontalRule','Smiley','SpecialChar','Templates','Format','Font','FontSize','About'] ] ; CKEDITOR.config.toolbar_DefaultLearner = [ - ['Preview','PasteWord'], + ['Preview','PasteFromWord'], ['Undo','Redo'], ['Bold','Italic','Underline', '-','Subscript','Superscript'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], + ['NumberedList','BulletedList','-','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['Equation','About'], ['TextColor','BGColor'], - ['Table','Rule','Smiley','SpecialChar'], - ['FontFormat','FontName','FontSize'] + ['Table','HorizontalRule','Smiley','SpecialChar'], + ['Format','Font','FontSize'] ] ; CKEDITOR.config.toolbar_CustomWiki = [ - ['Preview','PasteWord'], + ['Preview','PasteFromWord'], ['Undo','Redo'], ['Bold','Italic','Underline', '-','Subscript','Superscript'], - ['OrderedList','UnorderedList','-','Outdent','Indent'], - ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], + ['NumberedList','BulletedList','-','Outdent','Indent'], + ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'], ['WikiLink','Link','Image'], ['Equation','About'], ['TextColor','BGColor'], - ['Table','Rule','Smiley','SpecialChar'], - ['FontFormat','FontName','FontSize'] + ['Table','HorizontalRule','Smiley','SpecialChar'], + ['Format','Font','FontSize'] ] ; CKEDITOR.config.toolbar_CustomPedplanner = [ - ['Source','-','FitWindow','Preview','PasteWord','Bold','Italic','Underline', '-','OrderedList','UnorderedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','TextColor','BGColor','Equation'], - ['Image','Link','Table','Smiley','FontName','FontSize','WikiLink'] + ['Source','-','Maximize','Preview','PasteFromWord','Bold','Italic','Underline', '-','NumberedList','BulletedList','-','Outdent','Indent','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','TextColor','BGColor','Equation'], + ['Image','Link','Table','Smiley','Font','FontSize'] ] ; @@ -48,4 +48,15 @@ // CKEDITOR.plugins.add('paint') ; CKEDITOR.plugins.addExternal('WikiLink', CKEDITOR.basePath + '../tool/lawiki10/wikilink/', 'plugin.js') ; //CKEDITOR.config.extraPlugins = 'equation,movieplayer,videorecorder,paint,wikilink' ; -CKEDITOR.config.extraPlugins = 'WikiLink' ; \ No newline at end of file +CKEDITOR.config.extraPlugins = 'WikiLink' ; + +// ---- Additional scripts ----- +// Hides editor instaces until they are fully initialized + +CKEDITOR.on('instanceCreated', function(e){ + e.editor.element.$.style.display = 'none'; +}); + +CKEDITOR.on('instanceReady', function(e){ + e.editor.element.$.style.display = ''; +}); \ No newline at end of file Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:23 -0000 1.2 +++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:54:47 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:48:23 -0000 1.2 +++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:54:11 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:48:20 -0000 1.2 +++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:54:42 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_dimdim/web/WEB-INF/tags/Attic/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:46:54 -0000 1.2 +++ lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:54:32 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:27 -0000 1.2 +++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:54:21 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:42 -0000 1.2 +++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:54:05 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_images/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:35 -0000 1.2 +++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:54:26 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:46 -0000 1.2 +++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:54:37 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:13 -0000 1.2 +++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:54:16 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:48:01 -0000 1.2 +++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:57:08 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:39 -0000 1.2 +++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:57:12 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_nb/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:50 -0000 1.2 +++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:56:43 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:48:16 -0000 1.2 +++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:57:21 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:20 -0000 1.2 +++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:56:55 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:57 -0000 1.2 +++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:56:59 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:04 -0000 1.2 +++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:56:46 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:53 -0000 1.2 +++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:56:35 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:48:12 -0000 1.2 +++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:56:31 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_task/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:01 -0000 1.2 +++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:56:50 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:47:31 -0000 1.2 +++ lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:56:39 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:48:05 -0000 1.2 +++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:57:03 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/ Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.2 -r1.3 --- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag 10 Oct 2010 11:46:43 -0000 1.2 +++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag 21 Oct 2010 18:57:16 -0000 1.3 @@ -25,7 +25,7 @@ - + ckeditor/