15 files changed, 19 insertions, 12 deletions
diff --git a/LedgerSMB/Form.pm b/LedgerSMB/Form.pm
index 92d0b081..1aa65f32 100755
--- a/LedgerSMB/Form.pm
+++ b/LedgerSMB/Form.pm
@@ -572,6 +572,7 @@ sub parse_template {
 
 	my %include = ();
 	my $ok;
+	$self->{images} = "${LedgerSMB::Sysconfig::images}/$self->{templates}";
 
 	if ($self->{language_code}) {
 
diff --git a/LedgerSMB/Sysconfig.pm b/LedgerSMB/Sysconfig.pm
index 91fe33b3..d7d708a4 100644
--- a/LedgerSMB/Sysconfig.pm
+++ b/LedgerSMB/Sysconfig.pm
@@ -33,6 +33,9 @@ $spool = "spool";
 # path to user configuration files
 $userspath = "users";
 
+# images base directory
+$images = "images";
+
 # templates base directory
 $templates = "templates";
 
@@ -85,6 +88,7 @@ $userspath = $config{paths}{userspath} if $config{paths}{userspath};
 $localepath = $config{paths}{localepath} if $config{paths}{localepath};
 $spool = $config{paths}{spool} if $config{paths}{spool};
 $templates = $config{paths}{templates} if $config{paths}{templates};
+$images = $config{paths}{images} if $config{paths}{images};
 
 $gzip = $config{programs}{gzip} if $config{programs}{gzip};
 
diff --git a/ledger-smb.conf.default b/ledger-smb.conf.default
index 0b906640..a9fc86a8 100644
--- a/ledger-smb.conf.default
+++ b/ledger-smb.conf.default
@@ -25,6 +25,8 @@ spool      = spool
 userspath  = users
 # templates base directory
 templates  = templates
+# images base directory
+images  = images
 # member file
 memberfile = users/members
 localepath = locale/po
diff --git a/templates/Default-letterhead.html b/templates/Default-letterhead.html
index ad071986..b68a92ea 100755
--- a/templates/Default-letterhead.html
+++ b/templates/Default-letterhead.html
@@ -11,7 +11,7 @@
             </h4>
           </td>
 
-          <th><img src=<?lsmb templates ?>/<?lsmb language_code ?>/logo.png border=0 height=58></th>
+          <th><img src=<?lsmb images ?>/logo.png border=0 height=58></th>
 
           <td align=right>
             <h4>
diff --git a/templates/Default-letterhead.tex b/templates/Default-letterhead.tex
index 10ad0c44..b84de527 100755
--- a/templates/Default-letterhead.tex
+++ b/templates/Default-letterhead.tex
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/<?lsmb language_code ?>/logo}
+    \includegraphics[scale=0.3]{../<?lsmb images ?>/logo}
   }\hfill
   \begin{tabular}[b]{rr@{}}
   Tel: & <?lsmb tel ?>\\
diff --git a/templates/Estonian-letterhead.html b/templates/Estonian-letterhead.html
index 7e3127f9..5995c49d 100755
--- a/templates/Estonian-letterhead.html
+++ b/templates/Estonian-letterhead.html
@@ -11,7 +11,7 @@
             </h4>
           </td>
 
-          <th><img src=../<?lsmb templates ?>/logo.png border=0 width=84 height=58></th>
+          <th><img src=../<?lsmb images ?>/logo.png border=0 width=84 height=58></th>
 
           <td align=right>
             <h4>
diff --git a/templates/Estonian-letterhead.tex b/templates/Estonian-letterhead.tex
index 24e29b4f..b84de527 100755
--- a/templates/Estonian-letterhead.tex
+++ b/templates/Estonian-letterhead.tex
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo}
+    \includegraphics[scale=0.3]{../<?lsmb images ?>/logo}
   }\hfill
   \begin{tabular}[b]{rr@{}}
   Tel: & <?lsmb tel ?>\\
diff --git a/templates/Estonian_UTF8-letterhead.html b/templates/Estonian_UTF8-letterhead.html
index 7e3127f9..5995c49d 100755
--- a/templates/Estonian_UTF8-letterhead.html
+++ b/templates/Estonian_UTF8-letterhead.html
@@ -11,7 +11,7 @@
             </h4>
           </td>
 
-          <th><img src=../<?lsmb templates ?>/logo.png border=0 width=84 height=58></th>
+          <th><img src=../<?lsmb images ?>/logo.png border=0 width=84 height=58></th>
 
           <td align=right>
             <h4>
diff --git a/templates/Estonian_UTF8-letterhead.tex b/templates/Estonian_UTF8-letterhead.tex
index 24e29b4f..b84de527 100755
--- a/templates/Estonian_UTF8-letterhead.tex
+++ b/templates/Estonian_UTF8-letterhead.tex
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo}
+    \includegraphics[scale=0.3]{../<?lsmb images ?>/logo}
   }\hfill
   \begin{tabular}[b]{rr@{}}
   Tel: & <?lsmb tel ?>\\
diff --git a/templates/Traditional_Chinese_Big5-letterhead.html b/templates/Traditional_Chinese_Big5-letterhead.html
index 7e3127f9..5995c49d 100755
--- a/templates/Traditional_Chinese_Big5-letterhead.html
+++ b/templates/Traditional_Chinese_Big5-letterhead.html
@@ -11,7 +11,7 @@
             </h4>
           </td>
 
-          <th><img src=../<?lsmb templates ?>/logo.png border=0 width=84 height=58></th>
+          <th><img src=../<?lsmb images ?>/logo.png border=0 width=84 height=58></th>
 
           <td align=right>
             <h4>
diff --git a/templates/Traditional_Chinese_Big5-letterhead.tex b/templates/Traditional_Chinese_Big5-letterhead.tex
index 24e29b4f..b84de527 100755
--- a/templates/Traditional_Chinese_Big5-letterhead.tex
+++ b/templates/Traditional_Chinese_Big5-letterhead.tex
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo}
+    \includegraphics[scale=0.3]{../<?lsmb images ?>/logo}
   }\hfill
   \begin{tabular}[b]{rr@{}}
   Tel: & <?lsmb tel ?>\\
diff --git a/templates/Traditional_Chinese_UTF8-letterhead.html b/templates/Traditional_Chinese_UTF8-letterhead.html
index 7e3127f9..5995c49d 100755
--- a/templates/Traditional_Chinese_UTF8-letterhead.html
+++ b/templates/Traditional_Chinese_UTF8-letterhead.html
@@ -11,7 +11,7 @@
             </h4>
           </td>
 
-          <th><img src=../<?lsmb templates ?>/logo.png border=0 width=84 height=58></th>
+          <th><img src=../<?lsmb images ?>/logo.png border=0 width=84 height=58></th>
 
           <td align=right>
             <h4>
diff --git a/templates/Traditional_Chinese_UTF8-letterhead.tex b/templates/Traditional_Chinese_UTF8-letterhead.tex
index 24e29b4f..b84de527 100755
--- a/templates/Traditional_Chinese_UTF8-letterhead.tex
+++ b/templates/Traditional_Chinese_UTF8-letterhead.tex
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/logo}
+    \includegraphics[scale=0.3]{../<?lsmb images ?>/logo}
   }\hfill
   \begin{tabular}[b]{rr@{}}
   Tel: & <?lsmb tel ?>\\
diff --git a/templates/demo/letterhead.html b/templates/demo/letterhead.html
index ad071986..b68a92ea 100644
--- a/templates/demo/letterhead.html
+++ b/templates/demo/letterhead.html
@@ -11,7 +11,7 @@
             </h4>
           </td>
 
-          <th><img src=<?lsmb templates ?>/<?lsmb language_code ?>/logo.png border=0 height=58></th>
+          <th><img src=<?lsmb images ?>/logo.png border=0 height=58></th>
 
           <td align=right>
             <h4>
diff --git a/templates/demo/letterhead.tex b/templates/demo/letterhead.tex
index 10ad0c44..b84de527 100644
--- a/templates/demo/letterhead.tex
+++ b/templates/demo/letterhead.tex
@@ -5,7 +5,7 @@
     <?lsmb address ?>
   }
   \parbox[b]{.2\textwidth}{
-    \includegraphics[scale=0.3]{../<?lsmb templates ?>/<?lsmb language_code ?>/logo}
+    \includegraphics[scale=0.3]{../<?lsmb images ?>/logo}
   }\hfill
   \begin{tabular}[b]{rr@{}}
   Tel: & <?lsmb tel ?>\\