X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/fa2918f13f03a3d8dfd6f987a518695d7763fb01..ffdf8e08f9ae2a6c6c2e1723cf51b60e54e12b7d:/templates/page.tmpl diff --git a/templates/page.tmpl b/templates/page.tmpl index 4920d3cc8..8659018a0 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -5,13 +5,12 @@ <html xmlns="http://www.w3.org/1999/xhtml"> </TMPL_IF> <head> -<TMPL_UNLESS ISPAGE> +<TMPL_IF DYNAMIC> <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE> <TMPL_IF BASEURL><base href="<TMPL_VAR BASEURL>" /></TMPL_IF> </TMPL_IF> -</TMPL_UNLESS> +</TMPL_IF> <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> <TMPL_IF FAVICON> <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" /> @@ -48,11 +47,9 @@ </TMPL_IF> </span> </span> -<TMPL_IF ISPAGE> <TMPL_IF SEARCHFORM> <TMPL_VAR SEARCHFORM> </TMPL_IF> -</TMPL_IF> <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF> <TMPL_IF HAVE_ACTIONS> @@ -90,7 +87,7 @@ </TMPL_IF> <TMPL_IF OTHERLANGUAGES> -<TMPL_IF HTML5><nav class="otherlanguages"><TMPL_ELSE><div class="otherlanguages"></TMPL_IF> +<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF> <ul> <TMPL_LOOP OTHERLANGUAGES> <li> @@ -114,10 +111,13 @@ <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +<div id="pagebody"> + <TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF> <TMPL_VAR CONTENT> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> +<TMPL_UNLESS DYNAMIC> <TMPL_IF COMMENTS> <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF> <TMPL_VAR COMMENTS> @@ -130,9 +130,12 @@ </TMPL_IF> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +</TMPL_UNLESS> + +</div> <TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF> -<TMPL_IF ISPAGE> +<TMPL_UNLESS DYNAMIC> <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF> <TMPL_IF TAGS> @@ -183,7 +186,7 @@ Last edited <TMPL_VAR MTIME> <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF> -</TMPL_IF> +</TMPL_UNLESS> <!-- from <TMPL_VAR WIKINAME> --> <TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>