From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sat, 24 Nov 2007 11:23:17 +0000 (+0000)
Subject: ebl  Add a wiki option to integrate a link to jobs documentation
X-Git-Tag: Release-3.0.0~2212
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9f78f929c4369a225ab73055ba8942c853359a23;p=bacula%2Fbacula

ebl  Add a wiki option to integrate a link to jobs documentation
     directly in bweb.


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

diff --git a/gui/bweb/lib/Bweb.pm b/gui/bweb/lib/Bweb.pm
index 742f80fc38..7488893e0b 100644
--- a/gui/bweb/lib/Bweb.pm
+++ b/gui/bweb/lib/Bweb.pm
@@ -206,7 +206,7 @@ use CGI;
 
 our %k_re = ( dbi      => qr/^(dbi:(Pg|mysql):(?:\w+=[\w\d\.-]+;?)+)$/i,
 	      user     => qr/^([\w\d\.-]+)$/i,
-	      password => qr/^(.*)$/i,
+	      password => qr/^(.*)$/,
 	      fv_write_path => qr!^([/\w\d\.-]*)$!,
 	      template_dir => qr!^([/\w\d\.-]+)$!,
 	      debug    => qr/^(on)?$/,
@@ -215,6 +215,7 @@ our %k_re = ( dbi      => qr/^(dbi:(Pg|mysql):(?:\w+=[\w\d\.-]+;?)+)$/i,
 	      bconsole    => qr!^(.+)?$!,
 	      syslog_file => qr!^(.+)?$!,
 	      log_dir     => qr!^(.+)?$!,
+	      wiki_url    => qr!(.*)$!,
 	      stat_job_table => qr!^(\w*)$!,
 	      display_log_time => qr!^(on)?$!,
 	      enable_security => qr/^(on)?$/,
@@ -2157,6 +2158,7 @@ WHERE Job.JobId = $jobid
     my $all = $self->dbh_selectall_hashref($query, 'volumename');
 
     $row->{volumes} = [ values %$all ] ;
+    $row->{wiki_url} = $self->{info}->{wiki_url};
 
     $self->display($row, "display_job_zoom.tpl");
 }
diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index e96d3bac45..67602de8aa 100644
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,7 @@
+24Nov07
+ebl  Add a wiki option to integrate a link to jobs documentation
+     directly in bweb.
+
 23Nov07
 ebl  Add brestore_xxx tables to sql scripts
 ebl  Add a batch=1 option to bresto.pl to fill bresto tables
diff --git a/gui/bweb/tpl/config_edit.tpl b/gui/bweb/tpl/config_edit.tpl
index f607dd0bb1..65ae262609 100644
--- a/gui/bweb/tpl/config_edit.tpl
+++ b/gui/bweb/tpl/config_edit.tpl
@@ -43,6 +43,9 @@
      <tr><td>bconsole :</td> 
          <td> <input class="formulaire" type='text' value='<TMPL_VAR bconsole>' size='64' name='bconsole'> 
          </td></tr>
+     <tr><td>wiki_url :</td> 
+         <td> <input class="formulaire" title="use a wiki for jobs documentation?" type='text' name='wiki_url' value='<TMPL_VAR wiki_url>'> 
+         </td></tr>
      <tr><td>display_log_time :</td> 
          <td> <input class="formulaire" title="display log timestamp" type='checkbox' name='display_log_time' <TMPL_IF display_log_time> checked='checked' value='on' </TMPL_IF> > 
          </td></tr>
diff --git a/gui/bweb/tpl/config_view.tpl b/gui/bweb/tpl/config_view.tpl
index 7aa431006b..8d13bef34b 100644
--- a/gui/bweb/tpl/config_view.tpl
+++ b/gui/bweb/tpl/config_view.tpl
@@ -17,6 +17,7 @@
     <tr><td title="This folder must be writable by apache user and must be accessible on /bweb/fv">fv_write_path :</td> <td> <TMPL_VAR fv_write_path> </td></tr>
     <tr><td title="You can choose the Job table that you want to use to get statistics">stat_job_table :</td> <td> <TMPL_IF stat_job_table><TMPL_VAR stat_job_table><TMPL_ELSE>Job</TMPL_IF> </td></tr>
     <tr><td title="/path/to/bconsole -n -c /path/to/bconsole.conf">bconsole :</td> <td> <TMPL_VAR bconsole> </td></tr>
+    <tr><td title="use a wiki for jobs documentation ?">wiki_url :</td> <td> <TMPL_VAR wiki_url> </td></tr>
     <tr><td title="display timestamp in job log">display_log_time :</td> <td> <TMPL_VAR display_log_time> </td></tr>
     <tr><td title="user managment">security :</td> <td> <TMPL_VAR enable_security> </td></tr>
     <tr><td title="user filter">security acl :</td> <td> <TMPL_VAR enable_security_acl> </td></tr>
diff --git a/gui/bweb/tpl/display_job_zoom.tpl b/gui/bweb/tpl/display_job_zoom.tpl
index c367f9c907..80e58d463c 100644
--- a/gui/bweb/tpl/display_job_zoom.tpl
+++ b/gui/bweb/tpl/display_job_zoom.tpl
@@ -53,6 +53,11 @@
  </form>
  </td>
 -->
+<TMPL_IF wiki_url>
+  <td>
+   <a href="<TMPL_VAR wiki_url><TMPL_VAR Client>" title='View doc'><img src='/bweb/doc.png' alt='view doc'></a>View Doc
+ </td>
+</TMPL_IF>
  <td>
  <form name="rerun" action='bweb.pl?' onsubmit="document.getElementById('rerun_level').value=joblevelname['<TMPL_VAR NAME=Level>']">
   <input type='hidden' name='storage' value='<TMPL_VAR storage>'>