ebl Add ids on command.tpl to fix #1300

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

diff --git a/gui/bweb/lang/en/tpl/command.tpl b/gui/bweb/lang/en/tpl/command.tpl
index 66488b4613bb36c9060b16388cfb90db7ed967f2..821a5990cfaf557882a1311c1b556b6e892d4b32 100644 (file)
--- a/gui/bweb/lang/en/tpl/command.tpl
+++ b/gui/bweb/lang/en/tpl/command.tpl
@@ -4,8 +4,8 @@
   <h1 class='newstitle'> <TMPL_VAR title> : <TMPL_VAR name> &nbsp;</h1>
  </div>
  <div class='bodydiv'>
- <label onclick="toggle_display('log', 'arrow')"><img src="/bweb/right.gif" id='arrow' title="See output" > Command output</label><br>
-  <pre id='log' style='font-size: 10px;display:none'></TMPL_UNLESS>
+ <label onclick="toggle_display('log_<TMPL_VAR ID>', 'arrow_<TMPL_VAR ID>')"><img src="/bweb/right.gif" id='arrow_<TMPL_VAR ID>' title="See output" > Command output</label><br>
+  <pre id='log_<TMPL_VAR ID>' style='font-size: 10px;display:none'></TMPL_UNLESS>
 <TMPL_VAR content>
   <TMPL_UNLESS notail></pre>
  </div></TMPL_UNLESS>

diff --git a/gui/bweb/lang/es/tpl/command.tpl b/gui/bweb/lang/es/tpl/command.tpl
index 66488b4613bb36c9060b16388cfb90db7ed967f2..821a5990cfaf557882a1311c1b556b6e892d4b32 100644 (file)
--- a/gui/bweb/lang/es/tpl/command.tpl
+++ b/gui/bweb/lang/es/tpl/command.tpl
@@ -4,8 +4,8 @@
   <h1 class='newstitle'> <TMPL_VAR title> : <TMPL_VAR name> &nbsp;</h1>
  </div>
  <div class='bodydiv'>
- <label onclick="toggle_display('log', 'arrow')"><img src="/bweb/right.gif" id='arrow' title="See output" > Command output</label><br>
-  <pre id='log' style='font-size: 10px;display:none'></TMPL_UNLESS>
+ <label onclick="toggle_display('log_<TMPL_VAR ID>', 'arrow_<TMPL_VAR ID>')"><img src="/bweb/right.gif" id='arrow_<TMPL_VAR ID>' title="See output" > Command output</label><br>
+  <pre id='log_<TMPL_VAR ID>' style='font-size: 10px;display:none'></TMPL_UNLESS>
 <TMPL_VAR content>
   <TMPL_UNLESS notail></pre>
  </div></TMPL_UNLESS>

diff --git a/gui/bweb/lang/fr/tpl/command.tpl b/gui/bweb/lang/fr/tpl/command.tpl
index 66488b4613bb36c9060b16388cfb90db7ed967f2..821a5990cfaf557882a1311c1b556b6e892d4b32 100644 (file)
--- a/gui/bweb/lang/fr/tpl/command.tpl
+++ b/gui/bweb/lang/fr/tpl/command.tpl
@@ -4,8 +4,8 @@
   <h1 class='newstitle'> <TMPL_VAR title> : <TMPL_VAR name> &nbsp;</h1>
  </div>
  <div class='bodydiv'>
- <label onclick="toggle_display('log', 'arrow')"><img src="/bweb/right.gif" id='arrow' title="See output" > Command output</label><br>
-  <pre id='log' style='font-size: 10px;display:none'></TMPL_UNLESS>
+ <label onclick="toggle_display('log_<TMPL_VAR ID>', 'arrow_<TMPL_VAR ID>')"><img src="/bweb/right.gif" id='arrow_<TMPL_VAR ID>' title="See output" > Command output</label><br>
+  <pre id='log_<TMPL_VAR ID>' style='font-size: 10px;display:none'></TMPL_UNLESS>
 <TMPL_VAR content>
   <TMPL_UNLESS notail></pre>
  </div></TMPL_UNLESS>

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index d303794908745dac58c31161ae1c0eb096f2a272..a923410a030764c57cbe842ce3bb645bbc0c6764 100644 (file)
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -226,7 +226,7 @@ our %k_re = ( dbi      => qr/^(dbi:(Pg|mysql):(?:\w+=[\w\d\.-]+;?)+)$/i,
              debug    => qr/^(on)?$/,
              lang     => qr/^(\w\w)?$/,
              email_media => qr/^([\w\d\.-]+@[\d\w\.-]+)$/,
-             graph_font  => qr!^([/\w\d\.-]+.ttf)$!,
+             graph_font  => qr!^([/\w\d\.-]+.ttf)?$!,
              bconsole    => qr!^(.+)?$!,
              syslog_file => qr!^(.+)?$!,
              log_dir     => qr!^(.+)?$!,
@@ -4376,6 +4376,7 @@ sub delete
            content => $ret,
            title => "Delete a job ",
            name => "delete jobid=$arg->{jobid}",
+            id => $cur_id++,
        }, "command.tpl");      
     }
 }
@@ -4448,6 +4449,7 @@ sub do_update_media
        content => $b->send_cmd($update),
        title => "Update a volume ",
        name => $update,
+        id => $cur_id++,
     }, "command.tpl"); 
 
 
@@ -4490,6 +4492,7 @@ sub update_slots
        title => "Scanning autochanger content ",
        name => "update slots",
         notail => 1,
+        id => $cur_id++,
     }, "command.tpl"); 
     my $b = new Bconsole(pref => $self->{info},timeout => 60,log_stdout => 1);
     $b->update_slots($ach->{name});
@@ -4738,6 +4741,7 @@ sub purge
            content => $b->purge_volume($v),
            title => "Purge media",
            name => "purge volume=$v",
+            id => $cur_id++,
        }, "command.tpl");
     }  
     $b->close();
@@ -4760,6 +4764,7 @@ sub prune
            content => $b->prune_volume($v),
            title => "Prune volume",
            name => "prune volume=$v",
+            id => $cur_id++,
        }, "command.tpl");
     }
     $b->close();
@@ -4780,6 +4785,7 @@ sub cancel_job
        content => $b->cancel($arg->{jobid}),
        title => "Cancel job",
        name => "cancel jobid=$arg->{jobid}",
+        id => $cur_id++,
     }, "command.tpl"); 
 }
 
@@ -4839,6 +4845,7 @@ sub enable_disable_job
        content => $b->send_cmd("$cmd job=\"$arg->{job}\""),
        title => "$cmd $arg->{job}",
        name => "$cmd job=\"$arg->{job}\"",
+        id => $cur_id++,
     }, "command.tpl"); 
 }
 
@@ -4863,6 +4870,7 @@ sub cmd_storage
            content => $ret,
            title => "Storage ",
            name => $cmd,
+           id => $cur_id++,
        }, "command.tpl");              
     } else {
        my $storages= [ map { { name => $_ } } $b->list_storage()];

diff --git a/gui/bweb/tpl/command.tpl b/gui/bweb/tpl/command.tpl
index 66488b4613bb36c9060b16388cfb90db7ed967f2..821a5990cfaf557882a1311c1b556b6e892d4b32 100644 (file)
--- a/gui/bweb/tpl/command.tpl
+++ b/gui/bweb/tpl/command.tpl
@@ -4,8 +4,8 @@
   <h1 class='newstitle'> <TMPL_VAR title> : <TMPL_VAR name> &nbsp;</h1>
  </div>
  <div class='bodydiv'>
- <label onclick="toggle_display('log', 'arrow')"><img src="/bweb/right.gif" id='arrow' title="See output" > Command output</label><br>
-  <pre id='log' style='font-size: 10px;display:none'></TMPL_UNLESS>
+ <label onclick="toggle_display('log_<TMPL_VAR ID>', 'arrow_<TMPL_VAR ID>')"><img src="/bweb/right.gif" id='arrow_<TMPL_VAR ID>' title="See output" > Command output</label><br>
+  <pre id='log_<TMPL_VAR ID>' style='font-size: 10px;display:none'></TMPL_UNLESS>
 <TMPL_VAR content>
   <TMPL_UNLESS notail></pre>
  </div></TMPL_UNLESS>