X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=gui%2Fbacula-web%2Ftemplates%2Findex.tpl;h=94b26a3ac44cbcdc9205b73744fda2219333aaec;hb=8ff24a4488b622856762eebadc614a214f009f52;hp=62ed02b226a79d5f28750f67fc553dc42bc1c9d0;hpb=c52b42e8482edaf7bad146aa6c1c571a34e78703;p=bacula%2Fbacula

diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index 62ed02b226..94b26a3ac4 100644
--- a/gui/bacula-web/templates/index.tpl
+++ b/gui/bacula-web/templates/index.tpl
@@ -20,66 +20,97 @@
 <div id="main_left">
   <!-- General information -->
   <div class="box">
-	<p class="title">General informations</p>
+	<p class="title">Overall status</p>
 	<table>
 	  <tr>
 	    <td class="label">{t}Clients{/t}</td> <td class="info">{$clientes_totales}</td>
 	  </tr>
 	  <tr>
-		<td class="label">{t}Total bytes stored{/t}:</td> <td class="info">{$bytes_stored}</td>
+		<td class="label">{t}Total bytes stored{/t}</td> <td class="info">{$stored_bytes}</td>
 	  </tr>
 	  <tr>
-		<td class="label">{t}Total files:{/t}</td> <td class="info">{$files_totales} file(s)</td>
+		<td class="label">{t}Total files{/t}</td> <td class="info">{$files_totales} file(s)</td>
 	  </tr>
 	  <tr>
-		<td class="label">{t}Database size{/t}:</td> <td class="info">{$database_size}</td>
+		<td class="label">{t}Database size{/t}</td> <td class="info">{$database_size}</td>
 	  </tr>
 	</table>
   </div>
 
   <!-- Pools and Volumes Status -->
   <div class="box">
-	<p class="title">Pools and volumes status</p>
+	<p class="title">
+	Pools and volumes status
+	<a href="pools.php" title="Show pools and volumes report">View report</a>
+	</p>
 	  <img src="{$graph_pools}" alt="" />
   </div> <!-- end div box -->
+  
+  <div class="box">
+	<p class="title">Stored Bytes (GB / Last 7 days)</p>
+	  <img src="{$graph_stored_bytes}" alt="" />
+  </div> <!-- end div box -->
 
-  {include file=volumes.tpl}
 </div>
 
-<!-- To be removed -->
-{if $server==""} 
-  <!-- <img class="report" src="stats.php?server={$server}&amp;tipo_dato=69&amp;title=General%20report&amp;modo_graph=bars&amp;sizex=420&amp;sizey=250&amp;MBottom=20&amp;legend=1" alt="" /> -->
-{else}
-  <!-- <img class="report" src="stats.php?server={$server}&amp;tipo_dato=3&amp;title={$server}&amp;modo_graph=bars" alt="" /> -->
-{/if} 
-
 <div id="main_right">
   <!-- Last job Status -->
   <div class="box">
-	<p class="title">Last 24 hours status</p>
-		{* {if $mode == "Lite" && $smarty.get.Full_popup != "yes"} *}
+	<p class="title">Last 24 hours status
+		<a href="jobs.php" title="Show last 24 hours jobs status">View report</a>
+	</p>
 		<table>
 			<tr>
-				<td class="label">Failed jobs</td> <td class="info">{$failed_jobs}</td>
+				<td class="label">Failed jobs</td> 
+				<td class="info">{$failed_jobs}</td>
+				<!-- <td class="info"> <a href="jobs.php" title="View last failed jobs">View</a> </td> -->
 			</tr>
 			<tr>
-				<td class="label">Completed jobs</td> <td class="info">{$completed_jobs}</td>
+				<td class="label">Completed jobs</td> 
+				<td class="info">{$completed_jobs}</td>
+				<!-- <td class="info"> <a href="jobs.php" title="View last completed jobs">View</a> </td> -->
 			</tr> 
 			<tr>
-				<td class="label">Elapsed time</td> <td class="info">{$elapsed_jobs}</td>
-			</tr>
+				<td class="label">Waiting jobs</td> 
+				<td class="info">{$waiting_jobs}</td>
+				<!-- <td class="info"> <a href="jobs.php" title="View last completed jobs">View</a> </td> -->
+			</tr> 
 			<tr>
-				<td class="label">Transferred Bytes</td> <td class="info">{$bytes_totales}</td>
+				<td class="label">Transferred Bytes</td> 
+				<td class="info">{$bytes_totales}</td>
+				<!-- <td class="info"> <a href="#" title="View report">View</a> </td> -->
 			</tr> 
 		</table>
 
   </div> <!-- end div box --> 
   
   <div class="box">
-	<p class="title">Job Status Report (last 24 hours)</p>
+	<p class="title">
+	Job Status Report
+	<a href="jobs.php" title="Show last 24 hours jobs status">View report</a>
+	</p>
 	  <img src="{$graph_jobs}" alt="" />
   </div> <!-- end div box -->
   
+  <div class="box">
+	<p class="title">Last used volumes</p>
+	  <table>
+		<tr>
+		  <td class="tbl_header">Volume</td>
+		  <td class="tbl_header">Status</td>
+		  <td class="tbl_header">Job Id</td>
+		</tr>
+		{foreach from=$volume_list item=vol}
+		<tr>
+		  <td>{$vol.Volumename}</td>
+		  <td>{$vol.VolStatus}</td>
+		  <td>{$vol.JobId}</td>
+		</tr>
+		{/foreach}
+	  </table>
+  </div> <!-- end div box -->
+  
+
   {include file="$last_report"} 	
 
 </div> <!-- end div main_right -->