From cd02cfc747b39c60031523599f3baeeaa4fe5755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Tue, 8 Feb 2011 19:42:19 +0100 Subject: [PATCH] Feature #2479 standard tool: change multimedia flvplayer by embedmovies, flash and mp3 --- .../toolbars/extended/admin_templates.php | 4 +- .../fckeditor/toolbars/extended/agenda.php | 4 +- .../toolbars/extended/agenda_student.php | 4 +- .../toolbars/extended/announcements.php | 4 +- .../extended/announcements_student.php | 4 +- .../extended/assessments_introduction.php | 59 +++++++++++-------- .../fckeditor/toolbars/extended/documents.php | 4 +- .../toolbars/extended/documents_student.php | 4 +- .../lib/fckeditor/toolbars/extended/faq.php | 4 +- .../lib/fckeditor/toolbars/extended/forum.php | 4 +- .../toolbars/extended/forum_student.php | 4 +- .../toolbars/extended/global_agenda.php | 4 +- .../fckeditor/toolbars/extended/glossary.php | 4 +- .../toolbars/extended/introduction.php | 4 +- .../extended/learning_path_author.php | 2 +- .../extended/learning_path_documents.php | 4 +- .../fckeditor/toolbars/extended/messages.php | 2 +- .../fckeditor/toolbars/extended/notebook.php | 4 +- .../toolbars/extended/notebook_student.php | 4 +- .../toolbars/extended/portal_home_page.php | 2 +- .../toolbars/extended/portal_news.php | 4 +- .../fckeditor/toolbars/extended/profile.php | 4 +- .../fckeditor/toolbars/extended/project.php | 2 +- .../toolbars/extended/project_comment.php | 2 +- .../extended/project_comment_student.php | 2 +- .../toolbars/extended/project_student.php | 2 +- .../fckeditor/toolbars/extended/survey.php | 2 +- .../extended/test_answer_feedback.php | 4 +- .../toolbars/extended/test_description.php | 56 ++++++++++-------- .../toolbars/extended/test_free_answer.php | 4 +- .../extended/test_proposed_answer.php | 2 +- .../extended/test_question_description.php | 4 +- .../extended/training_description.php | 4 +- .../lib/fckeditor/toolbars/extended/wiki.php | 4 +- .../toolbars/extended/wiki_student.php | 4 +- .../fckeditor/toolbars/extended/wiki_task.php | 4 +- 36 files changed, 125 insertions(+), 108 deletions(-) diff --git a/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php b/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php index 488005a656..23caf9b429 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php +++ b/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php @@ -22,8 +22,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/agenda.php b/main/inc/lib/fckeditor/toolbars/extended/agenda.php index 556ad47617..d6b90e63ca 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/agenda.php +++ b/main/inc/lib/fckeditor/toolbars/extended/agenda.php @@ -22,8 +22,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter'), array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php b/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php index 5ac100b570..f3229148a9 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php @@ -24,8 +24,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter'), array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/announcements.php b/main/inc/lib/fckeditor/toolbars/extended/announcements.php index 72434268dc..f6341797cc 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/announcements.php +++ b/main/inc/lib/fckeditor/toolbars/extended/announcements.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php b/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php index 2a09387ac7..20ede61a87 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php @@ -24,8 +24,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php b/main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php index 2f6f0f3019..1ded14cb63 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php +++ b/main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php @@ -7,38 +7,47 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options +//NOTE: Does not include Replace because it is redundant, being in the same tab to Find. +//TODO: Check size and DocProps, fckeditor_wiris_openFormulaEditor,fckeditor_wiris_openCAS buttons. + +// Hide/show SpellCheck buttom +if ((api_get_setting('allow_spellcheck') == 'true')) { + $VSpellCheck='SpellCheck'; +} +else{ + $VSpellCheck=''; +} + // This is the visible toolbar set when the editor has "normal" size. + $config['ToolbarSets']['Normal'] = array( - array('Save','FitWindow','-','PasteWord','-','Undo','Redo'), - array('Link','Unlink','Anchor'), - array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), - array('TableOC','SpecialChar'), - array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('Bold','Italic','Underline'), - array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), - array('Source') + array('Save','NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), + array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), + array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), + array('FitWindow') ); // This is the visible toolbar set when the editor is maximized. // If it has not been defined, then the toolbar set for the "normal" size is used. $config['ToolbarSets']['Maximized'] = array( - array('FitWindow','Save','NewPage','Preview'), - array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'), - array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'), - array('Link','Unlink','Anchor'), - '/', - array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'), - array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'), - array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), - array('Rule','SpecialChar'), - array('Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','googlemaps','Smiley'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('TableOC','Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'), - array('ShowBlocks','Source') + array('Save','NewPage','Templates','-','Preview','Print'), + array('Cut','Copy','Paste','PasteText','PasteWord'), + array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'), + array('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg'), +'/', + array('TableOC','Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'), + array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), + array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'), + array($VSpellCheck), + array('Style','FontFormat','FontName','FontSize'), + array('PageBreak','ShowBlocks','Source'), + array('FitWindow') + ); // Sets whether the toolbar can be collapsed/expanded or not. diff --git a/main/inc/lib/fckeditor/toolbars/extended/documents.php b/main/inc/lib/fckeditor/toolbars/extended/documents.php index 8c388d684a..f08e0089a8 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/documents.php +++ b/main/inc/lib/fckeditor/toolbars/extended/documents.php @@ -22,8 +22,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/documents_student.php b/main/inc/lib/fckeditor/toolbars/extended/documents_student.php index 9a4866a9c5..82514e540f 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/documents_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/documents_student.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/faq.php b/main/inc/lib/fckeditor/toolbars/extended/faq.php index 68ffb17674..d289df9d86 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/faq.php +++ b/main/inc/lib/fckeditor/toolbars/extended/faq.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/forum.php b/main/inc/lib/fckeditor/toolbars/extended/forum.php index e847b441f0..62a52c5e5c 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/forum.php +++ b/main/inc/lib/fckeditor/toolbars/extended/forum.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/forum_student.php b/main/inc/lib/fckeditor/toolbars/extended/forum_student.php index 4e2946bc03..b9723f0824 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/forum_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/forum_student.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php b/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php index dcf2383af0..337f1d05aa 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php +++ b/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php @@ -20,8 +20,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter'), array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/glossary.php b/main/inc/lib/fckeditor/toolbars/extended/glossary.php index 95fb33577e..8e2fb3f002 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/glossary.php +++ b/main/inc/lib/fckeditor/toolbars/extended/glossary.php @@ -21,8 +21,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/introduction.php b/main/inc/lib/fckeditor/toolbars/extended/introduction.php index 4cbbb32542..66d476aa9e 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/introduction.php +++ b/main/inc/lib/fckeditor/toolbars/extended/introduction.php @@ -22,8 +22,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php b/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php index e161366492..1b27704ea2 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php +++ b/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php @@ -21,7 +21,7 @@ else{ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( //array('PasteWord'), - //array('Link','Image','flvPlayer','mimetex'), + //array('Link','Image','EmbedMovies','Flash','MP3','mimetex'), //array('TableOC'), //array('OrderedList','Rule'), //array('JustifyFull'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php b/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php index 0fd1ef1100..feacf97dfb 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php +++ b/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/messages.php b/main/inc/lib/fckeditor/toolbars/extended/messages.php index 6d84bdbdc4..2b028225b4 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/messages.php +++ b/main/inc/lib/fckeditor/toolbars/extended/messages.php @@ -23,7 +23,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter'), array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/notebook.php b/main/inc/lib/fckeditor/toolbars/extended/notebook.php index a91a104c8a..587927a856 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/notebook.php +++ b/main/inc/lib/fckeditor/toolbars/extended/notebook.php @@ -22,8 +22,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php b/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php index de4f8e3cfb..557c38c94a 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php b/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php index d269b9e842..3871dc086f 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php +++ b/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php @@ -23,7 +23,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/portal_news.php b/main/inc/lib/fckeditor/toolbars/extended/portal_news.php index cfb3e9d93f..6c4e22916f 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/portal_news.php +++ b/main/inc/lib/fckeditor/toolbars/extended/portal_news.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/profile.php b/main/inc/lib/fckeditor/toolbars/extended/profile.php index 6f69702c2d..b1c96604df 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/profile.php +++ b/main/inc/lib/fckeditor/toolbars/extended/profile.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/project.php b/main/inc/lib/fckeditor/toolbars/extended/project.php index fe711ab41e..e27b100dab 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/project.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project.php @@ -23,7 +23,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'), array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/project_comment.php b/main/inc/lib/fckeditor/toolbars/extended/project_comment.php index 2dd2a7160c..facd08a51a 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/project_comment.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project_comment.php @@ -21,7 +21,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'), array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php b/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php index 67e23c91fa..ee255cc3c7 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php @@ -23,7 +23,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'), array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/project_student.php b/main/inc/lib/fckeditor/toolbars/extended/project_student.php index dcba2ca55e..33a62319af 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/project_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project_student.php @@ -22,7 +22,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'), array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','TextColor'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/survey.php b/main/inc/lib/fckeditor/toolbars/extended/survey.php index d05380bbe3..914df9e48e 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/survey.php +++ b/main/inc/lib/fckeditor/toolbars/extended/survey.php @@ -24,7 +24,7 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontSize','Bold','Italic','Underline','TextColor','BGColor'), diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php b/main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php index 02a4db583e..ef787ac1ed 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_description.php b/main/inc/lib/fckeditor/toolbars/extended/test_description.php index 947229385a..f463fac116 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/test_description.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_description.php @@ -6,38 +6,46 @@ // Test description // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options +//NOTE: Does not include Replace because it is redundant, being in the same tab to Find. +//TODO: Check size and DocProps, fckeditor_wiris_openFormulaEditor,fckeditor_wiris_openCAS + +// Hide/show SpellCheck buttom +if ((api_get_setting('allow_spellcheck') == 'true')) { + $VSpellCheck='SpellCheck'; +} +else{ + $VSpellCheck=''; +} // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','-','PasteWord','-','Undo','Redo'), - array('Link','Unlink','Anchor'), - array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), - array('Table','SpecialChar'), - array('OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor','-','Source'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('Bold','Italic','Underline'), - array('JustifyLeft','JustifyCenter','JustifyRight') + array('Save','NewPage','Templates','-','PasteWord'), + array('Undo','Redo'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), + array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), + array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), + array('FitWindow') ); // This is the visible toolbar set when the editor is maximized. // If it has not been defined, then the toolbar set for the "normal" size is used. $config['ToolbarSets']['Maximized'] = array( - array('FitWindow','Save','NewPage','Preview'), - array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'), - array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'), - array('Link','Unlink','Anchor'), - '/', - array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'), - array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'), - array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), - array('Rule','SpecialChar'), - array('mimetex','Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','Smiley'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'), - array('ShowBlocks','Source') + array('Save','NewPage','Templates','-','Preview','Print'), + array('Cut','Copy','Paste','PasteText','PasteWord'), + array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'), + array('Link','Unlink','Anchor','Glossary'), + array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','asciimath','asciisvg'), +'/', + array('TableOC','Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'), + array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'), + array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), + array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'), + array($VSpellCheck), + array('Style','FontFormat','FontName','FontSize'), + array('PageBreak','ShowBlocks','Source'), + array('FitWindow') + ); // Sets whether the toolbar can be collapsed/expanded or not. diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php b/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php index 1e951e6a2c..58f29c3d6b 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php @@ -24,8 +24,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteText'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php b/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php index 11f80124d2..3dd5fbbf59 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php @@ -23,7 +23,7 @@ $config['ToolbarSets']['Normal'] = array( array('Templates'), array('PasteWord'), array('Link'), - array('Image','flvPlayer','mimetex','asciimath','asciisvg'), + array('Image','EmbedMovies','Flash','MP3','mimetex','asciimath','asciisvg'), array('TableOC'), array('Bold'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php b/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php index e711e5692f..f7128963ad 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php @@ -22,8 +22,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Unlink','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Unlink','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/training_description.php b/main/inc/lib/fckeditor/toolbars/extended/training_description.php index cd8188735f..04fab6005a 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/training_description.php +++ b/main/inc/lib/fckeditor/toolbars/extended/training_description.php @@ -22,8 +22,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki.php b/main/inc/lib/fckeditor/toolbars/extended/wiki.php index e23f85b928..65f916ff17 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteText'), array('Undo','Redo'), - array('Wikilink','Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Wikilink','Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php b/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php index 245f43ce98..8255cea2b1 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php @@ -24,8 +24,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('Save','NewPage','Templates','-','PasteText'), array('Undo','Redo'), - array('Wikilink','Link','Image','flvPlayer','TableOC','mimetex','asciimath','asciisvg'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Wikilink','Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex','asciimath','asciisvg'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow') diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php b/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php index e47fcd3908..53ad268050 100755 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki_task.php @@ -23,8 +23,8 @@ else{ $config['ToolbarSets']['Normal'] = array( array('NewPage','Templates','-','PasteWord'), array('Undo','Redo'), - array('Link','Image','flvPlayer','TableOC','mimetex'), - array('UnorderedList','OrderedList','Rule','-','Outdent','Indent'), + array('Link','Image','EmbedMovies','Flash','MP3','TableOC','mimetex'), + array('UnorderedList','OrderedList','Rule'), array('JustifyLeft','JustifyCenter','JustifyFull'), array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'), array('FitWindow')