lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5569 from olsesacl/develop-show-preview-documents

Browse Source 
NEW Preview documents
This commit is contained in:
Laurent Destailleur 2016-08-05 01:13:35 +02:00 committed by GitHub
commit 7211542e41
2 changed files with 92 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
htdocs/core/class/html.formfile.class.php
View File

@ -619,6 +619,9 @@ class FormFile
$out.= ' target="_blank">'; $out.= ' target="_blank">';
$out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]).' '.dol_trunc($file["name"],$maxfilenamelength); $out.= img_mime($file["name"],$langs->trans("File").': '.$file["name"]).' '.dol_trunc($file["name"],$maxfilenamelength);
$out.= '</a>'."\n"; $out.= '</a>'."\n";
$out.= $this->showPreview($file,$modulepart,$relativepath);
$out.= '</td>'; $out.= '</td>';
// Show file size // Show file size
@ -739,6 +742,8 @@ class FormFile
$out.= img_mime($relativepath, $file["name"]); $out.= img_mime($relativepath, $file["name"]);
$out.= '</a>'."\n"; $out.= '</a>'."\n";
$out.= $this->showPreview($file,$modulepart,$relativepath);
$this->infofiles['nboffiles']++; $this->infofiles['nboffiles']++;
$this->infofiles['files'][]=$file['fullname']; $this->infofiles['files'][]=$file['fullname'];
$ext=pathinfo($file["name"], PATHINFO_EXTENSION); $ext=pathinfo($file["name"], PATHINFO_EXTENSION);
@ -859,6 +864,9 @@ class FormFile
//print dol_trunc($file['name'],$maxlength,'middle'); //print dol_trunc($file['name'],$maxlength,'middle');
print $file['name']; print $file['name'];
print '</a>'; print '</a>';
print $this->showPreview($file,$modulepart,$filepath);
print "</td>\n"; print "</td>\n";
print '<td align="right" width="80px">'.dol_print_size($file['size'],1,1).'</td>'; print '<td align="right" width="80px">'.dol_print_size($file['size'],1,1).'</td>';
print '<td align="center" width="130px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>'; print '<td align="center" width="130px">'.dol_print_date($file['date'],"dayhour","tzuser").'</td>';
@ -1320,5 +1328,30 @@ class FormFile
return $nboflinks; return $nboflinks;
} }
/**
* Show detail icon with link for preview
* @param array $file File
* @param string $modulepart propal, facture, facture_fourn, ...
* @param string $relativepath Relative path of docs
* @return string $out Output string with HTML
*/
public function showPreview($file, $modulepart, $relativepath){
global $langs, $conf;
if (empty($conf->use_javascript_ajax)) return '';
$out='';
$mime_preview = array('jpeg', 'png', 'gif', 'tiff', 'pdf', 'plain', 'css');
$num_mime = array_search(dol_mimetype($file['name'], '', 1), $mime_preview);
if( $num_mime!== false){
$out.= ' <a href="javascript:document_preview(\''.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&amp;attachment=0&amp;file='.urlencode($relativepath).'\',\''.dol_mimetype($file['name']).'\', \''.$file['name'].'\')">';
$out.= img_picto($langs->trans('Preview'), 'detail').'</a>';
return $out;
}
}
} }

59
htdocs/core/js/lib_head.js.php
View File

@ -948,6 +948,65 @@ function copyToClipboard(text,text2)
return false; return false;
} }
/*
* Function show document preview
* @params string file File path
* @params string type mime file
* @params string title
*/
function document_preview(file, type, title){
var ValidImageTypes = ["image/gif", "image/jpeg", "image/png"];
if ($.inArray(type, ValidImageTypes) < 0) {
var width='85%';
var object_width='100%';
var height = $( window ).height()*0.90;
var object_height='98%';
show_preview();
} else {
var object_width=0;
var object_height=0;
var img = new Image();
img.onload = function() {
object_width = this.width;
object_height = this.height;
width = $( window ).width()*0.90;
if(object_width < width){
width = object_width + 30
}
height = $( window ).height()*0.85;
if(object_height < height){
height = object_height + 80
}
show_preview();
};
img.src = file;
}
function show_preview(){
var newElem = '<object data="'+file+'" type="'+type+'" width="'+object_width+'" height="'+object_height+'"></object>';
$("#dialogforpopup").html(newElem);
$("#dialogforpopup").dialog({
closeOnEscape: true,
resizable: true,
width: width,
height: height,
modal: true,
title: title
});
}
}
/* /*
* Provide a function to get an URL GET parameter in javascript * Provide a function to get an URL GET parameter in javascript
* *