From: Davide Franco <bacula-dev@dflc.ch>
Date: Mon, 6 Dec 2010 12:53:48 +0000 (+0100)
Subject: bacula-web: Changed main layout apparence
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=c52b42e8482edaf7bad146aa6c1c571a34e78703;p=bacula%2Fbacula

bacula-web: Changed main layout apparence
---

diff --git a/gui/bacula-web/style/default.css b/gui/bacula-web/style/default.css
index c0b46ded8d..f7fc759bad 100644
--- a/gui/bacula-web/style/default.css
+++ b/gui/bacula-web/style/default.css
@@ -72,7 +72,7 @@ a:hover { color: #736F6E }
 #main_left {
  position: absolute; 
  left:10px; 
- width: 550px; 
+ width: 500px; 
  border:none; 
  margin-top: 1em; 
  background-color: #FFFFFF;
@@ -80,8 +80,8 @@ a:hover { color: #736F6E }
 
 #main_right {
  position: absolute; 
- left:570px; 
- width: 420px; 
+ left:520px; 
+ width: 500px; 
  border: none; 
  margin-top: 1em;
 }
@@ -135,10 +135,11 @@ a:hover { color: #736F6E }
 }
 .box table tr td.label
 {
- font-weight: bold;
+ /*font-weight: bold;*/
  width: 150px;
  text-align: left;
- padding-left: 3px;
+ padding-left: 15px;
+ padding: 3px;
 }
 .box table tr td.info
 {
diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index 507ef4fd1b..62ed02b226 100644
--- a/gui/bacula-web/templates/index.tpl
+++ b/gui/bacula-web/templates/index.tpl
@@ -18,32 +18,10 @@
 {include file=header.tpl}
 
 <div id="main_left">
-{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">Job Status Report (last 24 hours)</p>
-	  <img src="{$graph_jobs}" alt="" />
-  </div> <!-- end div box -->
-  
-  <!-- Pools and Volumes Status -->
-  <div class="box">
-	<p class="title">Job Status Report (last 24 hours)</p>
-	  <img src="{$graph_pools}" alt="" />
-  </div> <!-- end div box -->
   <!-- General information -->
   <div class="box">
 	<p class="title">General informations</p>
-	<table width="90%">
+	<table>
 	  <tr>
 	    <td class="label">{t}Clients{/t}</td> <td class="info">{$clientes_totales}</td>
 	  </tr>
@@ -58,7 +36,50 @@
 	  </tr>
 	</table>
   </div>
-	
+
+  <!-- Pools and Volumes Status -->
+  <div class="box">
+	<p class="title">Pools and volumes status</p>
+	  <img src="{$graph_pools}" 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"} *}
+		<table>
+			<tr>
+				<td class="label">Failed jobs</td> <td class="info">{$failed_jobs}</td>
+			</tr>
+			<tr>
+				<td class="label">Completed jobs</td> <td class="info">{$completed_jobs}</td>
+			</tr> 
+			<tr>
+				<td class="label">Elapsed time</td> <td class="info">{$elapsed_jobs}</td>
+			</tr>
+			<tr>
+				<td class="label">Transferred Bytes</td> <td class="info">{$bytes_totales}</td>
+			</tr> 
+		</table>
+
+  </div> <!-- end div box --> 
+  
+  <div class="box">
+	<p class="title">Job Status Report (last 24 hours)</p>
+	  <img src="{$graph_jobs}" alt="" />
+  </div> <!-- end div box -->
+  
   {include file="$last_report"} 	
 
 </div> <!-- end div main_right -->
diff --git a/gui/bacula-web/templates/last_run_report.tpl b/gui/bacula-web/templates/last_run_report.tpl
index f7bd6b0b83..d6392b72b7 100644
--- a/gui/bacula-web/templates/last_run_report.tpl
+++ b/gui/bacula-web/templates/last_run_report.tpl
@@ -1,24 +1,5 @@
 <!-- last_run_report.tpl -->
 
-<div class="box">
-	<p class="title">Last 24 hours status</p>
-{* {if $mode == "Lite" && $smarty.get.Full_popup != "yes"} *}
-<table>
- <tr>
- 	<td class="label">Failed jobs</td> <td class="info">{$failed_jobs}</td>
- </tr>
- <tr>
- 	<td class="label">Completed jobs</td> <td class="info">{$completed_jobs}</td>
- </tr> 
- <tr>
- 	<td class="label">Elapsed time</td> <td class="info">{$elapsed_jobs}</td>
- </tr>
- <tr>
- 	<td class="label">Transferred Bytes</td> <td class="info">{$bytes_totales}</td>
- </tr> 
-</table>
-
-</div> <!-- end div box --> 
 <!--
 {* {if $status != 0} *}
 <table>
@@ -121,7 +102,7 @@
 	  </tr>
 	 <tr> <td colspan="2">&nbsp;</td> </tr>
 	 <tr>
- 	   <td class="label">{t}Select a job:{/t}</td>
+ 	   <td class="label"><b>{t}Select a job:{/t}</b></td>
  	   <td align=center>
 	     <input type=hidden name="default" value="1"> 				
 		   <select name=server>