From 77251a0d4c33a8186ad17afb044b2ebab64f622b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Thu, 3 Dec 2009 19:52:32 +0100 Subject: [PATCH] fix normal correlation bars --- main/admin/legal_add.php | 2 +- .../toolbars/default/terms_and_conditions.php | 46 +++++++++++++++++++ .../toolbars/extended/admin_templates.php | 16 +++---- .../fckeditor/toolbars/extended/agenda.php | 18 ++++---- .../toolbars/extended/agenda_student.php | 18 ++++---- .../toolbars/extended/announcements.php | 18 ++++---- .../extended/announcements_student.php | 19 ++++---- .../extended/assessments_introduction.php | 22 ++++----- .../fckeditor/toolbars/extended/documents.php | 17 +++---- .../toolbars/extended/documents_student.php | 17 ++++--- .../lib/fckeditor/toolbars/extended/faq.php | 16 ++++--- .../lib/fckeditor/toolbars/extended/forum.php | 21 ++++----- .../toolbars/extended/forum_student.php | 21 ++++----- .../toolbars/extended/global_agenda.php | 15 +++--- .../fckeditor/toolbars/extended/glossary.php | 21 ++++----- .../toolbars/extended/introduction.php | 17 +++---- .../extended/learning_path_author.php | 6 +-- .../extended/learning_path_documents.php | 17 +++---- .../fckeditor/toolbars/extended/messages.php | 18 ++++---- .../fckeditor/toolbars/extended/notebook.php | 21 ++++----- .../toolbars/extended/notebook_student.php | 21 ++++----- .../toolbars/extended/portal_home_page.php | 17 +++---- .../toolbars/extended/portal_news.php | 21 ++++----- .../fckeditor/toolbars/extended/profile.php | 14 +++--- .../fckeditor/toolbars/extended/project.php | 15 +++--- .../toolbars/extended/project_comment.php | 14 +++--- .../extended/project_comment_student.php | 14 +++--- .../toolbars/extended/project_student.php | 15 +++--- .../fckeditor/toolbars/extended/survey.php | 13 +++--- .../extended/terms_and_conditions.php | 41 +++++++++++++++++ .../extended/test_answer_feedback.php | 6 +-- .../toolbars/extended/test_description.php | 21 ++++----- .../toolbars/extended/test_free_answer.php | 6 +-- .../extended/test_proposed_answer.php | 5 +- .../extended/test_question_description.php | 21 ++++----- .../extended/training_description.php | 17 +++---- .../lib/fckeditor/toolbars/extended/wiki.php | 16 +++---- .../toolbars/extended/wiki_student.php | 17 +++---- 38 files changed, 338 insertions(+), 322 deletions(-) create mode 100644 main/inc/lib/fckeditor/toolbars/default/terms_and_conditions.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/admin_templates.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/agenda.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/agenda_student.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/announcements.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/announcements_student.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/documents.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/faq.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/forum.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/global_agenda.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/glossary.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/introduction.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/messages.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/notebook.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/notebook_student.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/portal_news.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/profile.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/project.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/project_comment.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/survey.php create mode 100644 main/inc/lib/fckeditor/toolbars/extended/terms_and_conditions.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/test_description.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/test_question_description.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/training_description.php mode change 100755 => 100644 main/inc/lib/fckeditor/toolbars/extended/wiki.php diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php index fb033fffd6..b0fd4652ab 100644 --- a/main/admin/legal_add.php +++ b/main/admin/legal_add.php @@ -122,7 +122,7 @@ if (isset($_POST['language'])) { //$form->addElement('html_editor', 'content', null, null, array('ToolbarSet' => 'Basic', 'Width' => '100%', 'Height' => '250')); $form->addElement('static', $_POST['language']); $form->addElement('hidden', 'language',$_POST['language']); - $form->add_html_editor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'simple', 'Width' => '100%', 'Height' => '250')); + $form->add_html_editor('content', get_lang('Content'), true, false, array('ToolbarSet' => 'terms_and_conditions', 'Width' => '100%', 'Height' => '250')); //$form->addElement('textarea', 'content', get_lang('Content'),array('cols'=>'120','rows'=>'10')); $form->addElement('radio', 'type', '', get_lang('HTMLText') ,'0'); $form->addElement('radio', 'type', '', get_lang('PageLink') ,'1'); diff --git a/main/inc/lib/fckeditor/toolbars/default/terms_and_conditions.php b/main/inc/lib/fckeditor/toolbars/default/terms_and_conditions.php new file mode 100644 index 0000000000..e042af88c1 --- /dev/null +++ b/main/inc/lib/fckeditor/toolbars/default/terms_and_conditions.php @@ -0,0 +1,46 @@ + diff --git a/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php b/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php old mode 100755 new mode 100644 index e6e083b688..43d7e53926 --- a/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php +++ b/main/inc/lib/fckeditor/toolbars/extended/admin_templates.php @@ -9,17 +9,13 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), + array('NewPage','Templates','Save','Print','PageBreak','FitWindow','-','PasteWord','-','Undo','Redo','-','SelectAll','-','Find'), array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar'), + array('Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'), + array('Table','Smiley','SpecialChar','googlemaps'), + array('FontFormat','FontName','FontSize'), + array('JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'), array('Source') ); diff --git a/main/inc/lib/fckeditor/toolbars/extended/agenda.php b/main/inc/lib/fckeditor/toolbars/extended/agenda.php old mode 100755 new mode 100644 index 007b9fc7cf..eadb79b114 --- a/main/inc/lib/fckeditor/toolbars/extended/agenda.php +++ b/main/inc/lib/fckeditor/toolbars/extended/agenda.php @@ -9,15 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor') + array('FitWindow','PasteWord','-','Undo','Redo'), + array('Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','SpecialChar'), + '/', + array('Style','FontFormat','FontName','FontSize'), + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'), + array('Source') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php b/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php old mode 100755 new mode 100644 index 60d9e40705..88a1ef1d69 --- a/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/agenda_student.php @@ -9,15 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor') + array('Save','FitWindow','PasteWord','-','Undo','Redo'), + array('Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','SpecialChar'), + '/', + array('FontFormat','FontName','FontSize'), + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'), + array('ShowBlocks') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/announcements.php b/main/inc/lib/fckeditor/toolbars/extended/announcements.php old mode 100755 new mode 100644 index fb0c777bf8..545696affe --- a/main/inc/lib/fckeditor/toolbars/extended/announcements.php +++ b/main/inc/lib/fckeditor/toolbars/extended/announcements.php @@ -9,15 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor') + array('Save','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') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php b/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php old mode 100755 new mode 100644 index db6976b2bc..a9c93489ab --- a/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/announcements_student.php @@ -9,15 +9,16 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor') + array('Save','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'), + '/', + array('Style','FontFormat','FontName','FontSize'), + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight'), + array('ShowBlocks') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php b/main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php old mode 100755 new mode 100644 index 21e7cb2b46..2de167c78a --- a/main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php +++ b/main/inc/lib/fckeditor/toolbars/extended/assessments_introduction.php @@ -9,18 +9,16 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar'), - array('Source') + array('Save','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'), + '/', + array('Style','FontFormat','FontName','FontSize'), + array('Bold','Italic','Underline'), + array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'), + array('Source') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/documents.php b/main/inc/lib/fckeditor/toolbars/extended/documents.php old mode 100755 new mode 100644 index 8764f393fd..e0995b36d4 --- a/main/inc/lib/fckeditor/toolbars/extended/documents.php +++ b/main/inc/lib/fckeditor/toolbars/extended/documents.php @@ -9,18 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink','Glossary'), - array('Image','Flash'), + array('Save','FitWindow','PasteWord','-','Undo','Redo'), + array('Link','Unlink','Anchor','Glossary'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'), + array('Table','SpecialChar'), + array('Outdent','Indent','-','TextColor','BGColor','-','OrderedList','UnorderedList','-','Source'), '/', array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex','asciimath'), - array('Source') + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/documents_student.php b/main/inc/lib/fckeditor/toolbars/extended/documents_student.php index 43fab324d9..0fa041e61a 100644 --- a/main/inc/lib/fckeditor/toolbars/extended/documents_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/documents_student.php @@ -9,17 +9,16 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink','Glossary'), - array('Image','Flash'), + array('Save','FitWindow','PasteWord','-','Undo','Redo'), + array('Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'), + array('Table','SpecialChar'), + array('Outdent','Indent','-','TextColor','BGColor','-','OrderedList','UnorderedList'), '/', array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex','asciimath') + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight'), + array('ShowBlocks') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/faq.php b/main/inc/lib/fckeditor/toolbars/extended/faq.php old mode 100755 new mode 100644 index 874e6d13ad..83134dfee5 --- a/main/inc/lib/fckeditor/toolbars/extended/faq.php +++ b/main/inc/lib/fckeditor/toolbars/extended/faq.php @@ -7,7 +7,16 @@ // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options // This is the visible toolbar set when the editor has "normal" size. + $config['ToolbarSets']['Normal'] = array( + array('Save','Preview','Source') +); + + +// 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'), array('Save'), array('Bold','Italic','Underline'), @@ -16,13 +25,6 @@ $config['ToolbarSets']['Normal'] = array( array('Link','Unlink') ); -// 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','-') // ... -); -*/ // Sets whether the toolbar can be collapsed/expanded or not. // Possible values: true , false diff --git a/main/inc/lib/fckeditor/toolbars/extended/forum.php b/main/inc/lib/fckeditor/toolbars/extended/forum.php old mode 100755 new mode 100644 index 689dccb4b8..21cb1371fc --- a/main/inc/lib/fckeditor/toolbars/extended/forum.php +++ b/main/inc/lib/fckeditor/toolbars/extended/forum.php @@ -9,18 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex'), - array('Source') + array('Save','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') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/forum_student.php b/main/inc/lib/fckeditor/toolbars/extended/forum_student.php index bd4dc416ae..00c1017baf 100644 --- a/main/inc/lib/fckeditor/toolbars/extended/forum_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/forum_student.php @@ -9,17 +9,16 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex') + array('Save','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'), + '/', + array('Style','FontFormat','FontName','FontSize'), + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight'), + array('ShowBlocks') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php b/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php old mode 100755 new mode 100644 index 8cd665d505..1b7f74833a --- a/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php +++ b/main/inc/lib/fckeditor/toolbars/extended/global_agenda.php @@ -9,15 +9,14 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), + array('FitWindow','-','PasteWord','-','Undo','Redo'), array('Link','Unlink'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor') + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','SpecialChar','googlemaps'), + array('FontName','FontSize'), + array('Bold','Italic','Underline'), + array('OrderedList','UnorderedList','-','TextColor','BGColor'), + array('Source') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/glossary.php b/main/inc/lib/fckeditor/toolbars/extended/glossary.php old mode 100755 new mode 100644 index 5fe491dabe..2caa4bdca1 --- a/main/inc/lib/fckeditor/toolbars/extended/glossary.php +++ b/main/inc/lib/fckeditor/toolbars/extended/glossary.php @@ -9,18 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex'), - array('Source') + array('Save','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') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/introduction.php b/main/inc/lib/fckeditor/toolbars/extended/introduction.php old mode 100755 new mode 100644 index 89a6ae8573..655e594707 --- a/main/inc/lib/fckeditor/toolbars/extended/introduction.php +++ b/main/inc/lib/fckeditor/toolbars/extended/introduction.php @@ -9,18 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), + array('NewPage','FitWindow','-','PasteWord','-','Undo','Redo','-','SelectAll'), + 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('TextColor','BGColor'), - array('Rule','Table','SpecialChar'), - array('Source') + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php b/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php old mode 100755 new mode 100644 index f5d2bbc484..bba97ea486 --- a/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php +++ b/main/inc/lib/fckeditor/toolbars/extended/learning_path_author.php @@ -9,11 +9,7 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow'), - array('Bold','Italic','Underline'), - array('Undo','Redo'), - array('TextColor','BGColor'), - array('Link','Unlink') + array('Link','Unlink','Bold','Italic','TextColor','BGColor','Source') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php b/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php old mode 100755 new mode 100644 index ee9a183fed..a27e5701a5 --- a/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php +++ b/main/inc/lib/fckeditor/toolbars/extended/learning_path_documents.php @@ -9,19 +9,14 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink','Glossary'), - array('Image','Flash'), + array('PasteWord','-','Undo','Redo'), + array('Link','Unlink','Anchor','Glossary'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath','Table','SpecialChar'), + array('Outdent','Indent','TextColor','BGColor','-','OrderedList','UnorderedList','JustifyLeft','JustifyCenter','JustifyRight'), '/', array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex','asciimath'), - array('Source') -); + array('Bold','Italic','Underline','-','Source'), +);//save, FitWindow don't run well here // 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. diff --git a/main/inc/lib/fckeditor/toolbars/extended/messages.php b/main/inc/lib/fckeditor/toolbars/extended/messages.php old mode 100755 new mode 100644 index eccb9a83f3..7b32efc9c1 --- a/main/inc/lib/fckeditor/toolbars/extended/messages.php +++ b/main/inc/lib/fckeditor/toolbars/extended/messages.php @@ -9,17 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), + array('FitWindow','-','PasteWord','-','Undo','Redo'), + array('Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','Smiley'), '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex') + array('FontName','FontSize'), + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), + array('Source') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/notebook.php b/main/inc/lib/fckeditor/toolbars/extended/notebook.php old mode 100755 new mode 100644 index 9cb2a53f50..2e93862a4e --- a/main/inc/lib/fckeditor/toolbars/extended/notebook.php +++ b/main/inc/lib/fckeditor/toolbars/extended/notebook.php @@ -9,18 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex'), - array('Source') + array('Save','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') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php b/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php old mode 100755 new mode 100644 index e96238bf44..8646a8d954 --- a/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/notebook_student.php @@ -9,17 +9,16 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex') + array('Save','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'), + '/', + array('Style','FontFormat','FontName','FontSize'), + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight'), + array('ShowBlocks') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php b/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php old mode 100755 new mode 100644 index d61cee006b..634714bbb6 --- a/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php +++ b/main/inc/lib/fckeditor/toolbars/extended/portal_home_page.php @@ -9,17 +9,14 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), + array('NewPage','Templates','Save','Print','PageBreak','FitWindow','-','PasteWord','-','Undo','Redo','-','SelectAll','-','Find'), + array('Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','Smiley','SpecialChar','googlemaps'), '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar'), + array('FontFormat','FontName','FontSize'), + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'), array('Source') ); diff --git a/main/inc/lib/fckeditor/toolbars/extended/portal_news.php b/main/inc/lib/fckeditor/toolbars/extended/portal_news.php old mode 100755 new mode 100644 index 5cfd2478e1..ac8ac67c89 --- a/main/inc/lib/fckeditor/toolbars/extended/portal_news.php +++ b/main/inc/lib/fckeditor/toolbars/extended/portal_news.php @@ -9,18 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar'), - array('Source') + array('Save','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') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/profile.php b/main/inc/lib/fckeditor/toolbars/extended/profile.php old mode 100755 new mode 100644 index 843ecca014..0427d8023e --- a/main/inc/lib/fckeditor/toolbars/extended/profile.php +++ b/main/inc/lib/fckeditor/toolbars/extended/profile.php @@ -9,13 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow'), + array('FitWindow','-','PasteWord','-','Undo','Redo'), + array('Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','Smiley'), + '/', + array('FontName','FontSize'), array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - array('TextColor','BGColor'), - array('Link','Unlink','SpecialChar') + array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), + array('Source') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/project.php b/main/inc/lib/fckeditor/toolbars/extended/project.php old mode 100755 new mode 100644 index ac29bd4c32..74ad295f56 --- a/main/inc/lib/fckeditor/toolbars/extended/project.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project.php @@ -9,15 +9,14 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), + array('FitWindow','-','PasteWord','-','Undo','Redo'), + array('Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','googlemaps'), + array('FontName','FontSize'), array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor') + array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), + array('Source') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/project_comment.php b/main/inc/lib/fckeditor/toolbars/extended/project_comment.php old mode 100755 new mode 100644 index 921c7db520..90c12dee83 --- a/main/inc/lib/fckeditor/toolbars/extended/project_comment.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project_comment.php @@ -9,15 +9,13 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), + array('FitWindow','-','PasteWord','-','Undo','Redo'), array('Link','Unlink'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor') + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','googlemaps'), + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), + array('Source') ); // This is the visible toolbar set when the editor is maximized. 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 bdb9e55436..854090519a 100644 --- a/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project_comment_student.php @@ -9,15 +9,13 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), + array('FitWindow','-','PasteWord','-','Undo','Redo'), array('Link','Unlink'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor') + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','googlemaps'), + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), + array('ShowBlocks') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/project_student.php b/main/inc/lib/fckeditor/toolbars/extended/project_student.php index 73abca9f8d..046520c592 100644 --- a/main/inc/lib/fckeditor/toolbars/extended/project_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/project_student.php @@ -9,15 +9,14 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), + array('FitWindow','-','PasteWord','-','Undo','Redo'), + array('Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'), + array('Table','googlemaps'), + array('FontName','FontSize'), array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor') + array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'), + array('ShowBlocks') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/survey.php b/main/inc/lib/fckeditor/toolbars/extended/survey.php old mode 100755 new mode 100644 index 5e6239d24a..e108df0624 --- a/main/inc/lib/fckeditor/toolbars/extended/survey.php +++ b/main/inc/lib/fckeditor/toolbars/extended/survey.php @@ -10,14 +10,13 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( array('FitWindow'), - array('FontSize', 'Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','SelectAll','RemoveFormat'), - array('TextColor','BGColor'), array('Link','Unlink'), - array('Table','SpecialChar'), - array('Image','Flash') + array('Image'), + array('Table'), + array('FontSize'), + array('Bold','Italic'), + array('OrderedList','UnorderedList','-','TextColor'), + array('Source') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/terms_and_conditions.php b/main/inc/lib/fckeditor/toolbars/extended/terms_and_conditions.php new file mode 100644 index 0000000000..b28b2b60bf --- /dev/null +++ b/main/inc/lib/fckeditor/toolbars/extended/terms_and_conditions.php @@ -0,0 +1,41 @@ + diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php b/main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php old mode 100755 new mode 100644 index 8e550c5fc3..4f7abd1e4f --- a/main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_answer_feedback.php @@ -9,11 +9,7 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow'), - array('Bold','Italic','Underline','-','Subscript','Superscript'), - array('Undo','Redo'), - array('TextColor','BGColor'), - array('SpecialChar','mimetex') + array('Link','Unlink','Bold','Italic','TextColor','BGColor','mimetex') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_description.php b/main/inc/lib/fckeditor/toolbars/extended/test_description.php old mode 100755 new mode 100644 index ddc36ca091..e372a7d20b --- a/main/inc/lib/fckeditor/toolbars/extended/test_description.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_description.php @@ -9,18 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex'), - array('Source') + 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') ); // This is the visible toolbar set when the editor is maximized. 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 65d96eb3cf..f611445ee1 100644 --- a/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_free_answer.php @@ -9,11 +9,7 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow'), - array('Bold','Italic','Underline','-','Subscript','Superscript'), - array('Undo','Redo'), - array('TextColor','BGColor'), - array('SpecialChar','mimetex') + array('FitWindow','Bold','Image','Link','PasteWord','MP3','mimetex','Table','Subscript','Superscript','ShowBlocks') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php b/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php old mode 100755 new mode 100644 index ead03680b6..a7f8b03e7b --- a/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_proposed_answer.php @@ -9,10 +9,7 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow'), - array('Bold','Italic','Underline','-','Subscript','Superscript'), - array('Undo','Redo'), - array('SpecialChar','mimetex') + array('FitWindow','Bold','Image','Link','PasteWord','MP3','mimetex','Table','Subscript','Superscript','Source') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php b/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php old mode 100755 new mode 100644 index 0bcb17cf75..4bdd6d73ae --- a/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php +++ b/main/inc/lib/fckeditor/toolbars/extended/test_question_description.php @@ -9,18 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex'), - array('Source') + array('FitWindow','-','PasteWord','-','Undo','Redo'), + array('Link','Unlink'), + 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') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/training_description.php b/main/inc/lib/fckeditor/toolbars/extended/training_description.php old mode 100755 new mode 100644 index 44050b1193..6a467c001a --- a/main/inc/lib/fckeditor/toolbars/extended/training_description.php +++ b/main/inc/lib/fckeditor/toolbars/extended/training_description.php @@ -9,18 +9,15 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), - array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink'), - array('Image','Flash'), + array('NewPage','Save','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('TextColor','BGColor'), - array('Rule','Table','SpecialChar'), - array('Source') + array('Bold','Italic','Underline'), + array('JustifyLeft','JustifyCenter','JustifyRight') ); // This is the visible toolbar set when the editor is maximized. diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki.php b/main/inc/lib/fckeditor/toolbars/extended/wiki.php old mode 100755 new mode 100644 index 71a4f73129..d35ea07212 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki.php @@ -9,17 +9,13 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), + array('NewPage','Templates','Save','PageBreak','Preview','FitWindow','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'), + array('Wikilink','Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'), + array('Table','Smiley','SpecialChar','googlemaps'), + array('FontFormat','FontName','FontSize'), array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink','Wikilink','Glossary'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex','asciimath'), + array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'), array('Source') ); diff --git a/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php b/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php index 1c0d612c13..3c29126185 100644 --- a/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php +++ b/main/inc/lib/fckeditor/toolbars/extended/wiki_student.php @@ -9,17 +9,14 @@ // This is the visible toolbar set when the editor has "normal" size. $config['ToolbarSets']['Normal'] = array( - array('FitWindow','Save','Preview'), + array('NewPage','Save','PageBreak','Preview','FitWindow','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'), + array('Wikilink','Link','Unlink','Anchor'), + array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'), + array('Table','Smiley','SpecialChar','googlemaps'), + array('FontFormat','FontName','FontSize'), array('Bold','Italic','Underline'), - array('OrderedList','UnorderedList','-','Outdent','Indent'), - array('JustifyLeft','JustifyCenter','JustifyRight'), - array('Undo','Redo','-','Find','-','SelectAll','RemoveFormat'), - array('Link','Unlink','Wikilink','Glossary'), - array('Image','Flash'), - '/', - array('Style','FontFormat','FontName','FontSize'), - array('TextColor','BGColor'), - array('Rule','Table','SpecialChar','mimetex','asciimath') + array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'), + array('ShowBlocks') ); // This is the visible toolbar set when the editor is maximized.