bacula-web: Modified layout for main dashboard

 - Moved Last job status in Reports box
 - Moved Last month links in Reports box
 - Added title to link in Navigation bar (jobs.tpl)

diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index 32b65acca857f8eef6574d73f7d317409ef2dc95..089ad1af41ae0bac3f3f6319cb4c60e72d4a6302 100644 (file)
--- a/gui/bacula-web/templates/index.tpl
+++ b/gui/bacula-web/templates/index.tpl
@@ -38,16 +38,6 @@
          <tr>
                <td class="label">{t}Database size{/t}:</td> <td class="info">{$database_size}</td>
          </tr>
-         <tr>
-               <td colspan=2 align=center>
-                 <a href="javascript:OpenWin('index.php?pop_graph1=yes','600','400')">{t}Last month, bytes transferred{/t}</a>
-               </td>
-         </tr>
-         <tr>
-               <td colspan=2 align=center>
-                 <a href="javascript:OpenWin('index.php?pop.graph2=yes','600','400')">{t}Last month, bytes transferred (pie){/t}</a>
-               </td>
-         </tr>
        </table>
   </div>
        
@@ -59,7 +49,7 @@
          <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}
+       {/if}  
   </div> <!-- end div box -->
 
 </div> <!-- end div main_right -->

diff --git a/gui/bacula-web/templates/jobs.tpl b/gui/bacula-web/templates/jobs.tpl
index c37f94aa49b90caa2b582e955af4ce1bf92b329e..e72fe5616befe408ad8c1aa1d1bbb77142f826af 100644 (file)
--- a/gui/bacula-web/templates/jobs.tpl
+++ b/gui/bacula-web/templates/jobs.tpl
@@ -18,7 +18,7 @@
 {include file=header.tpl}
 
 <div id="nav">
-  <a href="index.php">Dashboard</a> > Jobs list
+  <a href="index.php" title="Back to the dashboard">Dashboard</a> > Jobs list
 </div>
 
 <div id="main_center">

diff --git a/gui/bacula-web/templates/last_run_report.tpl b/gui/bacula-web/templates/last_run_report.tpl
index 3c0f7100c9e9885ba3a2f7de82343fcd4c7ab899..f7bd6b0b837a1cc0de7dcf098e6e16fdd428ba69 100644 (file)
--- a/gui/bacula-web/templates/last_run_report.tpl
+++ b/gui/bacula-web/templates/last_run_report.tpl
@@ -16,12 +16,6 @@
  <tr>
        <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> -->
-               <a href="jobs.php" title="Show last jobs details">Show last jobs status</a>
-       </td>
- </tr>
 </table>
 
 </div> <!-- end div box --> 
@@ -105,10 +99,27 @@
 </div> 
 -->
 <div class="box">
-       <p class="title">Detailled report</p>
+       <p class="title">Reports</p>
  
  <form method="get" action="report.php" target="_blank">
    <table width="100%" cellpadding="0" cellspacing="3" border="0">
+         <tr>
+               <td colspan=2 align=center>
+                       <!-- <a href="javascript:OpenWin('index.php?Full_popup=yes','490','350')">{t}Show details{/t}</a> -->
+                       <a href="jobs.php" title="Show last jobs details">Show last jobs status</a>
+               </td>
+         </tr>   
+         <tr>
+               <td colspan=2 align=center>
+                 <a href="javascript:OpenWin('index.php?pop_graph1=yes','600','400')">{t}Last month, bytes transferred{/t}</a>
+               </td>
+         </tr>
+         <tr>
+               <td colspan=2 align=center>
+                 <a href="javascript:OpenWin('index.php?pop.graph2=yes','600','400')">{t}Last month, bytes transferred (pie){/t}</a>
+               </td>
+         </tr>
+        <tr> <td colspan="2">&nbsp;</td> </tr>
         <tr>
           <td class="label">{t}Select a job:{/t}</td>
           <td align=center>