Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_admin/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r0a0d57ab1d0c6cd52921c132667b25e93082662b -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_central/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 0a0d57ab1d0c6cd52921c132667b25e93082662b)
+++ lams_central/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -r0a0d57ab1d0c6cd52921c132667b25e93082662b -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_central/web/includes/javascript/ckconfig_custom.js (.../ckconfig_custom.js) (revision 0a0d57ab1d0c6cd52921c132667b25e93082662b)
+++ lams_central/web/includes/javascript/ckconfig_custom.js (.../ckconfig_custom.js) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -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
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_nb/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/
Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r285768643a951d57dd818f41a3c21baf67606ce4 -r46d8c21c543aec67ce72acb1ce41cf72d5e1b908
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 285768643a951d57dd818f41a3c21baf67606ce4)
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag (.../CKEditor.tag) (revision 46d8c21c543aec67ce72acb1ce41cf72d5e1b908)
@@ -25,7 +25,7 @@
-
+
ckeditor/