Merge branch 'wian' into allinone

2 files changed, 17 insertions, 0 deletions

diff --git a/misc.tmpl b/misc.tmpl
index 2881544..d47dd52 100644
--- a/misc.tmpl
+++ b/misc.tmpl
@@ -32,6 +32,14 @@ isn't that nice to know? -->
 
 <div id="container">
 
+<TMPL_IF NAME="BRANDING_LOGO">
+<div id="branding">
+<div id="branding-logo">
+<a href="<TMPL_VAR BASEURL>"><img src="<TMPL_VAR BASEURL><TMPL_VAR NAME=BRANDING_LOGO>" alt="<TMPL_VAR NAME=BRANDING_LOGO_ALT>" /></a>
+</div>
+</div>
+</TMPL_IF>
+
 <div class="header">
 <span>
 <TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE>
diff --git a/page.tmpl b/page.tmpl
index c221669..51be60c 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -33,6 +33,15 @@ isn't that nice to know? -->
 <div id="container">
 
 <div class="pageheader">
+
+<TMPL_IF NAME="BRANDING_LOGO">
+<div id="branding">
+<div id="branding-logo">
+<a href="<TMPL_VAR BASEURL>"><img src="<TMPL_VAR BASEURL><TMPL_VAR NAME=BRANDING_LOGO>" alt="<TMPL_VAR NAME=BRANDING_LOGO_ALT>" /></a>
+</div>
+</div>
+</TMPL_IF>
+
 <div class="header">
 <span>
 <span class="parentlinks">