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

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

diff --git a/gui/bweb/tpl/client_job_status.tpl b/gui/bweb/tpl/client_job_status.tpl
index 2ccf5f0061650fb3c2988270aae2201b20535949..4a5434e528aba2eb9ff9f2a5f73311d666ac308d 100644 (file)
--- a/gui/bweb/tpl/client_job_status.tpl
+++ b/gui/bweb/tpl/client_job_status.tpl
@@ -8,20 +8,33 @@
 
 <table>
  <tr>
-  <td> <b> __Job Name:__ </b> <td> <td> <TMPL_VAR jobname> (<TMPL_VAR jobid>) <td> 
+  <td> <b> __Job Name:__ </b> </td> <td> <TMPL_VAR jobname> (<TMPL_VAR jobid>) <td> 
  </tr>
  <tr>
-  <td> <b> __Processing file:__ </b> <td> <td> <TMPL_VAR "processing file"> </td>
+  <td> <b> __Processing file:__ </b> </td> <td> <TMPL_VAR "processing file"> </td>
  </tr>
  <tr>
-  <td> <b> __Speed:__ </b> <td> <td> <TMPL_VAR "bytes/sec"> B/s</td>
+  <td> <b> __Speed:__ </b> </td> <td> <TMPL_VAR "bytes/sec"> B/s</td>
  </tr>
  <tr>
-  <td> <b> __Files Examined:__ </b> <td> <td> <TMPL_VAR "files examined"></td>
+  <td> <b> __Files Examined:__ </b> </td> <td> <TMPL_VAR "files examined"></td>
  </tr>
  <tr>
-  <td> <b> __Bytes:__ </b> <td> <td> <TMPL_VAR bytes></td>
+  <td> <b> __Files Backuped:__ </b> </td> <td> <TMPL_VAR files></td>
  </tr>
+ <tr>
+  <td> <b> __Bytes:__ </b> </td> <td> <TMPL_VAR bytes></td>
+ </tr>
+<TMPL_IF last_jobbytes>
+ <tr>
+  <td> <b> __Bytes done__ </b> </td><td> <div id='progressb'><td>
+ </tr>
+</TMPL_IF>
+<TMPL_IF last_jobfiles>
+ <tr>
+  <td> <b> __Files done__ </b> </td><td> <div id='progressf'><td>
+ </tr>
+</TMPL_IF>
 </table>
 <form name='form1' action='?' method='GET'>
 <button type="submit" class="bp" name='action' value='dsp_cur_job' 
@@ -35,6 +48,12 @@
  </div>
 
 <script type="text/javascript" language="JavaScript">
+<TMPL_IF last_jobfiles>
+  percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, <TMPL_VAR corr_jobfiles>, document.getElementById('progressf'));
+</TMPL_IF>
+<TMPL_IF last_jobbytes>
+  percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, <TMPL_VAR corr_jobbytes>, document.getElementById('progressb'));
+</TMPL_IF>
   bweb_add_refresh();
 </script>