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