]> git.sur5r.net Git - bacula/bacula/commitdiff
projects / bacula / bacula / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9b5ebaf)
ebl Fix files/bytes bar
authorEric Bollengier <eric@eb.homelinux.org>
Tue, 11 Mar 2008 14:17:36 +0000 (14:17 +0000)
committerEric Bollengier <eric@eb.homelinux.org>
Tue, 11 Mar 2008 14:17:36 +0000 (14:17 +0000)
     Disable mysql debug

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

gui/bweb/lang/en/tpl/client_job_status.tpl patch | blob | history
gui/bweb/lang/es/tpl/client_job_status.tpl patch | blob | history
gui/bweb/lang/fr/tpl/client_job_status.tpl patch | blob | history
gui/bweb/lib/Bweb.pm patch | blob | history
gui/bweb/tpl/client_job_status.tpl patch | blob | history

diff --git a/gui/bweb/lang/en/tpl/client_job_status.tpl b/gui/bweb/lang/en/tpl/client_job_status.tpl
index 9e7d8ee7222e9a254fa83f57f04c08b3ebb4460f..f87a3fa1024308ba0f81ebb54d1d7d091f0fe631 100644 (file)
--- 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 c47d7aeed4f3517bc271ce25e472fcc894b8f0e6..f0739f13743adc21b3fd24960ab962ee4cbe815f 100644 (file)
--- 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 c6237e64a0f3736d845ef65a3b8cc185a835cba4..65c3e334c8c1c8e13fae8018a485cd2c52f3a870 100644 (file)
--- 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 0d8212a67248afbcb31ee0573b2c73f80c9ca1b8..7e8b707de5539ef15770bbd6809b8625d6bdd512 100644 (file)
--- 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 be9576ab9a9f31bb87929768604cdacb2ffd2346..0351cd39aef2fd85a625f51357c1e0bc0964e13d 100644 (file)
--- 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>
Cloned from http://git.bacula.org/bacula