From c7da4fe77d02eadcbd72d8291400fa7f1757001b Mon Sep 17 00:00:00 2001
From: Davide Franco <bacula-dev@dflc.ch>
Date: Mon, 29 Nov 2010 15:37:44 +0100
Subject: [PATCH] bacula-web: Improved html and css code

---
 gui/bacula-web/index.php                     |  2 +-
 gui/bacula-web/style/default.css             | 11 ++++-
 gui/bacula-web/templates/index.tpl           | 10 ++---
 gui/bacula-web/templates/last_run_report.tpl | 44 +++++---------------
 gui/bacula-web/templates/volumes.tpl         |  2 +-
 5 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/gui/bacula-web/index.php b/gui/bacula-web/index.php
index cab265a5e8..e3591c2450 100644
--- a/gui/bacula-web/index.php
+++ b/gui/bacula-web/index.php
@@ -153,7 +153,7 @@ if ( $mode == "Lite" && $_GET['Full_popup'] == "yes" ) {
         switch( $dbSql->driver )
 		{
 			case 'mysql':
-				$query  = "SELECT JobId, Name, EndTime, JobStatus";
+				$query  = "SELECT JobId, Name, EndTime, JobStatus ";
 				$query .= "FROM Job ";
 				$query .= "WHERE EndTime <= NOW() and UNIX_TIMESTAMP(EndTime) > UNIX_TIMESTAMP(NOW())-86400 and JobStatus!='T'";
 			break;
diff --git a/gui/bacula-web/style/default.css b/gui/bacula-web/style/default.css
index 0462f3f64e..0a39e19472 100644
--- a/gui/bacula-web/style/default.css
+++ b/gui/bacula-web/style/default.css
@@ -93,8 +93,8 @@ body{
 
 .box table
 {
- margin-left: 5px;
- margin-right: 5px;
+ width: 100%;
+ margin: 0px;
 }
 .box table tr td
 {
@@ -105,6 +105,13 @@ body{
  font-weight: bold;
  width: 150px;
  text-align: left;
+ padding-left: 3px;
+}
+.box table tr td.info
+{
+ text-align:right; 
+ padding-right: 8em;
+ font-weight: bold;
 }
 
 table {
diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index 9f70c4ab76..38bcd304e6 100644
--- a/gui/bacula-web/templates/index.tpl
+++ b/gui/bacula-web/templates/index.tpl
@@ -25,18 +25,18 @@
   <!-- General information -->
   <div class="box">
 	<p class="title">General informations</p>
-	<table>
+	<table width="90%">
 	  <tr>
-	    <td class="label">{t}Clients{/t}</td> <td>{$clientes_totales}</td>
+	    <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>{$bytes_stored}</td>
+		<td class="label">{t}Total bytes stored{/t}:</td> <td class="info">{$bytes_stored}</td>
 	  </tr>
 	  <tr>
-		<td class="label">{t}Total files:{/t}</td> <td>{$files_totales}</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>{$database_size}</td>
+		<td class="label">{t}Database size{/t}:</td> <td class="info">{$database_size}</td>
 	  </tr>
 	  <tr>
 		<td colspan=2 align=center>
diff --git a/gui/bacula-web/templates/last_run_report.tpl b/gui/bacula-web/templates/last_run_report.tpl
index 6d0c5c6758..bec4bb180a 100644
--- a/gui/bacula-web/templates/last_run_report.tpl
+++ b/gui/bacula-web/templates/last_run_report.tpl
@@ -10,50 +10,28 @@
  	</td>
  </tr>
 -->
-{if $mode == "Lite" && $smarty.get.Full_popup != "yes"}
-<table width="100%">
+{* {if $mode == "Lite" && $smarty.get.Full_popup != "yes"} *}
+<table>
  <tr>
- 	<td>
- 		<b>{t}Errors:{/t}</b>
- 	</td>
- 	<td style="font-size: 13px; color: blue">
- 		{$status}
- 	</td>
+ 	<td class="label">Failed jobs</td> <td class="info">{$jobserror}</td>
  </tr>
-
  <tr>
- 	<td>
- 		<b>{t}Terminated Jobs:{/t}</b>
- 	</td>
- 	<td style="font-size: 13px; color: blue">
- 		{$total_jobs}
- 	</td>
+ 	<td class="label">Completed jobs</td> <td class="info">{$total_jobs}</td>
  </tr> 
  <tr>
- 	<td>
- 		<b>{t}Total time spent to do backup:{/t}</b>
- 	</td> 
- 	<td style="font-size: 13px; color: blue">
- 		{$TotalElapsed}
- 	</td>
+ 	<td class="label">Backup elapsed time</td> <td class="info">{$totalElapsed}</td>
  </tr>
- 
  <tr>
- 	<td>
- 		<b>{t}Bytes transferred last 24h{/t}</b>
- 	</td> 
- 	<td style="font-size: 13px; color: blue">
- 		{$bytes_totales}
- 	</td>
+ 	<td class="label">Transferred bytes</td> <td class="info">{$bytes_totales}</td>
  </tr> 
  <tr>
  	<td colspan=2 align=center>
  		<a href="javascript:OpenWin('index.php?Full_popup=yes','490','350')">{t}Show details{/t}</a>
  	</td>
  </tr>
- </table>
+</table>
  
- {if $status != 0}
+{* {if $status != 0} *}
 <table>
 	<tr>
  		<td colspan=2>
@@ -128,7 +106,7 @@
  		</td>
  	</tr>
 </table>	
- {/if}
+ {* {/if} *}
 </div> <!-- end div box --> 
  
 <div class="box">
@@ -159,7 +137,7 @@
      </tr>
    </table>
  </form>
-{else if #mode# == "Full" || $smarty.get.Full_popup == "yes"}
+{* {else if #mode# == "Full" || $smarty.get.Full_popup == "yes"} *}
 <table>
 	<tr class="tbl_header1">
  		<td><b>{t}Elapsed time{/t}</b></td>
@@ -196,7 +174,7 @@
  	</td>
  </tr>
 </table>
-{/if}
+{* {/if} *}
 
 </div>
 <!-- end last_run_report.tpl -->
\ No newline at end of file
diff --git a/gui/bacula-web/templates/volumes.tpl b/gui/bacula-web/templates/volumes.tpl
index 2b4a1298e8..7e79c8ee35 100644
--- a/gui/bacula-web/templates/volumes.tpl
+++ b/gui/bacula-web/templates/volumes.tpl
@@ -3,7 +3,7 @@
 <div class="box">
   <p class="title">Pools</p>
 	
-  <table width="100%">
+  <table>
 	{foreach from=$pools item=pool key=pool_name}
 	<tr>
 		<th colspan="6" style="font-size: 10pt; text-align: center; background-color: #E0C8E5; color: black; padding: 3px;">
-- 
2.39.5