bacula-web: Moved backup job report html code section into index.tpl

 - Moved from last_run_report.tpl to index.tpl backup job report selection list

diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index bbd7426ee099914b567e7592ffda57537a0ad0ac..7d806f2f1071efe00771d6447d9bb75a9c30dec2 100644 (file)
--- a/gui/bacula-web/templates/index.tpl
+++ b/gui/bacula-web/templates/index.tpl
@@ -125,7 +125,44 @@
                </table>
   </div> <!-- end div box -->   
   
-  {include file="$last_report"}
-</div> <!-- end div main_right -->
+<div class="box">
+       <p class="title">Reports</p>
+ 
+ <form method="post" action="backupjob-report.php">
+   <table width="100%" cellpadding="0" cellspacing="3" border="0">
+         <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"><b>{t}Job report:{/t}</b></td>
+          <td class="info">
+            <input type=hidden name="default" value="1">                               
+                  <select name=backupjob_name>
+                    {*
+                        {if $smarty.get.server != ""}
+                               {html_options values=$smarty.get.server output=$smarty.get.server}
+                        {else}
+                        *}
+                               {html_options values=$jobs_list output=$jobs_list}
+                    {* {/if} *}
+                  </select>
+            <input type=submit value="{t}View{/t}">
+          </td>
+     </tr>
+   </table>
+ </form>
+</div>
+
+{*  {include file="$last_report"}  *}
+
+  </div> <!-- end div main_right -->
 
 {include file="footer.tpl"}

diff --git a/gui/bacula-web/templates/last_run_report.tpl b/gui/bacula-web/templates/last_run_report.tpl
index 940974600be8ecc2671912c2b5b053cfe51ddc91..8389bd69cd9d989f82304f0a6cde60af76c08332 100644 (file)
--- a/gui/bacula-web/templates/last_run_report.tpl
+++ b/gui/bacula-web/templates/last_run_report.tpl
@@ -79,48 +79,7 @@
  {* {/if} *}
 </div> 
 -->
-<div class="box">
-       <p class="title">Reports</p>
- 
- <form method="post" action="backupjob-report.php">
-   <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"><b>{t}Select a job:{/t}</b></td>
-          <td class="info">
-            <input type=hidden name="default" value="1">                               
-                  <select name=backupjob_name>
-                    {if $smarty.get.server != ""}
-                               {html_options values=$smarty.get.server output=$smarty.get.server}
-                        {else}
-                           {html_options values=$total_name_jobs output=$total_name_jobs}
-                    {/if}
-                  </select>
-            <input type=submit value="{t}go{/t}">
-          </td>
-     </tr>
-   </table>
- </form>
-</div>
 <!--
 {* {else if #mode# == "Full" || $smarty.get.Full_popup == "yes"} *}
 <table>