Change the layout to two columns; Parameters and document view.

This commit is contained in:
2015-06-27 03:45:06 +02:00
parent 8690ff5638
commit 9792f23158
2 changed files with 63 additions and 39 deletions

View File

@@ -4,6 +4,7 @@ include_once "config.php";
include_once "utils.php";
include_once "ui.php";
$Commands=array();
function ExecCommand($command){
@@ -136,16 +137,27 @@ function CropImage($file){
}
function RenderDocument($filePath){
$filename=pathinfo($filePath)["basename"];
$filePathFixed=htmlentities($filePath,ENT_HTML5, "UTF-8");
$filenameFixed=htmlentities($filename,ENT_HTML5, "UTF-8");
$render="";
$render.='<div><a href="'.$filePathFixed.'" class="button" download="'.$filenameFixed.'">'.
'Download</a></div>'."\n";
$render.='<iframe src="'.$filePathFixed.'" '.
'class="previewDoc" ></iframe>';
return $render;
}
// Detect scanner
$Scanner=array();
$Scanner["ScanDevice"]=RequestParm("hidScanDevice","");
$Scanner["ScanModel"]=RequestParm("hidScanDevice","");
$Scanner["ScanModel"]=RequestParm("hidScanModel","");
if($Scanner["ScanDevice"]=="" || $Scanner["ScanModel"]==""){
$Scanner=ScannerDetect();
}
// Configure with formdata
$Resolution=RequestParm("ddlResolution",$Resolution);
$Format=RequestParm("ddlFormat",$Format);
@@ -165,31 +177,24 @@ if(RequestParm("btnScan",false)){
MoveToDest($DestFile);
}
echo '<form id="frmMain" method="POST" action="'.$_SERVER['PHP_SELF'].'">'."\n";
// Render header info
echo RenderFieldInfo("Scanner",$Scanner["ScanModel"]);
echo RenderFieldCombo("Resolution","ddlResolution",$Resolutions,$Resolution);
echo RenderFieldCombo("Format","ddlFormat",$Formats,$Format);
echo RenderFieldCombo("Size","ddlSize",$Sizes,$Size);
echo RenderFieldCheckText("Cropping","chkCrop",$Crop,"txtCropFuzz",$CropFuzz);
echo RenderFieldButton("","btnScan","Scan");
echo RenderHidden("hidScanDevice",$Scanner["ScanDevice"]);
echo RenderHidden("hidScanModel",$Scanner["ScanModel"]);
// Render Form
$formFields="";
$formFields.=RenderFieldInfo("Scanner",$Scanner["ScanModel"]);
$formFields.=RenderFieldCombo("Resolution","ddlResolution",$Resolutions,$Resolution);
$formFields.=RenderFieldCombo("Format","ddlFormat",$Formats,$Format);
$formFields.=RenderFieldCombo("Size","ddlSize",$Sizes,$Size);
$formFields.=RenderFieldCheckText("Cropping","chkCrop",$Crop,"txtCropFuzz",$CropFuzz);
$formFields.=RenderFieldButton("","btnScan","Scan");
$formFields.=RenderHidden("hidScanDevice",$Scanner["ScanDevice"]);
$formFields.=RenderHidden("hidScanModel",$Scanner["ScanModel"]);
$columns="";
$columns.=renderDiv("divColLeft",$formFields);
$result="";
if($DestFile!=null){
$DestFilenane=pathinfo($DestFile)["basename"];
$DestFileFixed=htmlentities($DestFilenane,ENT_HTML5, "UTF-8");
$DestPathFixed=htmlentities($DestFile,ENT_HTML5, "UTF-8");
echo '<div><a href="'.$DestPathFixed.'" class="button" download="'.$DestFileFixed.'">'.
'Download</a></div>'."\n";
echo '<iframe src="'.$DestPathFixed.'" '.
'class="previewDoc" ></iframe>';
$result.=RenderDocument($DestFile);
}
echo RenderCommandLog();
echo "</form>\n";
$columns.=renderDiv("divColRight",$result);
$columns.=RenderCommandLog();
echo RenderForm("frmMain",$columns);