Feature #306 - The online editor (templates), some progress bars, test server mode: Fixing various javascript errors discovered during tests with Arabic language.

16 years ago · 898f89a1fc
parent 6304c709bc
commit 898f89a1fc
3 changed files with 9 additions and 10 deletions
--- 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 '<h3>';
-				echo get_lang('DestinationCourse').' : '.$course_infos['title'];
+			echo get_lang('DestinationCourse').' : '.$course_infos['title'];
 			echo '</h3>';
 		}

@ -109,7 +109,7 @@ class CourseSelectForm

 		echo '<script language="javascript" src="'.api_get_path(WEB_CODE_PATH).'inc/lib/javascript/upload.js" type="text/javascript"></script>';
 		echo '<script type="text/javascript">var myUpload = new upload(1000);</script>';
-		echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.api_get_path(WEB_CODE_PATH).'img/progress_bar.gif\',\''.get_lang('PleaseStandBy').'\',\'upload_form\')">';
+		echo '<form method="post" id="upload_form" name="course_select_form" onsubmit="javascript: myUpload.start(\'dynamic_div\',\''.api_get_path(WEB_CODE_PATH).'img/progress_bar.gif\',\''.get_lang('PleaseStandBy', '').'\',\'upload_form\')">';
 		echo '<input type="hidden" name="action" value="course_select_form"/>';

 		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 :
--- 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 '<?xml version="1.0" encoding="utf-8" ?>';

 // 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 '	<Template title="'.s(get_lang($row['title']), '').'" image="'.$image.'">
-					<Description>'.s(get_lang($row['comment']), '').'</Description>
+		echo '	<Template title="'.s(get_lang($row['title'], '')).'" image="'.$image.'">
+					<Description>'.s(get_lang($row['comment'], '')).'</Description>
 					<Html>
 						<![CDATA[
 							    '.$row['content'].'
@ -207,4 +207,3 @@ function load_empty_template()
 </Template>
 <?php
 }
-?>
--- a/main/upload/form.document.php
+++ b/main/upload/form.document.php
@ -30,7 +30,7 @@ api_display_tool_title($nameTools.$add_group_to_title);
 	*/
 		?>

-	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading'));?>','upload_form_div');">
+	<form method="POST" action="upload.php" id="upload_form" enctype="multipart/form-data" onsubmit="javascript: myUpload.start('dynamic_div','progressbar_green.gif','<?php echo(get_lang('Uploading', ''));?>','upload_form_div');">
 		<input type="hidden" name="curdirpath" value="<?php echo $path; ?>">
 		<input type="hidden" name="tool" value="<?php echo $my_tool; ?>">
 		<input type="file" name="user_file">