bacula-web: Fixed some html and css issue

diff --git a/gui/bacula-web/stats.php b/gui/bacula-web/stats.php
index 51baaa5cf32f64f731e3d5ac3ad8c7363c075de2..4ab1c2ab7c226e3176b32ce63de653fcaa2694f6 100644 (file)
--- a/gui/bacula-web/stats.php
+++ b/gui/bacula-web/stats.php
@@ -58,6 +58,4 @@ else if (!isset($_GET['ylabel']))
        $graph->BCreate ($_GET['server'],$_GET['tipo_dato'],$_GET['title'],$_GET['modo_graph'],$_GET['xlabel']);
 else
        $graph->BCreate ($_GET['server'],$_GET['tipo_dato'],$_GET['title'],$_GET['modo_graph'],$_GET['xlabel'],$_GET['ylabel']);
-
-
 ?>

diff --git a/gui/bacula-web/style/default.css b/gui/bacula-web/style/default.css
index e5616fa0f01713e90d0fa343da346b4393b5ff37..a50c5b2b7e94b9a4527555795515937f14b261ff 100644 (file)
--- a/gui/bacula-web/style/default.css
+++ b/gui/bacula-web/style/default.css
@@ -87,7 +87,10 @@ td,input,select {
  background-color: #FAFAFA; 
  border: #D1D7DC; 
  border-style: solid;
- border-left-width: 1px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px
+ border-left-width: 1px; 
+ border-top-width: 1px; 
+ border-right-width: 1px; 
+ border-bottom-width: 1px
 }
 .notas { 
  font-size : 13px; 

diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index 2e918da06b04cd8905ceda9a03e02a5b02adac60..7ac3027b395d8f74ab166108ec479b415fbd4145 100644 (file)
--- a/gui/bacula-web/templates/index.tpl
+++ b/gui/bacula-web/templates/index.tpl
@@ -19,27 +19,32 @@
 
 {config_load file=bacula.conf}
 
-<table width=1000px border=0 cellspacing=5 class=back>
-       <tr><td valign=top width=60%> {include file=generaldata.tpl} <br /> {include file=volumes.tpl}</td>
-               <td valign=top width=40% bgcolor=#DDDFF9 style="border-style: solid; border-color: grey">
-                       {if !#IndexReport#}
-                               {include file=last_run_report.tpl}      
+<table width=1000px border=0 cellspacing=5 class="back">
+  <tr>
+       <td valign=top width=60%> 
+         {include file=generaldata.tpl} 
+         <br /> 
+         {include file=volumes.tpl}
+       </td>
+       <td valign=top width=40% bgcolor=#DDDFF9 style="border-style: solid; border-color: grey">
+         {if !#IndexReport#}
+           {include file=last_run_report.tpl}  
+         {else}
+               {include file=report_select.tpl}
+         {/if}
+         <table class=genmed cellspacing="1" cellpadding="3" border=0 align="center">
+               <tr>
+                 <td>
+                       {if $server==""}
+                         <img src="stats.php?server={$server}&tipo_dato=69&title=General%20report&modo_graph=bars&sizex=420&sizey=250&MBottom=20&legend=1" />
                        {else}
-                               {include file=report_select.tpl}
+                         <img src="stats.php?server={$server}&tipo_dato=3&title={$server}&modo_graph=bars" />
                        {/if}
-                       <table class=genmed cellspacing="1" cellpadding="3" border=0 align="center">
-                               <tr><td>
-                                               {if $server==""}
-                                                       <img src=stats.php?server={$server}&tipo_dato=69&title={t}General%20report{/t}&modo_graph=bars&sizex=420&sizey=250&MBottom=20&legend=1>
-                                               {else}
-                                                       <img src=stats.php?server={$server}&tipo_dato=3&title={$server}&modo_graph=bars>
-                                               {/if}
-                               </td></tr>
-                       </table>
-               </td>
-       </tr>
-
+                 </td>
+               </tr>
+         </table>
+       </td>
+  </tr>
 </table>
 
-
 {include file="footer.tpl"}
\ No newline at end of file

diff --git a/gui/bacula-web/templates/last_run_report.tpl b/gui/bacula-web/templates/last_run_report.tpl
index 350b537e6b99fb52985abc62fe1ebcbe83ccfcc0..80096f3aa4e9fe72468c7f255223d0296b32cf2b 100644 (file)
--- a/gui/bacula-web/templates/last_run_report.tpl
+++ b/gui/bacula-web/templates/last_run_report.tpl
@@ -1,3 +1,5 @@
+<!-- last_run_report.tpl -->
+
 <table width=90% align=center {if !$status }background="images/backlast.gif"{else}background="images/backlastred.gif" {/if} style="background-repeat:no-repeat" height=178px border=0 cellspacing=0 cellpadding=0>
  <tr>
        <td colspan=2 align=center style="font-size: 12px; font-weight: bold; background-repeat: repeat" background="images/bg6.png" height=25>
@@ -122,10 +124,12 @@
  
  <tr>
        <td align=right colspan=2 valign=bottom>
-               <table widh=100% cellpadding=0 cellspacing=3 border=0>
+               <form method="get" action="report.php" target="_blank">
+               <table width="100%" cellpadding="0" cellspacing="3" border="1">
                        <tr bgcolor=white>
-                               <td align=right colspan=3 background="images/bg1.png" style="font-size: 12px; font-weight: bold;">
-                               <i>{t}Detailed report{/t}</i>
+                               <!-- <td align=right colspan=3 background="images/bg1.png" style="font-size: 12px; font-weight: bold;"> -->
+                               <td colspan="3" style="text-align: center; background-image: url(images/bg1.png); font-size: 12px; font-weight: bold;">
+                               Detailed report
                                </td>
                        </tr>
                        
@@ -133,10 +137,9 @@
                                <td align=left>
                                        {t}Select a job:{/t}
                                </td>                   
-                               <form method=get action="report.php" target="_blank">
-                               <input type=hidden name="default" value="1">
                                <td align=right>
-                                       <select name=server>
+                                       <input type=hidden name="default" value="1">                            
+                                       <select name=server>
                                                {if $smarty.get.server!=""}
                                                        {html_options values=$smarty.get.server output=$smarty.get.server}
                                                {else}
@@ -147,9 +150,10 @@
                                <td>
                                        <input type=submit value="{t}go{/t}">
                                </td>
-                               </form>
+                               
                        </tr>
                </table>
+               </form>
        </td>
  </tr>
 {else if #mode# == "Full" || $smarty.get.Full_popup == "yes"}
@@ -192,4 +196,6 @@
        </td>
  </tr>
 {/if}
-</table>
\ No newline at end of file
+</table>
+
+<!-- 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 c99b02083fbd79b0a6d3025f0d9bae5e02f6f420..2d1610cf693db752fd502a6fd6c5ade45bc761e5 100644 (file)
--- a/gui/bacula-web/templates/volumes.tpl
+++ b/gui/bacula-web/templates/volumes.tpl
@@ -1,4 +1,4 @@
-{* Design of table of pools *}
+<!-- volumes.tpl -->
 <table border=0 width=100% class=code cellspacing=0 cellpadding=0>
 <tr align=center width=100%>
         <td class=tbl_header2 background="images/bg4.png"><b>Pools</b></td>
@@ -31,8 +31,16 @@
                                         <td>{$current3.0}</td>
                                         <td>{$current3.1|fsize_format|default:0}</td>
                                         <td>{$current3.4}</td>
-                                        <td {popup text="$current3.6}">{if $current3.6|date_format:"%Y" <= "1979"}--{else}{$current3.6|date_format:"%Y/%m/%d"}{/if}</td>
-                                        <td {popup text="$current3.5}">{if $current3.5 == "0000-00-00 00:00:00"}--{else}{$current3.5|date_format:"%Y/%m/%d"}{/if}</td>
+                                        <td {popup text="$current3.6}">
+                                                                                       {if $current3.6|date_format:"%Y" <= "1979"}--
+                                                                                       {else}{$current3.6|date_format:"%Y/%m/%d"}
+                                                                                       {/if}
+                                                                               </td>
+                                        <td {popup text="$current3.5}">
+                                                                                       {if $current3.5 == "0000-00-00 00:00:00"}--
+                                                                                       {else}{$current3.5|date_format:"%Y/%m/%d"}
+                                                                                       {/if}
+                                                                               </td>
                                         <td>
                                                 <font color=
                                                 {if $current3.2 == "Error"}
@@ -56,3 +64,4 @@
 {/foreach}
 </table>
 </td></tr></table>
+<!-- End volumes.tpl -->