From c8ca2dc2038ec115299bc2f8a78e525d0b19cbec Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 1 Nov 2008 16:28:12 +0100
Subject: Rely on branding_logo_text (not branding_logo). Add
 branding_logo_tagline.

---
 page.tmpl | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'page.tmpl')

diff --git a/page.tmpl b/page.tmpl
index 1e431e4..7a9cdbb 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -21,11 +21,20 @@
 
 <div class="pageheader">
 
-<TMPL_IF NAME="BRANDING_LOGO">
+<TMPL_IF NAME="BRANDING_LOGO_TEXT">
 <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>
+<TMPL_IF NAME="BRANDING_LOGO">
+<a href="<TMPL_VAR BASEURL>"><img src="<TMPL_VAR BASEURL><TMPL_VAR NAME=BRANDING_LOGO>" alt="<TMPL_VAR NAME=BRANDING_LOGO_TEXT>" /></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=BRANDING_LOGO_TEXT></a>
+</TMPL_IF>
 </div>
+<TMPL_IF NAME="BRANDING_LOGO_TAGLINE">
+<div id="branding-tagline">
+<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=BRANDING_LOGO_TAGLINE></a>
+</div>
+</TMPL_IF>
 </div>
 </TMPL_IF>
 
-- 
cgit v1.2.3