merge

main/document/document.inc.php

@@ -341,7 +341,7 @@ function build_edit_icons($curdirpath, $type, $path, $visibility, $id, $is_templ
 		} else {
 			$modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;remove_as_template='.$id.$req_gid.'&amp;'.$sort_params.'"><img src="../img/wizard_gray_small.gif" border="0" title="'.get_lang('RemoveAsTemplate').'" alt=""'.get_lang('RemoveAsTemplate').'" /></a>';
 		}
-		$modify_icons .= '<a href="export_htmldoc2pdf.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'"><img src="../img/file_pdf_small.gif" border="0" title="'.get_lang('Export2PDF').'" alt="" /></a>';
+		$modify_icons .= '&nbsp;<a href="export_htmldoc2pdf.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'"><img src="../img/file_pdf_small.gif" border="0" title="'.get_lang('Export2PDF').'" alt="" /></a>';
 	}
 
 	return $modify_icons;

main/document/document.php

@@ -893,7 +893,7 @@ $table->set_header($column++, get_lang('Size'),true,array ('style' => 'width:50p
 $table->set_header($column++, get_lang('Date'),true,array ('style' => 'width:150px;'));
 // Admins get an edit column
 if ($is_allowed_to_edit || $group_member_with_upload_rights) {
-	$table->set_header($column++, get_lang('Modify'), false,array ('style' => 'width:100px;'));
+	$table->set_header($column++, get_lang('Modify'), false,array ('style' => 'width:150px;'));
 }
 
 // Actions on multiple selected documents

main/document/export_htmldoc2pdf.php

@@ -10,6 +10,7 @@ $file = Security::remove_XSS($_GET['file']);
 $file_info = pathinfo($file);
 $dirname = str_replace("\\", '/', $file_info['dirname']);
 $filename = $file_info['basename'];
+$filename =str_replace('_',' ',$filename);
 $extension = $file_info['extension'];
 
 if (!($extension == 'html' || $extension == 'htm')) {
@@ -17,9 +18,9 @@ if (!($extension == 'html' || $extension == 'htm')) {
 }
 
 if($extension == 'html'){
-	$head_title_filename =basename($file,'.html');
+	$filename =basename($filename,'.html');
 }elseif($extension == 'htm'){
-	$head_title_filename =basename($file,'.htm');
+	$filename =basename($filename,'.htm');
 }
 
 define('_MPDF_PATH', api_get_path(LIBRARY_PATH).'mpdf/');
@@ -75,7 +76,7 @@ $pdf->defaultfooterfontsize = 12;	// in pts
 $pdf->defaultfooterfontstyle = B;	// blank, B, I, or BI
 $pdf->defaultfooterline = 1;		// 1 to include line below header/above footer
 
-$pdf->SetHeader($head_title_filename.'|||');// ('{DATE j-m-Y}|{PAGENO}/{nb}|'.$title);
+$pdf->SetHeader($filename.'|||');// ('{DATE j-m-Y}|{PAGENO}/{nb}|'.$title);
 $pdf->SetFooter('||{PAGENO}');		// defines footer for Odd and Even Pages - placed at Outer margin
 
 $pdf->SetAuthor('Documents Chamilo');