X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f8880cb670b0d1169559d04602fc543b1a6a061e..0d19125b229e7e0f545d309e62b95ac8689e4ab8:/templates/page.tmpl diff --git a/templates/page.tmpl b/templates/page.tmpl index 3bb7197f0..770ac2399 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -11,7 +11,6 @@ </TMPL_IF> </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" /> @@ -28,6 +27,15 @@ <TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF> <TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF> <TMPL_IF META><TMPL_VAR META></TMPL_IF> +<TMPL_LOOP TRAILLOOP> +<TMPL_IF PREVPAGE> +<link rel="prev" href="<TMPL_VAR PREVURL>" title="<TMPL_VAR PREVTITLE>" /> +</TMPL_IF> +<link rel="up" href="<TMPL_VAR TRAILURL>" title="<TMPL_VAR TRAILTITLE>" /> +<TMPL_IF NEXTPAGE> +<link rel="next" href="<TMPL_VAR NEXTURL>" title="<TMPL_VAR NEXTTITLE>" /> +</TMPL_IF> +</TMPL_LOOP> </head> <body> @@ -48,11 +56,9 @@ </TMPL_IF> </span> </span> -<TMPL_UNLESS DYNAMIC> <TMPL_IF SEARCHFORM> <TMPL_VAR SEARCHFORM> </TMPL_IF> -</TMPL_UNLESS> <TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF> <TMPL_IF HAVE_ACTIONS> @@ -90,7 +96,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> @@ -106,6 +112,8 @@ <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF> </TMPL_IF> +<TMPL_VAR TRAILS> + <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> <TMPL_IF SIDEBAR> @@ -114,10 +122,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,6 +141,9 @@ </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_UNLESS DYNAMIC>