Merge branch 'wian' into wian-da

2 files changed, 17 insertions, 0 deletions

diff --git a/misc.tmpl b/misc.tmpl
index 76a3f3e..12a1b16 100644
--- a/misc.tmpl
+++ b/misc.tmpl
@@ -19,6 +19,14 @@
 
 <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 b0dc26e..c80158f 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -20,6 +20,15 @@
 <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">