summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-11-01 16:28:12 +0100
committerJonas Smedegaard <dr@jones.dk>2008-11-01 16:28:12 +0100
commitc8ca2dc2038ec115299bc2f8a78e525d0b19cbec (patch)
treedda94769e211f1254a78fa426ffa08f402b24e15
parentb77ef96e3f7093ebed994696d0e476c60723e13e (diff)
Rely on branding_logo_text (not branding_logo). Add branding_logo_tagline.wian
-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 12a1b16..b79b58c 100644
--- a/misc.tmpl
+++ b/misc.tmpl
@@ -19,11 +19,20 @@
<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 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>