Merge branch 'wian' into allinone-noneditallinone-nonedit

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 c6152a4..be90767 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>