chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
skala
Julian Prud'homme 19 years ago
parent 685786d71b
commit b092ec1ff4
5 changed files with 19 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      main/document/document.php
  2. BIN
      main/img/powerpoint.gif
  3. BIN
      main/img/word.gif
  4. 24
      main/inc/lib/fileDisplay.lib.php
  5. 10
      main/inc/lib/fileUpload.lib.php

4
main/document/document.php
Unescape View File

@ -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 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"); Display::display_header($tool_name,"Doc");
$is_allowed_to_edit = api_is_allowed_to_edit(); $is_allowed_to_edit = api_is_allowed_to_edit();

BIN
main/img/powerpoint.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
main/img/word.gif
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

24
main/inc/lib/fileDisplay.lib.php
Unescape View File

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

10
main/inc/lib/fileUpload.lib.php
Unescape View File

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

Write Preview
Loading…
Cancel
Save