aboutsummaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2014-10-16 11:04:53 +0100
committerSimon McVittie <smcv@debian.org>2014-10-16 11:04:53 +0100
commit490a1eca7bed841848765b495a73fbc56e4808f4 (patch)
treed7eb5dd03d15a7c9c77dbf6d7a32028b53fcddad /templates
parent1561fbb365adba5b9b793d3e52e59bee48d66546 (diff)
downloadikiwiki-490a1eca7bed841848765b495a73fbc56e4808f4.tar
ikiwiki-490a1eca7bed841848765b495a73fbc56e4808f4.tar.gz
Always produce HTML5 doctype and new attributes, but not new elements
According to caniuse.com, a significant fraction of Web users are still using Internet Explorer versions that do not support HTML5 sectioning elements. However, claiming we're XHTML 1.0 Strict means we can't use features invented in the last 12 years, even if they degrade gracefully in older browsers (like the role and placeholder attributes). This means our output is no longer valid according to any particular DTD. Real browsers and other non-validator user-agents have never cared about DTD compliance anyway, so I don't think this is a real loss.
Diffstat (limited to 'templates')
-rw-r--r--templates/googleform.tmpl2
-rw-r--r--templates/page.tmpl12
-rw-r--r--templates/searchform.tmpl2
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..45235cef8 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -1,9 +1,5 @@
-<TMPL_IF HTML5><!DOCTYPE html>
+<!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 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>