diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-11-01 16:28:40 +0100 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-11-01 16:28:40 +0100 |
| commit | 605cb4391d31b3f3ab5f95f97c4b5a6dcb0685e9 (patch) | |
| tree | a3f3a856a8b8e5fdd848efbb4e3c54c440a902fc | |
| parent | c2d3a70d119a968139568c2790c365a9b9066cfe (diff) | |
| parent | c8ca2dc2038ec115299bc2f8a78e525d0b19cbec (diff) | |
Merge branch 'wian' into allinone-nonedit
| -rw-r--r-- | misc.tmpl | 13 | ||||
| -rw-r--r-- | page.tmpl | 13 |
2 files changed, 22 insertions, 4 deletions
@@ -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> @@ -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> |