bacula-web: JobFiles detail added in job list (jobs.php)

[bacula/bacula] / gui / bacula-web / templates / jobs.tpl

diff --git a/gui/bacula-web/templates/jobs.tpl b/gui/bacula-web/templates/jobs.tpl
index b1d7ce8df571bb48df57515eeadc3a14d37943bf..b10e01045699399f24d7b7d06bcc997031af9afb 100644 (file)
--- a/gui/bacula-web/templates/jobs.tpl
+++ b/gui/bacula-web/templates/jobs.tpl
@@ -17,74 +17,22 @@
 {popup_init src='./external_packages/js/overlib.js'}
 {include file=header.tpl}
 
-<div id="nav">
-  <a href="index.php" title="Back to the dashboard">Dashboard</a> > Jobs list
-</div>
-
-<div id="main_center">
-  <div class="box">
-       <p class="title">Running jobs</p>
-       <table class="list">
-               <tr>
-                       <td class="info">Status</td>
-                       <td class="info">Job ID</td>
-                       <td class="info">BackupJob</td>
-                       <td class="info">Start Time</td>
-                       <td class="info">Elapsed time</td>
-                       <td class="info">Level</td>
-                       <td class="info">Pool</td>
-               </tr>
-               {foreach from=$running_jobs item=job}
-               <tr>
-                       <td>{$job.JobStatusLong}</td>
-                       <td>{$job.JobId}</td>
-                       <td>{$job.Name}</td>
-                       <td>{$job.StartTime}</td>
-                       <td>{$job.elapsed_time}</td>
-                       <td>{$job.Level}</td>
-                       <td>{$job.Pool_name}</td>
-               </tr>
-               {/foreach}
-       </table>
-  </div> <!-- end div box -->
+  <div id="nav">
+    <a href="index.php" title="Back to the dashboard">Dashboard</a> > Jobs list
+  </div>
 
+  <div id="main_center">
+  
   <!-- Last jobs -->  
   <div class="box">
-       <p class="title">Last jobs</p>
-       <table class="list" border="0">
-         <tr>
-               <td width="50" class="info">Status</td>
-               <td width="50" class="info">Job ID</td>
-               <td width="70" class="info">BackupJob</td>
-               <td width="80" class="info">Start Time</td>
-               <td width="80" class="info">End Time</td>
-               <td width="70" class="info">Elapsed time</td>
-               <td width="50" class="info">Level</td>
-               <td width="80" class="info">Pool</td>
-         </tr>
-       </table>
-       <div class="listbox">
-       <table class="list" border="0">
-         {foreach from=$last_jobs item=job}
-         <tr>
-               <td width="50" class="{$job.Job_classe}">
-                       <img width="20" src="style/images/{$job.Job_icon}" alt="" title="{$job.JobStatusLong}" />
-               </td>
-               <td width="50" class="{$job.Job_classe}">{$job.JobId}</td>
-               <td width="70" class="{$job.Job_classe}">{$job.Job_name}</td>
-               <td width="80" class="{$job.Job_classe}">{$job.StartTime}</td>
-               <td width="80" class="{$job.Job_classe}">{$job.EndTime}</td>
-               <td width="70" class="{$job.Job_classe}">{$job.elapsed}</td>
-               <td width="50" class="{$job.Job_classe}">{$job.Level}</td>
-               <td width="80" class="{$job.Job_classe}">{$job.Pool_name}</td>
-         </tr>
-         {/foreach}
-       </table>
-       </div> <!-- end div class=listbox -->
-       
+       <p class="title">Jobs report</p>
+       <!-- Filter jobs -->
        <form action="jobs.php" method="post">
-       <table class="list" border="0">
+       <table border="0">
          <tr>
+           <td class="info" width="200">
+                       {$total_jobs} jobs found
+               </td>
                <td class="info" colspan="5" style="text-align: right;">
                        Jobs / Page
                        <select name="limit">
@@ -98,18 +46,60 @@
                <td class="info" width="200">
                        Job Status
                        <select name="status">
-                               <option value="Any">Any
+                               {foreach from=$job_status item=status_label}
+                               <option value="{$status_label}" {if $smarty.post.status == $status_label}Selected{/if}>{$status_label}
+<!--
+                               <option value="waiting">Waiting
+                               <option value="running">Running
                                <option value="completed">Completed
                                <option value="failed">Failed
                                <option value="canceled">Canceled
+-->                    
+                               {/foreach}
                        </select>
                </td>
                <td class="info" width="120">
                        <input type="submit" value="Update" />
                </td>
          </tr>
+         <tr>
+               <td colspan="8">&nbsp;</td>
+         </tr>
        </table>
        </form>
+       
+       <table border="0">
+         <tr>
+               <td class="info">Status</td>
+               <td class="info">Job ID</td>
+               <td class="info">BackupJob</td>
+               <td class="info">Start Time</td>
+               <td class="info">End Time</td>
+               <td class="info">Elapsed time</td>
+               <td class="info">Level</td>
+               <td class="info">Bytes</td>
+               <td class="info">Files</td>
+               <td class="info">Pool</td>
+         </tr>
+       <!-- <div class="listbox"> -->
+         {foreach from=$last_jobs item=job}
+         <tr>
+               <td width="50" class="{$job.Job_classe}">
+                       <img width="20" src="style/images/{$job.Job_icon}" alt="" title="{$job.JobStatusLong}" />
+               </td>
+               <td class="{$job.Job_classe}">{$job.JobId}</td>
+               <td class="{$job.Job_classe}">{$job.Job_name}</td>
+               <td class="{$job.Job_classe}">{$job.StartTime}</td>
+               <td class="{$job.Job_classe}">{$job.EndTime}</td>
+               <td class="{$job.Job_classe}">{$job.elapsed_time}</td>
+               <td class="{$job.Job_classe}">{$job.Level}</td>
+               <td class="{$job.Job_classe}">{$job.JobBytes}</td>
+               <td class="{$job.Job_classe}">{$job.JobFiles}</td>
+               <td class="{$job.Job_classe}">{$job.Pool_name}</td>
+         </tr>
+         {/foreach}
+       </table>
+       <!-- </div> --> <!-- end div class=listbox -->
   </div>
 
 </div>