summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-11-01 16:28:32 +0100
committerJonas Smedegaard <dr@jones.dk>2008-11-01 16:28:32 +0100
commitb020e99accd7d7b32915e481b58d0480db33f20d (patch)
tree41f230a41edcff9bdc71b7f966ffb47872fc735a
parent3d7faf717839987457db7007dd61eaddffc3ebe8 (diff)
parent52ce6d349cfcc796f2d14a085e668c9272f085f6 (diff)
Merge branch 'wian-da' into allinone-da
-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 82de89b..f18770f 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>