From 898f89a1fc163aaac66bf2ff78a76a1a68841cfd Mon Sep 17 00:00:00 2001 From: Ivan Tcholakov Date: Sun, 4 Oct 2009 02:11:14 +0300 Subject: [PATCH] Feature #306 - The online editor (templates), some progress bars, test server mode: Fixing various javascript errors discovered during tests with Arabic language. --- main/coursecopy/classes/CourseSelectForm.class.php | 8 ++++---- main/inc/lib/fckeditor/fcktemplates.xml.php | 9 ++++----- main/upload/form.document.php | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/main/coursecopy/classes/CourseSelectForm.class.php b/main/coursecopy/classes/CourseSelectForm.class.php index f773a7c651..4297689fad 100755 --- a/main/coursecopy/classes/CourseSelectForm.class.php +++ b/main/coursecopy/classes/CourseSelectForm.class.php @@ -99,7 +99,7 @@ class CourseSelectForm require_once(api_get_path(LIBRARY_PATH).'course.lib.php'); $course_infos = CourseManager::get_course_information($hidden_fields['destination_course']); echo '

'; - echo get_lang('DestinationCourse').' : '.$course_infos['title']; + echo get_lang('DestinationCourse').' : '.$course_infos['title']; echo '

'; } @@ -109,7 +109,7 @@ class CourseSelectForm echo ''; echo ''; - echo '
'; + echo ''; echo ''; foreach ($course->resources as $type => $resources) { @@ -262,9 +262,9 @@ class CourseSelectForm foreach($resources as $id => $obj) { if(!in_array($obj->survey_id,array_keys($_POST['resource'][RESOURCE_SURVEY]))) { unset ($course->resources[$type][$id]); - } + } } - break; + break; case RESOURCE_LINKCATEGORY : case RESOURCE_FORUMCATEGORY : case RESOURCE_FORUMPOST : diff --git a/main/inc/lib/fckeditor/fcktemplates.xml.php b/main/inc/lib/fckeditor/fcktemplates.xml.php index 11e8949d17..1c53babb5e 100755 --- a/main/inc/lib/fckeditor/fcktemplates.xml.php +++ b/main/inc/lib/fckeditor/fcktemplates.xml.php @@ -6,13 +6,13 @@ header('Content-Type: text/xml; charset=utf-8'); $language_file = 'document'; // including the global dokeos file -require_once('../../global.inc.php'); +require_once '../../global.inc.php'; // outputting the opening tag of the xml file echo ''; // is this needed? -$IMConfig['base_url'] = $_configuration['root_web'].'main/img/gallery/'; +//$IMConfig['base_url'] = $_configuration['root_web'].'main/img/gallery/'; // load a stylesheet $css = loadCSS(api_get_setting('stylesheets')); @@ -115,8 +115,8 @@ function load_platform_templates() { $row['content'] = str_replace('{REL_PATH}', api_get_path(REL_PATH), $row['content']); $row['content'] = str_replace('{COURSE_DIR}',$default_course_dir, $row['content']); - echo '