From c748d507cee56f797fe261bb8f15ec18730faa01 Mon Sep 17 00:00:00 2001
From: Davide Franco <bacula-dev@dflc.ch>
Date: Mon, 14 Mar 2011 18:51:54 +0100
Subject: [PATCH] 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
---
 gui/bacula-web/templates/index.tpl           | 41 +++++++++++++++++++-
 gui/bacula-web/templates/last_run_report.tpl | 41 --------------------
 2 files changed, 39 insertions(+), 43 deletions(-)

diff --git a/gui/bacula-web/templates/index.tpl b/gui/bacula-web/templates/index.tpl
index bbd7426ee0..7d806f2f10 100644
--- 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 940974600b..8389bd69cd 100644
--- 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>
-- 
2.39.5