From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 11 Mar 2008 14:17:36 +0000 (+0000)
Subject: ebl  Fix files/bytes bar
X-Git-Tag: Release-3.0.0~1704
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6f3b3785cee2d669d8176842492558ba692ed3ca;p=bacula%2Fbacula

ebl  Fix files/bytes bar
     Disable mysql debug


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6586 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/gui/bweb/lang/en/tpl/client_job_status.tpl b/gui/bweb/lang/en/tpl/client_job_status.tpl
index 9e7d8ee722..f87a3fa102 100644
--- a/gui/bweb/lang/en/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/en/tpl/client_job_status.tpl
@@ -24,12 +24,12 @@
  </tr>
 <TMPL_IF last_jobbytes>
  <tr>
-  <td> <b> Bytes done </b> </td><td> <div id='progress1'><td>
+  <td> <b> Bytes done </b> </td><td> <div id='progressb'><td>
  </tr>
 </TMPL_IF>
 <TMPL_IF last_jobfiles>
  <tr>
-  <td> <b> Files done </b> </td><td> <div id='progress2'><td>
+  <td> <b> Files done </b> </td><td> <div id='progressf'><td>
  </tr>
 </TMPL_IF>
 </table>
@@ -46,10 +46,10 @@
 
 <script type="text/javascript" language="JavaScript">
 <TMPL_IF last_jobfiles>
-  percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, <TMPL_VAR corr_jobfiles>, document.getElementById('progress1'));
+  percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, <TMPL_VAR corr_jobfiles>, document.getElementById('progressf'));
 </TMPL_IF>
 <TMPL_IF last_jobbytes>
-  percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, <TMPL_VAR corr_jobbytes>, document.getElementById('progress2'));
+  percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, <TMPL_VAR corr_jobbytes>, document.getElementById('progressb'));
 </TMPL_IF>
   bweb_add_refresh();
 </script>
diff --git a/gui/bweb/lang/es/tpl/client_job_status.tpl b/gui/bweb/lang/es/tpl/client_job_status.tpl
index c47d7aeed4..f0739f1374 100644
--- a/gui/bweb/lang/es/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/es/tpl/client_job_status.tpl
@@ -24,12 +24,12 @@
  </tr>
 <TMPL_IF last_jobbytes>
  <tr>
-  <td> <b> Bytes done </b> </td><td> <div id='progress1'><td>
+  <td> <b> Bytes done </b> </td><td> <div id='progressb'><td>
  </tr>
 </TMPL_IF>
 <TMPL_IF last_jobfiles>
  <tr>
-  <td> <b> Files done </b> </td><td> <div id='progress2'><td>
+  <td> <b> Files done </b> </td><td> <div id='progressf'><td>
  </tr>
 </TMPL_IF>
 </table>
@@ -46,10 +46,10 @@
 
 <script type="text/javascript" language="JavaScript">
 <TMPL_IF last_jobfiles>
-  percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, <TMPL_VAR corr_jobfiles>, document.getElementById('progress1'));
+  percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, <TMPL_VAR corr_jobfiles>, document.getElementById('progressf'));
 </TMPL_IF>
 <TMPL_IF last_jobbytes>
-  percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, <TMPL_VAR corr_jobbytes>, document.getElementById('progress2'));
+  percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, <TMPL_VAR corr_jobbytes>, document.getElementById('progressb'));
 </TMPL_IF>
   bweb_add_refresh();
 </script>
diff --git a/gui/bweb/lang/fr/tpl/client_job_status.tpl b/gui/bweb/lang/fr/tpl/client_job_status.tpl
index c6237e64a0..65c3e334c8 100644
--- a/gui/bweb/lang/fr/tpl/client_job_status.tpl
+++ b/gui/bweb/lang/fr/tpl/client_job_status.tpl
@@ -24,12 +24,12 @@
  </tr>
 <TMPL_IF last_jobbytes>
  <tr>
-  <td> <b> Bytes done </b> </td><td> <div id='progress1'><td>
+  <td> <b> Bytes done </b> </td><td> <div id='progressb'><td>
  </tr>
 </TMPL_IF>
 <TMPL_IF last_jobfiles>
  <tr>
-  <td> <b> Files done </b> </td><td> <div id='progress2'><td>
+  <td> <b> Files done </b> </td><td> <div id='progressf'><td>
  </tr>
 </TMPL_IF>
 </table>
@@ -46,10 +46,10 @@
 
 <script type="text/javascript" language="JavaScript">
 <TMPL_IF last_jobfiles>
-  percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, <TMPL_VAR corr_jobfiles>, document.getElementById('progress1'));
+  percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, <TMPL_VAR corr_jobfiles>, document.getElementById('progressf'));
 </TMPL_IF>
 <TMPL_IF last_jobbytes>
-  percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, <TMPL_VAR corr_jobbytes>, document.getElementById('progress2'));
+  percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, <TMPL_VAR corr_jobbytes>, document.getElementById('progressb'));
 </TMPL_IF>
   bweb_add_refresh();
 </script>
diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 0d8212a672..7e8b707de5 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -3884,7 +3884,7 @@ sub get_estimate_query
 
     my $query;
    
-    if (1 || $self->dbh_is_mysql()) { # mysql doesn't have statistics functions
+    if ($self->dbh_is_mysql()) { # mysql doesn't have statistics functions
 	$query = "
 SELECT jobname AS jobname, 
        0.1 AS corr_jobbytes, AVG(jobbytes) AS jobbytes,
diff --git a/gui/bweb/tpl/client_job_status.tpl b/gui/bweb/tpl/client_job_status.tpl
index be9576ab9a..0351cd39ae 100644
--- a/gui/bweb/tpl/client_job_status.tpl
+++ b/gui/bweb/tpl/client_job_status.tpl
@@ -24,12 +24,12 @@
  </tr>
 <TMPL_IF last_jobbytes>
  <tr>
-  <td> <b> __Bytes done__ </b> </td><td> <div id='progress1'><td>
+  <td> <b> __Bytes done__ </b> </td><td> <div id='progressb'><td>
  </tr>
 </TMPL_IF>
 <TMPL_IF last_jobfiles>
  <tr>
-  <td> <b> __Files done__ </b> </td><td> <div id='progress2'><td>
+  <td> <b> __Files done__ </b> </td><td> <div id='progressf'><td>
  </tr>
 </TMPL_IF>
 </table>
@@ -46,10 +46,10 @@
 
 <script type="text/javascript" language="JavaScript">
 <TMPL_IF last_jobfiles>
-  percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, <TMPL_VAR corr_jobfiles>, document.getElementById('progress1'));
+  percent_finish(<TMPL_VAR jobfiles>*100/<TMPL_VAR last_jobfiles>, <TMPL_VAR corr_jobfiles>, document.getElementById('progressf'));
 </TMPL_IF>
 <TMPL_IF last_jobbytes>
-  percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, <TMPL_VAR corr_jobbytes>, document.getElementById('progress2'));
+  percent_finish(<TMPL_VAR jobbytes>*100/<TMPL_VAR last_jobbytes>, <TMPL_VAR corr_jobbytes>, document.getElementById('progressb'));
 </TMPL_IF>
   bweb_add_refresh();
 </script>