bacula-web: Replaced Get_human_file_size() function by Utils::Get_Human_Size

[bacula/bacula] / gui / bweb / tpl / graph.tpl

diff --git a/gui/bweb/tpl/graph.tpl b/gui/bweb/tpl/graph.tpl
index 493ac998088576b62210de7b4d4d82c48a10a58f..d8d2aee5ae7a920a72b4eba7bdcd074098c7fe5c 100644 (file)
--- a/gui/bweb/tpl/graph.tpl
+++ b/gui/bweb/tpl/graph.tpl
@@ -15,7 +15,8 @@
   <td valign='top'>
     <h2>__Level__</h2>
     <select name='level' class='formulaire'>
-      <option id='level_Any' value='Any'>__Any__</option>
+      <option id='level_Any' title='__Any level (grouped)__' value='Any'>__Any__</option>
+      <option id='level_All' title='__All levels (separated)__' value='All'>__All__</option>
       <option id='level_F' value='F'>__Full__</option>
       <option id='level_D' value='D'>__Differential__</option>
       <option id='level_I' value='I'>__Incremental__</option>
@@ -23,10 +24,10 @@
   </td><td valign='top'>
     <h2>__Status__</h2>
     <select name='status' class='formulaire'>
-      <option id='status_Any' value='Any'>__Any__</option>
       <option id='status_T'   value='T'>__Ok__</option>
       <option id='status_f'   value='f'>__Error__</option>
       <option id='status_A'   value='A'>__Canceled__</option>
+      <option id='status_Any' value='Any'>__Any__</option>
     </select>   
   </td>
 </tr>
@@ -36,7 +37,7 @@
     <select name='age' class='formulaire'>
       <option id='age_604800'   value='604800'>__This week__</option>
       <option id='age_2678400'  value='2678400'>__Last 30 days__</option>
-      <option id='age_15552000' value='15552000'>__Last 6 month__</option>
+      <option id='age_15552000' value='15552000'>__Last 6 months__</option>
     </select>     
   </td>
   <td  valign='top'>
@@ -65,6 +66,18 @@
     </select>
   </td>
 </tr>
+<TMPL_IF db_client_groups>
+<tr>
+  <td valign='top'>
+    <h2>__Groups__</h2>
+    <select name='client_group' size='10' class='formulaire' multiple>
+<TMPL_LOOP db_client_groups>
+        <option id= 'group_<TMPL_VAR name>'><TMPL_VAR name></option>
+</TMPL_LOOP>
+    </select>
+  </td>
+</tr>
+</TMPL_IF>
 <tr>
   <td> <h2> __Type__ </h2> 
  <select name='graph' class='formulaire'>
@@ -84,7 +97,8 @@
    <option id='job_avg_day' value='job_avg_day' title="__Average backup size per day for the period__">__Job avg size (d)__</option>
    <option id='job_sum_hour' value='job_sum_hour' title="__Job size per hour for the period__">__Job Bytes (h)__</option>
    <option id='job_sum_day' value='job_sum_day' title="__Job size per day for the period__">__Job Bytes (d)__</option>
-   <option onclick='document.getElementById("gtype_balloon").selected=true;' id='job_time_size' value='job_time_size' title="__Display Job size, duration and number of files with a balloon__">__Size,time,files__</option>
+   <option onclick='document.getElementById("gtype_balloon").selected=true;' id='job_time_nb' value='job_time_nb' title="__Display Job duration, size and files with balloons__">__Time,size,files__</option>
+   <option onclick='document.getElementById("gtype_balloon").selected=true;' id='job_time_size' value='job_time_size' title="__Display Job duration, files and size with balloons__">__Time,files,size__</option>
 
  </select>
   </td>
@@ -119,7 +133,7 @@
  </div>
  <div class="otherbox">
 
- <img usemap='imggraph' id='imggraph' 
+ <img usemap='#imggraph' id='imggraph'
       alt='__Nothing to display, Try a bigger date range__'>
  </div>
 
@@ -177,4 +191,7 @@
    document.getElementById('imggraph').src='bgraph.pl?<TMPL_VAR url>'
   </TMPL_IF>
 
+  <TMPL_LOOP qclient_groups>
+     document.getElementById('group_' + <TMPL_VAR name>).selected = true;
+  </TMPL_LOOP>
 </script>