VAR/Scans
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Embed command log on a toggleable element

Browse Source
This commit is contained in:
Valeriano A.R.
2015-06-26 20:26:48 +02:00
parent a99569b1be
commit 2af167270e
3 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
code/scans.php
View File

@@ -18,15 +18,20 @@ function ExecCommand($command){
return $stdout; return $stdout;
} }
function ShowCommandLog(){ function RenderCommandLog(){
global $Commands; global $Commands;
$renderLog="";
foreach($Commands as $loggedCommand){ foreach($Commands as $loggedCommand){
echo RenderParagraph($loggedCommand["Command"],"font-weight: bold;"); $renderLog.=RenderParagraph($loggedCommand["Command"],"font-weight: bold;");
echo RenderParagraph($loggedCommand["Result"]); $renderLog.=RenderParagraph($loggedCommand["Result"]);
echo RenderParagraph($loggedCommand["Error"],"color: red;"); $renderLog.=RenderParagraph($loggedCommand["Error"],"color: red;");
}
} }
return RenderDiv("divConsoleContainer",
RenderButton("btnToggle","Log","var elem=document.getElementById('divConsole');if(elem.style.display==''){elem.style.display='none';}else{elem.style.display='';}return false;").
RenderDiv("divConsole",$renderLog,"display:none;")
);
}
function Scan($device,$resolution,$format,$size,$destFileBase){ function Scan($device,$resolution,$format,$size,$destFileBase){
global $PreviewDir; global $PreviewDir;
@@ -165,5 +170,6 @@ if($DestFile!=null){
} }
echo "</form>\n"; echo "</form>\n";
ShowCommandLog();
echo RenderCommandLog();

39
code/ui.php
View File

@@ -78,11 +78,17 @@ function RenderCombo($id,$options,$selected){
return $render; return $render;
} }
function RenderButton($id,$value){ function RenderButton($id,$value,$onClick=""){
$idFixed=htmlentities($id,ENT_HTML5, "UTF-8"); $idFixed=htmlentities($id,ENT_HTML5, "UTF-8");
$valueFixed=htmlentities($value,ENT_HTML5, "UTF-8"); $valueFixed=htmlentities($value,ENT_HTML5, "UTF-8");
return '<input type="submit" value="'.$valueFixed.'" '. $render='<input type="submit" value="'.$valueFixed.'" '.
'id="'.$idFixed.'" name="'.$idFixed.'" class="button" />'; 'id="'.$idFixed.'" name="'.$idFixed.'" class="button"';
if($onClick!=""){
$onClickFixed=htmlentities($onClick,ENT_HTML5, "UTF-8");
$render.=' onclick="'.$onClickFixed.'"';
}
$render.='/>'."\n";
return $render;
} }
function RenderFieldInfo($text,$info){ function RenderFieldInfo($text,$info){
@@ -125,10 +131,10 @@ function RenderFieldCombo($text,$idCombo,$options,$selected){
return $render; return $render;
} }
function RenderFieldButton($text,$idButton,$value){ function RenderFieldButton($text,$idButton,$value,$onClick=""){
$render='<div class="field">'."\n"; $render='<div class="field">'."\n";
$render.=RenderLabel($text); $render.=RenderLabel($text);
$render.=RenderButton($idButton,$value); $render.=RenderButton($idButton,$value,$onClick);
$render.='</div>'."\n"; $render.='</div>'."\n";
return $render; return $render;
} }
@@ -136,12 +142,27 @@ function RenderFieldButton($text,$idButton,$value){
function RenderParagraph($text,$style=null){ function RenderParagraph($text,$style=null){
if($text==null || $text==""){ return ""; } if($text==null || $text==""){ return ""; }
$textFixed=htmlentities($text,ENT_HTML5, "UTF-8"); $textLines=explode("\n",$text);
$render="";
foreach ($textLines as $line) {
$textFixed=htmlentities($line,ENT_HTML5, "UTF-8");
if($style==null){ if($style==null){
return "<p>".$textFixed."</p>\n"; $render.="<p>".$textFixed."</p>\n";
}else{ }else{
return "<p style=\"".$style."\">".$textFixed."</p>\n"; $render.="<p style=\"".$style."\">".$textFixed."</p>\n";
} }
} }
return $render;
}
function RenderDiv($idDiv,$innerHTML,$style=null){
$idFixed=htmlentities($idDiv,ENT_HTML5, "UTF-8");
if($style==null){
$render='<div id="'.$idFixed.'" >';
}else{
$render='<div id="'.$idFixed.'" style="'.$style.'">';
}
$render.=$innerHTML;
$render.='<div/>'."\n";
return $render;
}

20
style.css
View File

@@ -65,3 +65,23 @@ h1:first-child{
max-width:200px; max-width:200px;
max-height:200px; max-height:200px;
} }
#divConsoleContainer{
margin:5px;
}
#divConsoleContainer .button{
padding:2px;
}
#divConsole{
color: grey;
background-color: black;
font-family: Monospace;
padding: 5px;
height:250px;
overflow: auto;
}
#divConsole p{
color: grey;
background-color: black;
font-family: Monospace;
}