From ffd9275f6f526af911a47d6f1d47ca31d941dcce Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Thu, 16 Jul 2009 00:48:51 +0200 Subject: [PATCH] [svn r22128] FS#2867 - The online editor: Minor corrections about the introduction sections. Converting line endings of toolbar files into Unix style. Adding a new toolbar with all the editor's buttons that may be used, for testing purposes. --- main/inc/introductionSection.inc.php | 22 ++++- .../fckeditor/toolbars/admin_templates.php | 94 +++++++++--------- main/inc/lib/fckeditor/toolbars/agenda.php | 96 +++++++++--------- .../lib/fckeditor/toolbars/agenda_student.php | 96 +++++++++--------- .../fckeditor/toolbars/all_buttons_test.php | 55 +++++++++++ .../lib/fckeditor/toolbars/announcements.php | 96 +++++++++--------- .../toolbars/announcements_student.php | 98 +++++++++---------- main/inc/lib/fckeditor/toolbars/answer.php | 80 +++++++-------- main/inc/lib/fckeditor/toolbars/blog.php | 94 +++++++++--------- .../lib/fckeditor/toolbars/blog_comment.php | 92 ++++++++--------- .../toolbars/blog_comment_student.php | 92 ++++++++--------- .../lib/fckeditor/toolbars/blog_student.php | 94 +++++++++--------- .../fckeditor/toolbars/comment_answers.php | 80 +++++++-------- .../toolbars/comment_learning_path.php | 80 +++++++-------- .../fckeditor/toolbars/course_description.php | 96 +++++++++--------- main/inc/lib/fckeditor/toolbars/documents.php | 96 +++++++++--------- .../fckeditor/toolbars/documents_student.php | 98 +++++++++---------- main/inc/lib/fckeditor/toolbars/faq.php | 78 +++++++-------- main/inc/lib/fckeditor/toolbars/forum.php | 96 +++++++++--------- .../lib/fckeditor/toolbars/forum_light.php | 80 +++++++-------- .../lib/fckeditor/toolbars/forum_student.php | 98 +++++++++---------- .../lib/fckeditor/toolbars/free_answer.php | 80 +++++++-------- main/inc/lib/fckeditor/toolbars/full.php | 78 +++++++-------- .../lib/fckeditor/toolbars/global_agenda.php | 94 +++++++++--------- main/inc/lib/fckeditor/toolbars/glossary.php | 96 +++++++++--------- main/inc/lib/fckeditor/toolbars/gradebook.php | 98 +++++++++---------- .../lib/fckeditor/toolbars/introduction.php | 96 +++++++++--------- .../inc/lib/fckeditor/toolbars/learn_path.php | 92 ++++++++--------- main/inc/lib/fckeditor/toolbars/messages.php | 96 +++++++++--------- main/inc/lib/fckeditor/toolbars/middle.php | 76 +++++++------- main/inc/lib/fckeditor/toolbars/notebook.php | 96 +++++++++--------- .../fckeditor/toolbars/notebook_student.php | 98 +++++++++---------- .../fckeditor/toolbars/platform_home_page.php | 96 +++++++++--------- main/inc/lib/fckeditor/toolbars/profil.php | 96 +++++++++--------- .../toolbars/question_description.php | 96 +++++++++--------- main/inc/lib/fckeditor/toolbars/small.php | 76 +++++++------- main/inc/lib/fckeditor/toolbars/survey.php | 94 +++++++++--------- .../toolbars/system_announcements.php | 96 +++++++++--------- .../fckeditor/toolbars/test_description.php | 96 +++++++++--------- main/inc/lib/fckeditor/toolbars/wiki.php | 94 +++++++++--------- .../lib/fckeditor/toolbars/wiki_student.php | 94 +++++++++--------- 41 files changed, 1860 insertions(+), 1789 deletions(-) create mode 100644 main/inc/lib/fckeditor/toolbars/all_buttons_test.php diff --git a/main/inc/introductionSection.inc.php b/main/inc/introductionSection.inc.php index b7b323d182..586a41c84e 100644 --- a/main/inc/introductionSection.inc.php +++ b/main/inc/introductionSection.inc.php @@ -49,19 +49,35 @@ $renderer =& $form->defaultRenderer(); $renderer->setElementTemplate('
{element}
'); $toolbar_set = 'Introduction'; +$width = '100%'; +$height = '300'; // The global variable $fck_attribute has been deprecated. It stays here for supporting old external code. global $fck_attribute; -if (is_array($fck_attribute) && isset($fck_attribute['Config']['ToolbarSet'])) { - $toolbar_set = $fck_attribute['Config']['ToolbarSet']; +if (is_array($fck_attribute)) { + if (isset($fck_attribute['ToolbarSet'])) { + $toolbar_set = $fck_attribute['ToolbarSet']; + } + if (isset($fck_attribute['Width'])) { + $toolbar_set = $fck_attribute['Width']; + } + if (isset($fck_attribute['Height'])) { + $toolbar_set = $fck_attribute['Height']; + } } if (is_array($editor_config)) { if (!isset($editor_config['ToolbarSet'])) { $editor_config['ToolbarSet'] = $toolbar_set; } + if (!isset($editor_config['Width'])) { + $editor_config['Width'] = $width; + } + if (!isset($editor_config['Height'])) { + $editor_config['Height'] = $height; + } } else { - $editor_config = array('ToolbarSet' => 'Introduction'); + $editor_config = array('ToolbarSet' => $toolbar_set, 'Width' => $width, 'Height' => $height); } $form->add_html_editor('intro_content', null, null, false, $editor_config); diff --git a/main/inc/lib/fckeditor/toolbars/admin_templates.php b/main/inc/lib/fckeditor/toolbars/admin_templates.php index 3522674307..9dc0a814ab 100644 --- a/main/inc/lib/fckeditor/toolbars/admin_templates.php +++ b/main/inc/lib/fckeditor/toolbars/admin_templates.php @@ -1,47 +1,47 @@ -