From e4303aa59caeb3b5776dc1cb7645992ee825495e Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 23 Dec 2007 19:04:01 +0000
Subject: [PATCH] ebl  Add documentation about new tpl usage

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6117 91ce42f0-d328-0410-95d8-f526ca767f89
---
 gui/bweb/INSTALL       |  8 ++++----
 gui/bweb/install_bweb  | 10 +++++-----
 gui/bweb/technotes-2.3 |  4 ++++
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/gui/bweb/INSTALL b/gui/bweb/INSTALL
index cbc4550d11..bad331eca7 100644
--- a/gui/bweb/INSTALL
+++ b/gui/bweb/INSTALL
@@ -45,12 +45,12 @@ Bweb works well with 1.39 release or later.
  # get a config file
  mkdir -m 755 /etc/bacula
  chown root:bacula /etc/bacula
- echo '$VAR1 = { template_dir => "/usr/share/bweb/tpl" };' > /etc/bacula/bweb.conf
+ echo '$VAR1 = { template_dir => "/usr/share/bweb/en/tpl" };' > /etc/bacula/bweb.conf
  chown www-data /etc/bacula/bweb.conf
 
  # copy the bweb template file
  mkdir -p /usr/share/bweb/tpl
- install -m 644 -o root -g root  bweb/tpl/*.tpl /usr/share/bweb/tpl
+ install -m 644 -o root -g root  bweb/lang/en/tpl/*.tpl /usr/share/bweb/en/tpl
 
  # copy the bweb graphics elements (bweb elements must reside in /bweb)
  mkdir /var/www/bweb
@@ -64,7 +64,7 @@ Bweb works well with 1.39 release or later.
 
 ################ USE FRENCH VERSION ############################
 
-Simply use lang/fr/tpl/*.tpl files instead of tpl/*.tpl
+Simply use lang/fr/tpl/*.tpl files instead of lang/en/tpl/*.tpl
 
 ################ INSTALL PERL LIBRARY ##########################
 
@@ -170,7 +170,7 @@ $VAR1 = bless( {
        }, 'Bweb::Autochanger' )
    },
   'password' => 'xxx',
-  'template_dir' => '/usr/share/bweb/tpl',
+  'template_dir' => '/usr/share/bweb/en/tpl',
   'dbi' => 'DBI:mysql:database=bacula',
   'error' => '',
   'debug' => 0,
diff --git a/gui/bweb/install_bweb b/gui/bweb/install_bweb
index 02fd82eabb..97daef2e39 100755
--- a/gui/bweb/install_bweb
+++ b/gui/bweb/install_bweb
@@ -90,7 +90,7 @@ cat > ${CONF_DIR}/bweb.conf <<END_OF_DATA
        }, 'Bweb::Autochanger' )
    },
   'password' => '${DB_PW}',
-  'template_dir' => '${SHARE_DIR}/bweb/tpl',
+  'template_dir' => '${SHARE_DIR}/bweb/en/tpl',
   'dbi' => 'DBI:mysql:database=bacula',
   'error' => '',
   'debug' => 0,
@@ -103,10 +103,10 @@ fi
 chown ${HTTP_USER} ${CONF_DIR}/bweb.conf
 
 # copy the bweb template file
-if [ ! -d ${SHARE_DIR}/bweb/tpl ] ; then
-   mkdir -p ${SHARE_DIR}/bweb/tpl
+if [ ! -d ${SHARE_DIR}/bweb/en/tpl ] ; then
+   mkdir -p ${SHARE_DIR}/bweb/en/tpl
 fi
-install -m 644 -o root -g root  tpl/*.tpl ${SHARE_DIR}/bweb/tpl
+install -m 644 -o root -g root  lang/en/tpl/*.tpl ${SHARE_DIR}/bweb/en/tpl
 
 # copy the bweb graphics elements (bweb elements must reside in /bweb)
 if [ ! -d ${WEB_DIR} ] ; then
@@ -125,7 +125,7 @@ echo "  something like :"
 echo "   root# mysql bacula < script/bweb-mysql.sql"
 echo "  or"
 echo "   postgres# echo 'CREATE PROCEDURAL LANGUAGE plpgsql;' | psql bacula"
-echo "   postgres# psql -U bacula -P passwd < script/bweb/bweb-postgresql.sql"
+echo "   postgres# psql -U bacula bacula < script/bweb/bweb-postgresql.sql"
 echo " "
 
 # done !
diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index eaf981a28b..3c1cafb68a 100644
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,7 @@
+23Dec07
+ebl  WARNING: now, bweb/tpl contains main tpl files
+     for english version, you have to use bweb/lang/en/tpl
+
 21Dec07
 ebl  Use main tpl for editing, and use scripts to
      generate other lang.
-- 
2.39.5