[svn r11250] minor - update display (new icons, strip HTML tags in feedback messages, ...)

main/document/document.php

@@ -1,4 +1,4 @@
-<?php // $Id: document.php 11204 2007-02-23 13:58:47Z elixir_julian $
+<?php // $Id: document.php 11250 2007-02-27 10:55:02Z elixir_julian $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -261,7 +261,7 @@ $image_files_only="";
 -----------------------------------------------------------
 */
 
-$tool_name = get_lang("Doc"); // title of the page (should come from the language file)
+$tool_name = get_lang("Document"); // title of the page (should come from the language file)
 Display::display_header($tool_name,"Doc");
 $is_allowed_to_edit  = api_is_allowed_to_edit();
 

main/inc/lib/fileDisplay.lib.php

@@ -98,21 +98,21 @@ function choose_image($file_name)
 		$type['oo_impress'] = array('odp','sxi');
 		$type['oo_draw'   ] = array('odg','sxd');
 
-		$image['word'      ] = 'doc_word.gif';//
-		$image['web'       ] = 'file_html.gif';//
-		$image['image'     ] = 'file_image.gif';//
+		$image['word'      ] = 'word.gif';
+		$image['web'       ] = 'file_html.gif';
+		$image['image'     ] = 'file_image.gif';
 		$image['audio'     ] = 'file_sound.gif';
-		$image['video'     ] = 'film.gif';//
-		$image['excel'     ] = 'file_xls.gif';//
-		$image['compressed'] = 'file_zip.gif';//
+		$image['video'     ] = 'film.gif';
+		$image['excel'     ] = 'excel.gif';
+		$image['compressed'] = 'file_zip.gif';
 		$image['code'      ] = 'file_txt.gif';
 		$image['acrobat'   ] = 'file_pdf.gif';
-		$image['powerpoint'] = 'file_powerpoint.gif';//
-		$image['flash'     ] = 'file_flash.gif';//
-		$image['text'      ] = 'file_txt.gif';//
-		$image['oo_writer' ] = 'file_oo_writer.gif';//
-		$image['oo_calc'   ] = 'file_oo_calc.gif';//
-		$image['oo_impress'] = 'file_oo_impress.gif';//
+		$image['powerpoint'] = 'powerpoint.gif';
+		$image['flash'     ] = 'file_flash.gif';
+		$image['text'      ] = 'file_txt.gif';
+		$image['oo_writer' ] = 'word.gif';
+		$image['oo_calc'   ] = 'excel.gif';
+		$image['oo_impress'] = 'powerpoint.gif';
 		$image['oo_draw'   ] = 'file_oo_draw.gif';
 	}
 

main/inc/lib/fileUpload.lib.php

@@ -364,7 +364,7 @@ function handle_uploaded_document($_course,$uploaded_file,$base_work_dir,$upload
 						item_property_update_on_folder($_course,$upload_path,$user_id);
 						//display success message with extra info to user
 						if($output){
-							Display::display_confirmation_message(get_lang('UplUploadSucceeded')."<br/>".$file_path .' '. get_lang('UplFileOverwritten'));
+							Display::display_confirmation_message(get_lang('UplUploadSucceeded')."<br/>".$file_path .' '. get_lang('UplFileOverwritten'),false);
 						}
 						return $file_path;
 					}
@@ -380,7 +380,7 @@ function handle_uploaded_document($_course,$uploaded_file,$base_work_dir,$upload
 						//if the file is in a folder, we need to update all parent folders
 						item_property_update_on_folder($_course,$upload_path,$user_id);
 						//display success message to user
-						Display::display_confirmation_message(get_lang('UplUploadSucceeded')."<br/>".$file_path);
+						Display::display_confirmation_message(get_lang('UplUploadSucceeded')."<br/>".$file_path,false);
 						return $file_path;
 					}
 				}
@@ -410,7 +410,7 @@ function handle_uploaded_document($_course,$uploaded_file,$base_work_dir,$upload
 					item_property_update_on_folder($_course,$upload_path,$user_id);
 					//display success message to user
 					if($output){
-						Display::display_confirmation_message(get_lang('UplUploadSucceeded'). "<br>" .get_lang('UplFileSavedAs') . $new_file_path);
+						Display::display_confirmation_message(get_lang('UplUploadSucceeded'). "<br>" .get_lang('UplFileSavedAs') . $new_file_path,false);
 					}
 					return $new_file_path;
 				}
@@ -425,7 +425,7 @@ function handle_uploaded_document($_course,$uploaded_file,$base_work_dir,$upload
 			default:
 				if (file_exists($store_path))
 				{
-					Display::display_error_message($clean_name.get_lang('UplAlreadyExists'));
+					Display::display_error_message($clean_name.' '.get_lang('UplAlreadyExists'));
 				}
 				else
 				{
@@ -443,7 +443,7 @@ function handle_uploaded_document($_course,$uploaded_file,$base_work_dir,$upload
 						item_property_update_on_folder($_course,$upload_path,$user_id);
 						//display success message to user
 						if($output){
-							Display::display_confirmation_message(get_lang('UplUploadSucceeded')."<br/>".$file_path);
+							Display::display_confirmation_message(get_lang('UplUploadSucceeded')."<br/>".$file_path,false);
 						}
 						return $file_path;
 					}