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 | 71334c0340a9bde9584e13758659996a9bb2fa48 (patch) | |
| tree | e23869ba27e64e9d91aefc80ad4b2d4589de1c07 | |
| parent | 48dcd021905c683b5c396f44419bab60d2067238 (diff) | |
| parent | 7220fd839574cea41d5cdce1ba7035056bb843ce (diff) | |
Merge branch 'wian-nb' into allinone-nonedit-nb
| -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> |