summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-11-01 16:28:20 +0100
committerJonas Smedegaard <dr@jones.dk>2008-11-01 16:28:20 +0100
commite310666f0122eed6767fbc6f36c8895f8c8b713f (patch)
tree3b40be9272ea75c4e33413b7a8040578de4ee833
parent41030ee1d6854a4304ad586af32ca56d0815c61b (diff)
parentc8ca2dc2038ec115299bc2f8a78e525d0b19cbec (diff)
Merge branch 'wian' into allinone
-rw-r--r--misc.tmpl13
-rw-r--r--page.tmpl13
2 files changed, 22 insertions, 4 deletions
diff --git a/misc.tmpl b/misc.tmpl
index d47dd52..f902c81 100644
--- a/misc.tmpl
+++ b/misc.tmpl
@@ -32,11 +32,20 @@ isn't that nice to know? -->
<div id="container">
-<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>
diff --git a/page.tmpl b/page.tmpl
index 51be60c..2b5b1ee 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -34,11 +34,20 @@ isn't that nice to know? -->
<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>