summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-11-01 11:37:45 +0100
committerJonas Smedegaard <dr@jones.dk>2008-11-01 11:37:45 +0100
commit4c667aa2592fc1d4dfffa263ee35fb48ecba3829 (patch)
treeb2050499e6d41f57436cfc95e641b043435e6a6e
parent9ef0ac2ddad5f19419fae451f1fbb252f908947a (diff)
parentb77ef96e3f7093ebed994696d0e476c60723e13e (diff)
Merge branch 'wian' into wian-da
-rw-r--r--misc.tmpl8
-rw-r--r--page.tmpl9
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">