diff options
| author | Simon McVittie <smcv@debian.org> | 2014-11-26 11:58:05 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2014-11-26 11:58:05 +0000 |
| commit | 6c51b764bca2981b8962d7fcfd78efa533291283 (patch) | |
| tree | 0d3cb6dee45983ea81309d0f45107878e1ca7f0c /templates | |
| parent | dc0744a423255c21a455446f9871ea42aca244fa (diff) | |
| parent | 22961f81ddf642b24e45fdf9707dff06e17742a7 (diff) | |
| download | ikiwiki-6c51b764bca2981b8962d7fcfd78efa533291283.tar ikiwiki-6c51b764bca2981b8962d7fcfd78efa533291283.tar.gz | |
Merge branch 'ready/html5'
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/googleform.tmpl | 2 | ||||
| -rw-r--r-- | templates/page.tmpl | 12 | ||||
| -rw-r--r-- | templates/searchform.tmpl | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/templates/googleform.tmpl b/templates/googleform.tmpl index b1c3078fb..155a08155 100644 --- a/templates/googleform.tmpl +++ b/templates/googleform.tmpl @@ -3,6 +3,6 @@ <div> <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" /> <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text" - <TMPL_IF HTML5>placeholder="search"</TMPL_IF> /> + placeholder="search" /> </div> </form> diff --git a/templates/page.tmpl b/templates/page.tmpl index c709c4f85..301c737fe 100644 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@ -1,9 +1,5 @@ -<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"> +<!DOCTYPE html> <html xmlns="http://www.w3.org/1999/xhtml"> -</TMPL_IF> <head> <TMPL_IF DYNAMIC> <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE> @@ -134,7 +130,7 @@ <div id="pagebody"> -<TMPL_IF HTML5><section id="content" role="main"><TMPL_ELSE><div id="content"></TMPL_IF> +<TMPL_IF HTML5><section<TMPL_ELSE><div</TMPL_IF> id="content" role="main"> <TMPL_VAR CONTENT> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> @@ -146,7 +142,7 @@ <TMPL_UNLESS DYNAMIC> <TMPL_IF COMMENTS> -<TMPL_IF HTML5><section id="comments" role="complementary"><TMPL_ELSE><div id="comments"></TMPL_IF> +<TMPL_IF HTML5><section<TMPL_ELSE><div</TMPL_IF> id="comments" role="complementary"> <TMPL_VAR COMMENTS> <TMPL_IF ADDCOMMENTURL> <div class="addcomment"> @@ -161,7 +157,7 @@ </div> -<TMPL_IF HTML5><footer id="footer" class="pagefooter" role="contentinfo"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF> +<TMPL_IF HTML5><footer<TMPL_ELSE><div</TMPL_IF> id="footer" class="pagefooter" role="contentinfo"> <TMPL_UNLESS DYNAMIC> <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF> diff --git a/templates/searchform.tmpl b/templates/searchform.tmpl index cb65d124c..8cdf745f9 100644 --- a/templates/searchform.tmpl +++ b/templates/searchform.tmpl @@ -1,6 +1,6 @@ <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform"> <div> <input type="text" id="searchbox" name="P" value="" size="16" -<TMPL_IF HTML5>placeholder="search"</TMPL_IF> /> + placeholder="search" /> </div> </form> |