[svn r10124]

main/document/document.inc.php

@@ -1,4 +1,4 @@
-<?php // $Id: document.inc.php 9246 2006-09-25 13:24:53Z bmol $
+<?php // $Id: document.inc.php 10124 2006-11-22 17:19:37Z elixir_inter $
 
 /*
 ==============================================================================
@@ -123,7 +123,7 @@ function create_document_link($www,$title,$path,$filetype,$size,$visibility)
 	//build download link (icon)
 	$forcedownload_link=($filetype=='folder')?$_SERVER['PHP_SELF'].'?action=downloadfolder&amp;path='.$url_path.$req_gid:$_SERVER['PHP_SELF'].'?action=download&amp;id='.$url_path.$req_gid;
 	//folder download or file download?
-	$forcedownload_icon=($filetype=='folder')?'save_zip.gif':'save.gif';
+	$forcedownload_icon=($filetype=='folder')?'save_zip.gif':'filesave.gif';
 	//prevent multiple clicks on zipped folder download
 	$prevent_multiple_click =($filetype=='folder')?" onclick=\"javascript:if(typeof clic_$dbl_click_id == 'undefined' || clic_$dbl_click_id == false) { clic_$dbl_click_id=true; window.setTimeout('clic_".($dbl_click_id++)."=false;',10000); } else { return false; }\"":'';
 	$target='_top';
@@ -167,7 +167,7 @@ function create_document_link($www,$title,$path,$filetype,$size,$visibility)
  */
 function build_document_icon_tag($type,$path)
 {
-	$icon='file.gif';
+	$icon='folder_document.gif';
 	if($type=='file')
 	{
 		$icon=choose_image(basename($path));
@@ -219,9 +219,9 @@ function build_edit_icons($curdirpath,$type,$path,$visibility,$id)
 	$curdirpath = urlencode($curdirpath);
 	
 	$modify_icons = '<a href="edit_document.php?curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$gid_req.'"><img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="" /></a>';
-	$modify_icons .= '<a href="'.$_SERVER['PHP_SELF'].'?curdirpath='.$curdirpath.'&amp;delete='.urlencode($path).$gid_req.'&amp;'.$sort_params.'" onclick="return confirmation(\''.basename($path).'\');"><img src="../img/delete.gif" border="0" title="'.get_lang('Delete').'" alt="" /></a>';
-	$modify_icons .= '<a href="'.$_SERVER['PHP_SELF'].'?curdirpath='.$curdirpath.'&amp;move='.urlencode($path).$gid_req.'"><img src="../img/deplacer.gif" border="0" title="'.get_lang('Move').'" alt="" /></a>';
-	$modify_icons .= '<a href="'.$_SERVER['PHP_SELF'].'?curdirpath='.$curdirpath.'&amp;'.$visibility_command.'='.$id.$gid_req.'&amp;'.$sort_params.'"><img src="../img/'.$visibility_icon.'.gif" border="0" title="'.get_lang('Visible').'" alt="" /></a>';
+	$modify_icons .= '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?curdirpath='.$curdirpath.'&amp;delete='.urlencode($path).$gid_req.'&amp;'.$sort_params.'" onclick="return confirmation(\''.basename($path).'\');"><img src="../img/delete.gif" border="0" title="'.get_lang('Delete').'" alt="" /></a>';
+	$modify_icons .= '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?curdirpath='.$curdirpath.'&amp;move='.urlencode($path).$gid_req.'"><img src="../img/deplacer_fichier.gif" border="0" title="'.get_lang('Move').'" alt="" /></a>';
+	$modify_icons .= '&nbsp;<a href="'.$_SERVER['PHP_SELF'].'?curdirpath='.$curdirpath.'&amp;'.$visibility_command.'='.$id.$gid_req.'&amp;'.$sort_params.'"><img src="../img/'.$visibility_icon.'.gif" border="0" title="'.get_lang('Visible').'" alt="" /></a>';
 	return $modify_icons;
 }
 

main/document/document.php

@@ -1,4 +1,4 @@
-<?php // $Id: document.php 10101 2006-11-22 12:42:53Z elixir_inter $
+<?php // $Id: document.php 10124 2006-11-22 17:19:37Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -597,7 +597,8 @@ echo(build_directory_selector($folders,$curdirpath,$group_properties['directory'
 
 	<?php
 	echo "<div id=\"doc_links\">";
-
+	
+	
 	/* GO TO PARENT DIRECTORY */
 
 	if ($curdirpath!= '/'&& $curdirpath!=$group_properties['directory'])

main/document/upload.php

@@ -1,4 +1,4 @@
-<?php // $Id: upload.php 9985 2006-11-15 00:43:47Z pcool $
+<?php // $Id: upload.php 10124 2006-11-22 17:19:37Z elixir_inter $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -300,7 +300,7 @@ if(isset($_GET['createdir']))
 }
 else {	//give them a link to create a directory
 	?>
-	<p><a href="<?php echo $_SERVER['PHP_SELF']; ?>?path=<?php echo $path; ?>&amp;createdir=1"><img src="../img/new_folder.gif" border="0" align="absmiddle" alt ="" /> <?php echo(get_lang('CreateDir'));?></a></p>
+	<p><a href="<?php echo $_SERVER['PHP_SELF']; ?>?path=<?php echo $path; ?>&amp;createdir=1"><img src="../img/folder_new.gif" border="0" align="absmiddle" alt ="" /> <?php echo(get_lang('CreateDir'));?></a></p>
 	<?php
 }
 ?>

main/inc/lib/fileDisplay.lib.php

@@ -98,22 +98,22 @@ function choose_image($file_name)
 		$type['oo_impress'] = array('odp','sxi');
 		$type['oo_draw'   ] = array('odg','sxd');
 
-		$image['word'      ] = 'doc.gif';
-		$image['web'       ] = 'html.gif';
-		$image['image'     ] = 'gif.gif';
-		$image['audio'     ] = 'wav.gif';
-		$image['video'     ] = 'video.gif';
-		$image['excel'     ] = 'xls.gif';
-		$image['compressed'] = 'zip.gif';
-		$image['code'      ] = 'txt.gif';
-		$image['acrobat'   ] = 'pdf.gif';
-		$image['powerpoint'] = 'ppt.gif';
-		$image['flash'     ] = 'flash.gif';
-		$image['text'      ] = 'txt.gif';
-		$image['oo_writer' ] = 'odt.gif';
-		$image['oo_calc'   ] = 'ods.gif';
-		$image['oo_impress'] = 'odp.gif';
-		$image['oo_draw'   ] = 'odg.gif';
+		$image['word'      ] = 'doc_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['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['oo_draw'   ] = 'file_oo_draw.gif';
 	}
 
 	/* FUNCTION CORE */

main/mySpace/cours.php

@@ -296,7 +296,7 @@
 	
 				echo '<tr class="'.$s_css_class.'">
 						<td>
-					 		<a href="'.api_get_path(REL_CLARO_PATH).'tracking/courseLog.php?cidReq='.$a_course['code'].'">'.$a_course['title'].'</a></td>
+					 		<a href="'.api_get_path(WEB_CODE_PATH).'tracking/courseLog.php?cidReq='.$a_course['code'].'">'.$a_course['title'].'</a></td>
 						<td>
 							'.$a_coach['tutor_name'].'
 						</td>

main/newscorm/lp_list.php

@@ -109,24 +109,20 @@ if(api_is_allowed_to_edit())
   include('content_makers.inc.php');
   echo	'<table border="0" cellspacing="2" cellpadding="4">
     <tr>
-      <td style="padding-bottom: 15px;">' .
+      <td >' .
       	'<a href="'.$_SERVER['PHP_SELF'].'?action=add_lp">'.
-		'<img src="../img/wizard.gif" border="0" align="absmiddle" alt="scormbuilder">'.get_lang('_add_learnpath').
+		'<img src="../img/wizard.gif" border="0" align="absmiddle" alt="scormbuilder">&nbsp;'.get_lang('_add_learnpath').
 		'</a>' .
-		str_repeat('&nbsp',10)."</td>".
+		str_repeat('&nbsp',10).'</td>'.
        "<td>" .
    /*--------------------------------------
       UPLOAD SECTION - displays file upload box
      --------------------------------------*/
-		'<form name="ext_upload" action="../upload/index.php" method="post">' .
-		'<input type="hidden" name="curdirpath" value="/">' .
-		'<input type="hidden" name="tool" value="'.TOOL_LEARNPATH.'">' .
-		'<img src="../img/download_manager.gif" border="0" align="absmiddle" alt="scormbuilder" style="margin-top:-10px;">'.
-		'<input type="submit" name="upload" value="'.get_lang("UploadScorm").'">' .
-		'</form>'.
-       "</td>" .
+		'<a href="../upload/index.php?curdirpath=/&tool='.TOOL_LEARNPATH.'"><img src="../img/download_manager.gif" border="0" alt="scormbuilder" align="absmiddle">&nbsp;'.get_lang("UploadScorm").'</a>'.
+       '</td>' .
     "</tr>
   </table>";
+  
 }
 
 echo '<table width="100%" border="0" cellspacing="2" class="data_table">';

main/upload/index.php

@@ -99,15 +99,15 @@ $noPHP_SELF=true;
 $max_filled_space = DocumentManager::get_course_quota();
 
 //what's the current path?
-if(isset($_POST['curdirpath'])) {
-	$path = $_POST['curdirpath'];
+if(isset($_REQUEST['curdirpath'])) {
+	$path = $_REQUEST['curdirpath'];
 }else{
 	$path = '/';
 }
 // set calling tool
-if(isset($_POST['tool'])) {
-	$my_tool = $_POST['tool'];
-	$_SESSION['my_tool'] = $_POST['tool'];
+if(isset($_REQUEST['tool'])) {
+	$my_tool = $_REQUEST['tool'];
+	$_SESSION['my_tool'] = $_REQUEST['tool'];
 }elseif(!empty($_SESSION['my_tool'])){
 	$my_tool = $_SESSION['my_tool'];
 }else{