bacula-web: Moved images folder into style directory

diff --git a/gui/bacula-web/images/backlast.gif b/gui/bacula-web/images/backlast.gif
deleted file mode 100644 (file)
index 465758a..0000000
Binary files a/gui/bacula-web/images/backlast.gif and /dev/null differ

diff --git a/gui/bacula-web/images/backlastred.gif b/gui/bacula-web/images/backlastred.gif
deleted file mode 100644 (file)
index 8c72865..0000000
Binary files a/gui/bacula-web/images/backlastred.gif and /dev/null differ

diff --git a/gui/bacula-web/images/bg1.png b/gui/bacula-web/images/bg1.png
deleted file mode 100644 (file)
index 3916fc0..0000000
Binary files a/gui/bacula-web/images/bg1.png and /dev/null differ

diff --git a/gui/bacula-web/images/bg2.png b/gui/bacula-web/images/bg2.png
deleted file mode 100644 (file)
index a9aed56..0000000
Binary files a/gui/bacula-web/images/bg2.png and /dev/null differ

diff --git a/gui/bacula-web/images/bg3.png b/gui/bacula-web/images/bg3.png
deleted file mode 100644 (file)
index 4b0d250..0000000
Binary files a/gui/bacula-web/images/bg3.png and /dev/null differ

diff --git a/gui/bacula-web/images/bg4.png b/gui/bacula-web/images/bg4.png
deleted file mode 100644 (file)
index de8462a..0000000
Binary files a/gui/bacula-web/images/bg4.png and /dev/null differ

diff --git a/gui/bacula-web/images/bg5.png b/gui/bacula-web/images/bg5.png
deleted file mode 100644 (file)
index 2255f36..0000000
Binary files a/gui/bacula-web/images/bg5.png and /dev/null differ

diff --git a/gui/bacula-web/images/bg6.png b/gui/bacula-web/images/bg6.png
deleted file mode 100644 (file)
index e797016..0000000
Binary files a/gui/bacula-web/images/bg6.png and /dev/null differ

diff --git a/gui/bacula-web/images/bg7.gif b/gui/bacula-web/images/bg7.gif
deleted file mode 100644 (file)
index b77204f..0000000
Binary files a/gui/bacula-web/images/bg7.gif and /dev/null differ

diff --git a/gui/bacula-web/images/bg8.png b/gui/bacula-web/images/bg8.png
deleted file mode 100644 (file)
index 2bf6dd8..0000000
Binary files a/gui/bacula-web/images/bg8.png and /dev/null differ

diff --git a/gui/bacula-web/images/empty.png b/gui/bacula-web/images/empty.png
deleted file mode 100644 (file)
index d067af4..0000000
Binary files a/gui/bacula-web/images/empty.png and /dev/null differ

diff --git a/gui/bacula-web/images/end2.png b/gui/bacula-web/images/end2.png
deleted file mode 100644 (file)
index 9c1c131..0000000
Binary files a/gui/bacula-web/images/end2.png and /dev/null differ

diff --git a/gui/bacula-web/images/end4.png b/gui/bacula-web/images/end4.png
deleted file mode 100644 (file)
index 96f0293..0000000
Binary files a/gui/bacula-web/images/end4.png and /dev/null differ

diff --git a/gui/bacula-web/images/refresh.gif b/gui/bacula-web/images/refresh.gif
deleted file mode 100644 (file)
index f6961c5..0000000
Binary files a/gui/bacula-web/images/refresh.gif and /dev/null differ

diff --git a/gui/bacula-web/images/s_error.gif b/gui/bacula-web/images/s_error.gif
deleted file mode 100644 (file)
index 5ddcd0e..0000000
Binary files a/gui/bacula-web/images/s_error.gif and /dev/null differ

diff --git a/gui/bacula-web/images/s_ok.gif b/gui/bacula-web/images/s_ok.gif
deleted file mode 100644 (file)
index 18116d9..0000000
Binary files a/gui/bacula-web/images/s_ok.gif and /dev/null differ

diff --git a/gui/bacula-web/style/default.css b/gui/bacula-web/style/default.css
index 7b0bedf7c23b9f4ca129d3a49cf0f2b3cd064321..a3a3eb704b779c12561137d5f2be53e27086c3b4 100644 (file)
--- a/gui/bacula-web/style/default.css
+++ b/gui/bacula-web/style/default.css
@@ -107,7 +107,7 @@ table {
 
 .tbl_vol_header {
  text-align: center; 
- background-image: url('../images/bg5.png'); 
+ background-image: url('../style/images/bg5.png'); 
 }
 
 a:link { color: #0000c0 }
@@ -143,7 +143,7 @@ td,input,select {
  border-left-width: 1px; 
  border-top-width: 1px; 
  border-right-width: 0px;
- background-image:url('../images/bg5.png');
+ background-image:url('../style/images/bg5.png');
 }
 .tbl_pool_inter_2 { 
  background-color: #D4D4D9; 

diff --git a/gui/bacula-web/style/images/backlast.gif b/gui/bacula-web/style/images/backlast.gif
new file mode 100644 (file)
index 0000000..465758a
Binary files /dev/null and b/gui/bacula-web/style/images/backlast.gif differ

diff --git a/gui/bacula-web/style/images/backlastred.gif b/gui/bacula-web/style/images/backlastred.gif
new file mode 100644 (file)
index 0000000..8c72865
Binary files /dev/null and b/gui/bacula-web/style/images/backlastred.gif differ

diff --git a/gui/bacula-web/style/images/bg1.png b/gui/bacula-web/style/images/bg1.png
new file mode 100644 (file)
index 0000000..3916fc0
Binary files /dev/null and b/gui/bacula-web/style/images/bg1.png differ

diff --git a/gui/bacula-web/style/images/bg2.png b/gui/bacula-web/style/images/bg2.png
new file mode 100644 (file)
index 0000000..a9aed56
Binary files /dev/null and b/gui/bacula-web/style/images/bg2.png differ

diff --git a/gui/bacula-web/style/images/bg3.png b/gui/bacula-web/style/images/bg3.png
new file mode 100644 (file)
index 0000000..4b0d250
Binary files /dev/null and b/gui/bacula-web/style/images/bg3.png differ

diff --git a/gui/bacula-web/style/images/bg4.png b/gui/bacula-web/style/images/bg4.png
new file mode 100644 (file)
index 0000000..de8462a
Binary files /dev/null and b/gui/bacula-web/style/images/bg4.png differ

diff --git a/gui/bacula-web/style/images/bg5.png b/gui/bacula-web/style/images/bg5.png
new file mode 100644 (file)
index 0000000..2255f36
Binary files /dev/null and b/gui/bacula-web/style/images/bg5.png differ

diff --git a/gui/bacula-web/style/images/bg6.png b/gui/bacula-web/style/images/bg6.png
new file mode 100644 (file)
index 0000000..e797016
Binary files /dev/null and b/gui/bacula-web/style/images/bg6.png differ

diff --git a/gui/bacula-web/style/images/bg7.gif b/gui/bacula-web/style/images/bg7.gif
new file mode 100644 (file)
index 0000000..b77204f
Binary files /dev/null and b/gui/bacula-web/style/images/bg7.gif differ

diff --git a/gui/bacula-web/style/images/bg8.png b/gui/bacula-web/style/images/bg8.png
new file mode 100644 (file)
index 0000000..2bf6dd8
Binary files /dev/null and b/gui/bacula-web/style/images/bg8.png differ

diff --git a/gui/bacula-web/style/images/empty.png b/gui/bacula-web/style/images/empty.png
new file mode 100644 (file)
index 0000000..d067af4
Binary files /dev/null and b/gui/bacula-web/style/images/empty.png differ

diff --git a/gui/bacula-web/style/images/end2.png b/gui/bacula-web/style/images/end2.png
new file mode 100644 (file)
index 0000000..9c1c131
Binary files /dev/null and b/gui/bacula-web/style/images/end2.png differ

diff --git a/gui/bacula-web/style/images/end4.png b/gui/bacula-web/style/images/end4.png
new file mode 100644 (file)
index 0000000..96f0293
Binary files /dev/null and b/gui/bacula-web/style/images/end4.png differ

diff --git a/gui/bacula-web/style/images/refresh.gif b/gui/bacula-web/style/images/refresh.gif
new file mode 100644 (file)
index 0000000..f6961c5
Binary files /dev/null and b/gui/bacula-web/style/images/refresh.gif differ

diff --git a/gui/bacula-web/style/images/s_error.gif b/gui/bacula-web/style/images/s_error.gif
new file mode 100644 (file)
index 0000000..5ddcd0e
Binary files /dev/null and b/gui/bacula-web/style/images/s_error.gif differ

diff --git a/gui/bacula-web/style/images/s_ok.gif b/gui/bacula-web/style/images/s_ok.gif
new file mode 100644 (file)
index 0000000..18116d9
Binary files /dev/null and b/gui/bacula-web/style/images/s_ok.gif differ

diff --git a/gui/bacula-web/templates/generaldata.tpl b/gui/bacula-web/templates/generaldata.tpl
index 348d488ad3b5286c83164a00a6768204bb25b255..e33f0c86d6d06ff25f491969d1c7f10368d12ae2 100644 (file)
--- a/gui/bacula-web/templates/generaldata.tpl
+++ b/gui/bacula-web/templates/generaldata.tpl
@@ -3,7 +3,7 @@
 <!--
 <table class=genmed cellspacing="0" cellpadding="0" border=1 align="center" width=100%>
 <tr>
-  <td align=center class=tbl_medium background="images/bg3.png">
+  <td align=center class=tbl_medium background="style/images/bg3.png">
        General information
   </td>
 </tr>

diff --git a/gui/bacula-web/templates/header.tpl b/gui/bacula-web/templates/header.tpl
index 327f37837fff2bd1b825bdcb310835fa8ab296e5..be315f936b8c3e203eece684da0e849791d0e29a 100644 (file)
--- a/gui/bacula-web/templates/header.tpl
+++ b/gui/bacula-web/templates/header.tpl
@@ -22,7 +22,7 @@
 
        {if $dbs ne ""}
                <form method=post action=index.php>
-               <td background="{#root#}/images/bg2.png" align="right" valign="top">
+               <td background="{#root#}style/images/bg2.png" align="right" valign="top">
                {t}Select{/t}: 
                <select name=sel_database style="font-family:verdana;font-size: 10px;color: white; background-color:#666;" onchange=submit()>
                {html_options values=$dbs output=$dbs selected=$dbs_now}

diff --git a/gui/bacula-web/templates/last_run_report.tpl b/gui/bacula-web/templates/last_run_report.tpl
index 7c58f5c021cd427c5e145ef51700613c7f126a5e..4081d91f4609f7f449a2fc58b68020b6562d5c47 100644 (file)
--- a/gui/bacula-web/templates/last_run_report.tpl
+++ b/gui/bacula-web/templates/last_run_report.tpl
@@ -3,9 +3,9 @@
 <div class="box">
        <p class="title">Last 24 hours status</p>
 <!--   
-<table width=100% 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>
+<table width=100% align=center {if !$status }background="style/images/backlast.gif"{else}background="style/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>
+       <td colspan=2 align=center style="font-size: 12px; font-weight: bold; background-repeat: repeat" background="style/images/bg6.png" height=25>
                {t}Status from last 24h{/t}
        </td>
  </tr>
@@ -64,10 +64,10 @@
                                        </td>
                                </tr>
                                <tr>
-                                       <td background="images/bg6.png"><b>JobId&nbsp;</b></td>
-                                       <td background="images/bg6.png"><b>{t}Name{/t}</b></td>
-                                       <td background="images/bg6.png"><b>{t}EndTime{/t}</b></td>
-                                       <td background="images/bg6.png"><b>{t}JobStatus{/t}</b></td>
+                                       <td background="style/images/bg6.png"><b>JobId&nbsp;</b></td>
+                                       <td background="style/images/bg6.png"><b>{t}Name{/t}</b></td>
+                                       <td background="style/images/bg6.png"><b>{t}EndTime{/t}</b></td>
+                                       <td background="style/images/bg6.png"><b>{t}JobStatus{/t}</b></td>
                                </tr>
                                {section name=row loop=$errors_array} 
                                <tr {* bgcolor=#{cycle values="E6E6F5,E1E5E0"} *}>
@@ -142,7 +142,7 @@
 
                <table width="100%" cellpadding="0" cellspacing="3" border="0">
                        <tr bgcolor=white>
-                               <td colspan="3" style="text-align: center; background-image: url(images/bg1.png); font-size: 12px; font-weight: bold;">
+                               <td colspan="3" style="text-align: center; background-image: url('style/images/bg1.png'); font-size: 12px; font-weight: bold;">
                                Detailed report
                                </td>
                        </tr>
@@ -188,9 +188,9 @@
                        {/if}
                        {if $smarty.section.row.last == TRUE}
                        {if $clients[job][row] eq "T"}
-                               <img src={#root#}/images/s_ok.gif>
+                               <img src={#root#}/style/images/s_ok.gif>
                        {else}
-                               <img src={#root#}/images/s_error.gif>
+                               <img src={#root#}/style/images/s_error.gif>
                        {/if}
                        {else}
                                {$clients[job][row]}

diff --git a/gui/bacula-web/templates/report.tpl b/gui/bacula-web/templates/report.tpl
index a592ea1f4e94b058c0ef04da72c2574b14ecdd8a..681b840925dc03ed3c1fc4515f414251c75fa13a 100644 (file)
--- a/gui/bacula-web/templates/report.tpl
+++ b/gui/bacula-web/templates/report.tpl
@@ -65,12 +65,12 @@
                        <td>  
                                <table width=100% border=0 class=genmed cellpadding=0 cellspacing=2>
                                <tr class=titulo2>
-                                       <td style="background-image: url('images/bg7.gif'); height: 25px;">{t}JobID{/t}</td>
-                                       <td style="background-image: url('images/bg7.gif'); height: 25px;">{t}Date{/t}</td>
-                                       <td style="background-image: url('images/bg7.gif'); height: 25px;">{t}Elapsed{/t}</td>
-                                       <td style="background-image: url('images/bg7.gif'); height: 25px;">{t}Level{/t}</td>
-                                       <td style="background-image: url('images/bg7.gif'); height: 25px;">{t}Bytes{/t}</td>
-                                       <td style="background-image: url('images/bg7.gif'); height: 25px;">{t}Status{/t}</td>
+                                       <td style="background-image: url('style/images/bg7.gif'); height: 25px;">{t}JobID{/t}</td>
+                                       <td style="background-image: url('style/images/bg7.gif'); height: 25px;">{t}Date{/t}</td>
+                                       <td style="background-image: url('style/images/bg7.gif'); height: 25px;">{t}Elapsed{/t}</td>
+                                       <td style="background-image: url('style/images/bg7.gif'); height: 25px;">{t}Level{/t}</td>
+                                       <td style="background-image: url('style/images/bg7.gif'); height: 25px;">{t}Bytes{/t}</td>
+                                       <td style="background-image: url('style/images/bg7.gif'); height: 25px;">{t}Status{/t}</td>
                                </tr>
                                {section name=job loop=$jobs}
                                <tr class={cycle values="table1,table2"}>
@@ -81,9 +81,9 @@
                                        <td align=right>{$jobs[job].JobBytes}</td>
                                        <td align=center width=1%>
                                                {if $jobs[job].JobStatus eq "T"}
-                                                       <img src={#root#}/images/s_ok.gif>
+                                                       <img src=style/images/s_ok.gif>
                                                {else}
-                                                       <img src={#root#}/images/s_error.gif>
+                                                       <img src=style/images/s_error.gif>
                                                {/if}
                                        </td>
                                </tr>

diff --git a/gui/bacula-web/templates/report_select.tpl b/gui/bacula-web/templates/report_select.tpl
index ff9177f066e16ea69ff8f4ab678a7fa97443e040..fce2dfd6d8e3ecf09fd1796878c36ddb0a21b905 100644 (file)
--- a/gui/bacula-web/templates/report_select.tpl
+++ b/gui/bacula-web/templates/report_select.tpl
@@ -1,7 +1,7 @@
 <form method=get action=report.php {if !isset($smarty.get.default) }target=_blank{/if}>
 <table width=100% border=0>
  <tr>
-       <td colspan="3" style="text-align: center; background-image: url('images/bg8.png');" class="titulo">
+       <td colspan="3" style="text-align: center; background-image: url('style/images/bg8.png');" class="titulo">
        {t}SELECT NEW REPORT{/t}
  </td></tr>
  <tr class=table1><td align=left>

diff --git a/gui/bacula-web/templates/volumes.tpl b/gui/bacula-web/templates/volumes.tpl
index 5779845c40b77e1825b33c7983de9cc89aeb3209..43bbb619d13ea15307a0e09480a69336914c9c9a 100644 (file)
--- a/gui/bacula-web/templates/volumes.tpl
+++ b/gui/bacula-web/templates/volumes.tpl
@@ -5,8 +5,8 @@
 <!--
 <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>
-        <td class=tbl_header2 background="images/end4.png"><img src="images/empty.png"></td>
+        <td class=tbl_header2 background="style/images/bg4.png"><b>Pools</b></td>
+        <td class=tbl_header2 background="style/images/end4.png"><img src="style/images/empty.png"></td>
 </tr>
 -->
 <table border=0 width=100% class=code cellspacing=0 cellpadding=0>
@@ -17,12 +17,12 @@
                </th>
        </tr>
        <tr style="text-align: center;">
-               <td style="background-image: url(images/bg5.png);" class=tbl_pool_inter_1>Name</td>
-               <td style="background-image: url(images/bg5.png);" class=tbl_pool_inter_1>{t}Bytes{/t}</td>
-               <td style="background-image: url(images/bg5.png);" class=tbl_pool_inter_1>{t}Media Type{/t}</td>
-               <td style="background-image: url(images/bg5.png);" class=tbl_pool_inter_1>{t}Expire{/t}</td>
-               <td style="background-image: url(images/bg5.png);" class=tbl_pool_inter_1>{t}Last written{/t}</td>
-               <td style="background-image: url(images/bg5.png);" class=tbl_pool_inter_1>{t}Status{/t}</td>
+               <td style="background-image: url(style/images/bg5.png);" class=tbl_pool_inter_1>Name</td>
+               <td style="background-image: url(style/images/bg5.png);" class=tbl_pool_inter_1>{t}Bytes{/t}</td>
+               <td style="background-image: url(style/images/bg5.png);" class=tbl_pool_inter_1>{t}Media Type{/t}</td>
+               <td style="background-image: url(style/images/bg5.png);" class=tbl_pool_inter_1>{t}Expire{/t}</td>
+               <td style="background-image: url(style/images/bg5.png);" class=tbl_pool_inter_1>{t}Last written{/t}</td>
+               <td style="background-image: url(style/images/bg5.png);" class=tbl_pool_inter_1>{t}Status{/t}</td>
        </tr>
        {foreach from=$pool item=volume}
                <tr style="text-align: center;">