bacula-web: Replaced Get_human_file_size() function by Utils::Get_Human_Size

[bacula/bacula] / gui / bweb / tpl / display_job.tpl

diff --git a/gui/bweb/tpl/display_job.tpl b/gui/bweb/tpl/display_job.tpl
index 1fc9fb255cac4894f4384ec9c226a266b11aa6bb..8530023dbacb0f374893bf3bdf5a6bd40dd5dc0f 100644 (file)
--- a/gui/bweb/tpl/display_job.tpl
+++ b/gui/bweb/tpl/display_job.tpl
@@ -1,12 +1,11 @@
-<br/>
  <div class='titlediv'>
-  <h1 class='newstitle'> Last Jobs (<TMPL_VAR Filter>)</h1>
+  <h1 class='newstitle'> __Last Jobs__ (<TMPL_VAR Filter>)</h1>
  </div>
  <div class='bodydiv'>
     <table id='id<TMPL_VAR ID>'></table>
  </div>
 
-<script language="JavaScript">
+<script type="text/javascript" language="JavaScript">
 <TMPL_IF status>
 document.getElementById('status_<TMPL_VAR status>').checked = true;
 </TMPL_IF>
@@ -14,16 +13,18 @@ document.getElementById('status_<TMPL_VAR status>').checked = true;
 
 
 var header = new Array("JobId",
-                      "Client",
-                      "Job Name", 
-                      "FileSet",
-//                     "Pool",
-                       "Level",
-                       "StartTime", 
-                       "JobFiles",
-                       "JobBytes", 
-                       "Errors",
-                      "Status");
+                      "__Client__",
+                      "__Job Name__",
+                       "__Comment__",
+                      "__FileSet__",
+//                     "__Pool__",
+                       "__Level__",
+                       "__StartTime__",
+                      "__Duration__",
+                       "__JobFiles__",
+                       "__JobBytes__",
+                       "__Errors__",
+                      "__Status__");
 
 var data = new Array();
 
@@ -32,7 +33,9 @@ a = document.createElement('A');
 a.href='?action=job_zoom;jobid=<TMPL_VAR JobId>';
 
 img = document.createElement("IMG");
-img.src="/bweb/<TMPL_VAR JobStatus>.png";
+img.src=bweb_get_job_img("<TMPL_VAR JobStatus>", 
+                         <TMPL_VAR joberrors>,
+                         "<TMPL_VAR jobtype>");
 img.title=jobstatus['<TMPL_VAR JobStatus>']; 
 
 a.appendChild(img);
@@ -40,14 +43,16 @@ a.appendChild(img);
 data.push( new Array(
 "<TMPL_VAR JobId>",
 "<TMPL_VAR Client>",     
-"<TMPL_VAR JobName>",    
+"<TMPL_VAR JobName>",
+"<TMPL_VAR Comment>",
 "<TMPL_VAR FileSet>",    
 //"<TMPL_VAR Pool>",
 "<TMPL_VAR Level>",      
 "<TMPL_VAR StartTime>",
+human_duration("<TMPL_VAR Duration>"),
 "<TMPL_VAR JobFiles>",   
-"<TMPL_VAR JobBytes>",
-"<TMPL_VAR joberrors">",   
+human_size(<TMPL_VAR JobBytes>),
+"<TMPL_VAR joberrors>",   
 a
  )
 );
@@ -70,8 +75,8 @@ nrsTable.setup(
  header_color: header_color,
  page_nav: true,
  rows_per_page: rows_per_page,
- padding: 3,
-// disable_sorting: new Array(6)
+ disable_sorting: new Array(10),
+ padding: 3
 }
 );