diff options
| author | Joey Hess <joey@kitenet.net> | 2010-05-05 18:18:50 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-05-05 18:21:02 -0400 |
| commit | 2a2976f7ff281687b5e69a3963fc9c9fe03ef859 (patch) | |
| tree | ecad0a474c1c96aa00e0093079cb22a939ab0a49 | |
| parent | 8aa5f2d23e3f6c88a22e19b41e7dac1df9d84a12 (diff) | |
| download | ikiwiki-2a2976f7ff281687b5e69a3963fc9c9fe03ef859.tar ikiwiki-2a2976f7ff281687b5e69a3963fc9c9fe03ef859.tar.gz | |
add the <base> setting as in misc.tmpl; only ever do it if not ispage
Also, add FOOTER, to allow disabling the footer.
| -rw-r--r-- | templates/misc.tmpl | 43 | ||||
| -rw-r--r-- | templates/page.tmpl | 11 |
2 files changed, 11 insertions, 43 deletions
diff --git a/templates/misc.tmpl b/templates/misc.tmpl deleted file mode 100644 index 5654cab61..000000000 --- a/templates/misc.tmpl +++ /dev/null @@ -1,43 +0,0 @@ -<TMPL_IF HTML5><!DOCTYPE html> -<html> -<TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -</TMPL_IF> -<head> -<TMPL_IF NAME="FORCEBASEURL"> -<base href="<TMPL_VAR FORCEBASEURL>" /> -<TMPL_ELSE> -<base href="<TMPL_VAR BASEURL>" /> -</TMPL_IF> -<TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF> -<title><TMPL_VAR TITLE></title> -<TMPL_IF NAME="FAVICON"> -<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" /> -</TMPL_IF> -<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" /> -<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" /> -</head> -<body> - -<TMPL_IF HTML5><section class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF> -<TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF> -<span> -<TMPL_VAR INDEXLINK>/ -<span class="title"> -<TMPL_VAR TITLE> -</span> -</span> -<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF> -<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> - -<TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF> -<TMPL_VAR PAGEBODY> -<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> - -<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF> -<!-- from <TMPL_VAR WIKINAME> --> -<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF> - -</body> -</html> diff --git a/templates/page.tmpl b/templates/page.tmpl index 8a9911fae..b6c751a3a 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -5,6 +5,15 @@ <html xmlns="http://www.w3.org/1999/xhtml"> </TMPL_IF> <head> +<TMPL_UNLESS ISPAGE> +<TMPL_IF NAME="FORCEBASEURL"> +<base href="<TMPL_VAR FORCEBASEURL>" /> +<TMPL_ELSE> +<TMPL_IF BASEURL> +<base href="<TMPL_VAR BASEURL>" /> +</TMPL_IF> +</TMPL_IF> +</TMPL_UNLESS> <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF> <meta http-equiv="Cache-Control" content="must-revalidate" /> <title><TMPL_VAR TITLE></title> @@ -124,6 +133,7 @@ <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +<TMPL_IF HAVE_FOOTER> <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF> <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF> @@ -177,6 +187,7 @@ Last edited <TMPL_VAR MTIME> <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> <!-- from <TMPL_VAR WIKINAME> --> <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF> +</TMPL_IF> <TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF> |