Merge branch 'scs' into allinone-nonedit

Conflicts (manually resolved):
	misc.tmpl
	page.tmpl

26 files changed, 511 insertions, 266 deletions

diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl
index 8b89367..4e89efe 100644
--- a/aggregatepost.tmpl
+++ b/aggregatepost.tmpl
@@ -1,15 +1,15 @@
 <TMPL_VAR CONTENT>
-<TMPL_LOOP NAME="TAGS">
+<TMPL_LOOP TAGS>
 [[!tag <TMPL_VAR TAG>]]
 </TMPL_LOOP>
-<TMPL_IF NAME="TITLE">
-[[!meta title="<TMPL_VAR NAME="TITLE" ESCAPE=HTML>"]]
+<TMPL_IF TITLE>
+[[!meta title="<TMPL_VAR TITLE ESCAPE=HTML>"]]
 </TMPL_IF>
-<TMPL_IF NAME="PERMALINK">
-[[!meta permalink="<TMPL_VAR NAME="PERMALINK" ESCAPE=HTML>"]]
+<TMPL_IF PERMALINK>
+[[!meta permalink="<TMPL_VAR PERMALINK ESCAPE=HTML>"]]
 </TMPL_IF>
-<TMPL_IF NAME="COPYRIGHT">
-[[!meta copyright="<TMPL_VAR NAME="COPYRIGHT" ESCAPE=HTML>"]]
+<TMPL_IF COPYRIGHT>
+[[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
 </TMPL_IF>
-[[!meta author="<TMPL_VAR NAME="NAME" ESCAPE=HTML>"]]
-[[!meta authorurl="<TMPL_VAR NAME="URL" ESCAPE=HTML>"]]
+[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
+[[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]]
diff --git a/archivepage.tmpl b/archivepage.tmpl
index 6bc789d..93bdd9c 100644
--- a/archivepage.tmpl
+++ b/archivepage.tmpl
@@ -1,7 +1,19 @@
 <p>
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a><br />
+<TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a><br />
+</TMPL_IF>
 <i>
 Posted <TMPL_VAR CTIME>
+<TMPL_IF AUTHOR>
+by <span class="author">
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
 </i>
-
 </p>
diff --git a/atomitem.tmpl b/atomitem.tmpl
index 1ff7f4f..4ed17bc 100644
--- a/atomitem.tmpl
+++ b/atomitem.tmpl
@@ -1,42 +1,48 @@
 <entry>
 	<title><TMPL_VAR TITLE></title>
-	<TMPL_IF NAME="GUID">
-	  <id><TMPL_VAR GUID></id>
-	<TMPL_ELSE>
-	  <id><TMPL_VAR URL></id>
-	</TMPL_IF>
+<TMPL_IF GUID>
+	<id><TMPL_VAR GUID></id>
+<TMPL_ELSE>
+	<id><TMPL_VAR URL></id>
+</TMPL_IF>
 	<link href="<TMPL_VAR PERMALINK>"/>
-	<TMPL_IF NAME="AUTHOR">
-	 <author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
-	</TMPL_IF>
-	<TMPL_IF NAME="COPYRIGHT">
-	 <rights type="html" xml:lang="en">
-	   <TMPL_IF NAME="LICENSE">
-	    <TMPL_VAR LICENSE ESCAPE=HTML>
-	    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-	   <TMPL_ELSE>
-	    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-	   </TMPL_IF>
-	 </rights>
-	<TMPL_ELSE>
-	 <TMPL_IF NAME="LICENSE">
-	  <rights type="html" xml:lang="en">
-	    <TMPL_VAR LICENSE ESCAPE=HTML>
-	  </rights>
-	 </TMPL_IF>
-	</TMPL_IF>
-	<TMPL_IF NAME="CATEGORIES">
-	 <TMPL_LOOP NAME="CATEGORIES">
-	  <category term="<TMPL_VAR CATEGORY>" />
-	 </TMPL_LOOP>
-	</TMPL_IF>
+<TMPL_IF AUTHOR>
+	<author><name><TMPL_VAR AUTHOR ESCAPE=HTML></name></author>
+</TMPL_IF>
+<TMPL_IF COPYRIGHT>
+	<rights type="html" xml:lang="en">
+<TMPL_IF LICENSE>
+		<TMPL_VAR LICENSE ESCAPE=HTML>
+		<TMPL_VAR COPYRIGHT ESCAPE=HTML>
+<TMPL_ELSE>
+		<TMPL_VAR COPYRIGHT ESCAPE=HTML>
+</TMPL_IF>
+	</rights>
+<TMPL_ELSE>
+<TMPL_IF LICENSE>
+	<rights type="html" xml:lang="en">
+	<TMPL_VAR LICENSE ESCAPE=HTML>
+	</rights>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
+	<category term="<TMPL_VAR CATEGORY>" />
+</TMPL_LOOP>
+</TMPL_IF>
 	<updated><TMPL_VAR MDATE_3339></updated>
 	<published><TMPL_VAR CDATE_3339></published>
-	<TMPL_IF NAME="ENCLOSURE">
-	 <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
-	<TMPL_ELSE>
-	 <content type="html" xml:lang="en">
-	  <TMPL_VAR CONTENT ESCAPE=HTML>
-	 </content>
-	</TMPL_IF>
+<TMPL_IF ENCLOSURE>
+	<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
+<TMPL_ELSE>
+	<content type="html" xml:lang="en">
+	<TMPL_VAR CONTENT ESCAPE=HTML>
+	</content>
+</TMPL_IF>
+<TMPL_IF COMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR COMMENTSURL>" type="text/html" />
+</TMPL_IF>
+<TMPL_IF ATOMCOMMENTSURL>
+	<link rel="comments" href="<TMPL_VAR ATOMCOMMENTSURL>" type="application/atom+xml" />
+</TMPL_IF>
 </entry>
diff --git a/atompage.tmpl b/atompage.tmpl
index dcb89ab..e82b598 100644
--- a/atompage.tmpl
+++ b/atompage.tmpl
@@ -5,32 +5,32 @@
 <link href="<TMPL_VAR PAGEURL>"/>
 <link href="<TMPL_VAR FEEDURL>" rel="self" type="application/atom+xml"/>
 <author>
-<TMPL_IF NAME="AUTHOR">
- <name><TMPL_VAR AUTHOR></name>
+<TMPL_IF AUTHOR>
+<name><TMPL_VAR AUTHOR></name>
 <TMPL_ELSE>
- <name><TMPL_VAR WIKINAME></name>
+<name><TMPL_VAR WIKINAME></name>
 </TMPL_IF>
 </author>
-<TMPL_IF NAME="COPYRIGHT">
- <rights type="html" xml:lang="en">
-   <TMPL_IF NAME="LICENSE">
-    <TMPL_VAR LICENSE>
-    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-   <TMPL_ELSE>
-    <TMPL_VAR COPYRIGHT ESCAPE=HTML>
-   </TMPL_IF>
- </rights>
+<TMPL_IF COPYRIGHT>
+<rights type="html" xml:lang="en">
+<TMPL_IF LICENSE>
+	<TMPL_VAR LICENSE>
+	<TMPL_VAR COPYRIGHT ESCAPE=HTML>
 <TMPL_ELSE>
- <TMPL_IF NAME="LICENSE">
-  <rights type="html">
-    <TMPL_VAR LICENSE ESCAPE=HTML>
-  </rights>
- </TMPL_IF>
+	<TMPL_VAR COPYRIGHT ESCAPE=HTML>
 </TMPL_IF>
-<TMPL_IF NAME="GUID">
-  <id><TMPL_VAR GUID></id>
+</rights>
 <TMPL_ELSE>
-  <id><TMPL_VAR PAGEURL></id>
+<TMPL_IF LICENSE>
+<rights type="html">
+	<TMPL_VAR LICENSE ESCAPE=HTML>
+</rights>
+</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF GUID>
+<id><TMPL_VAR GUID></id>
+<TMPL_ELSE>
+<id><TMPL_VAR PAGEURL></id>
 </TMPL_IF>
 <subtitle type="html"><TMPL_VAR FEEDDESC ESCAPE=HTML></subtitle>
 <generator uri="http://ikiwiki.info/" version="<TMPL_VAR VERSION>">ikiwiki</generator>
diff --git a/autotag.tmpl b/autotag.tmpl
new file mode 100644
index 0000000..9162e9e
--- /dev/null
+++ b/autotag.tmpl
@@ -0,0 +1,4 @@
+[[!meta title="pages tagged <TMPL_VAR TAGNAME>"]]
+
+[[!inline pages="tagged(<TMPL_VAR TAG>)" actions="no" archive="yes"
+feedshow=10]]
diff --git a/blogpost.tmpl b/blogpost.tmpl
index 7eeede6..5a31e3f 100644
--- a/blogpost.tmpl
+++ b/blogpost.tmpl
@@ -1,10 +1,10 @@
 <form action="<TMPL_VAR CGIURL>" method="get">
 <div id="blogform">
-<TMPL_IF NAME="RSSURL">
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
+<TMPL_IF RSSURL>
+<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
 </TMPL_IF>
-<TMPL_IF NAME="ATOMURL">
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR NAME=ATOMURL>">Atom</a>
+<TMPL_IF ATOMURL>
+<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
 </TMPL_IF>
 <input type="hidden" name="do" value="blog" />
 <input type="hidden" name="from" value="<TMPL_VAR ROOTPAGE>" />
diff --git a/calendarmonth.tmpl b/calendarmonth.tmpl
new file mode 100644
index 0000000..23cd954
--- /dev/null
+++ b/calendarmonth.tmpl
@@ -0,0 +1,5 @@
+[[!sidebar content="""
+[[!calendar type=month month=<TMPL_VAR MONTH> year=<TMPL_VAR YEAR> pages="<TMPL_VAR PAGESPEC>"]]
+"""]]
+
+[[!inline pages="creation_month(<TMPL_VAR MONTH>) and creation_year(<TMPL_VAR YEAR>) and <TMPL_VAR PAGESPEC>" show=0 feeds=no reverse=yes]]
diff --git a/calendaryear.tmpl b/calendaryear.tmpl
new file mode 100644
index 0000000..714bd6d
--- /dev/null
+++ b/calendaryear.tmpl
@@ -0,0 +1 @@
+[[!calendar type=year year=<TMPL_VAR YEAR> pages="<TMPL_VAR PAGESPEC>"]]
diff --git a/change.tmpl b/change.tmpl
index 4a99cf5..671b9e4 100644
--- a/change.tmpl
+++ b/change.tmpl
@@ -2,12 +2,15 @@
 <TMPL_IF AUTHORURL>
 [[!meta authorurl="""<TMPL_VAR AUTHORURL>"""]]
 </TMPL_IF>
-[[!meta title="""change to<TMPL_LOOP NAME="PAGES"> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
-<div class="metadata">
+[[!meta title="""change to<TMPL_LOOP PAGES> <TMPL_VAR PAGE></TMPL_LOOP> on <TMPL_VAR WIKINAME>"""]]
+<TMPL_IF PERMALINK>
+[[!meta permalink="<TMPL_VAR PERMALINK>"]]
+</TMPL_IF>
+<div id="change-<TMPL_VAR REV>" class="metadata">
 <span class="desc"><br />Changed pages:</span>
 <span class="pagelinks">
-<TMPL_LOOP NAME="PAGES">
-<TMPL_IF NAME="DIFFURL"><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
+<TMPL_LOOP PAGES>
+<TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
 <TMPL_ELSE>
 <TMPL_VAR LINK>
 </TMPL_IF>
@@ -15,8 +18,8 @@
 </span>
 <span class="desc"><br />Changed by:</span>
 <span class="committer">
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR USER></a>
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>" rel="nofollow"><TMPL_VAR USER></a>
 <TMPL_ELSE>
 <TMPL_VAR USER>
 </TMPL_IF>
@@ -26,17 +29,17 @@
 <span class="desc"><br />Date:</span>
 <span class="changedate"><TMPL_VAR COMMITDATE></span>
 </div>
-<div class=changelog>
-<TMPL_LOOP NAME="MESSAGE">
-<TMPL_IF NAME="LINE">
-<TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
+<div class="changelog">
+<TMPL_LOOP MESSAGE>
+<TMPL_IF LINE>
+<TMPL_VAR LINE><br />
 </TMPL_IF>
 </TMPL_LOOP>
 </div>
-<TMPL_IF NAME="DIFF">
-<div class=diff>
+<TMPL_IF DIFF>
+<div class="diff">
 <pre>
-<TMPL_VAR NAME="DIFF" ESCAPE="HTML">
+<TMPL_VAR DIFF>
 </pre>
 </div>
 </TMPL_IF>
diff --git a/comment.tmpl b/comment.tmpl
new file mode 100644
index 0000000..c2ee5a3
--- /dev/null
+++ b/comment.tmpl
@@ -0,0 +1,61 @@
+<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>">
+<TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF>
+
+<TMPL_IF HTML5><header class="comment-subject"><TMPL_ELSE><div class="comment-subject"></TMPL_IF>
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<TMPL_VAR TITLE>
+</TMPL_IF>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
+<TMPL_VAR CONTENT>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HTML5><header class="comment-header"><TMPL_ELSE><div class="comment-header"></TMPL_IF>
+<TMPL_IF COMMENTUSER>
+Comment by
+<TMPL_IF COMMENTOPENID>
+<span class="author" title="OpenID">
+<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a>
+</span>
+<TMPL_ELSE>
+<span class="author" title="Signed in">
+<TMPL_IF COMMENTAUTHORURL>
+<a href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR COMMENTAUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+<TMPL_ELSE>
+<TMPL_IF AUTHOR>
+Comment by
+<TMPL_IF COMMENTIP>
+<span class="author" title="Unauthenticated, from <TMPL_VAR COMMENTIP>">
+<TMPL_ELSE>
+<span class="author" title="Unauthenticated, from unknown IP address">
+</TMPL_IF>
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+&mdash; <TMPL_VAR CTIME>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
+
+<TMPL_IF HAVE_ACTIONS>
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
+<ul>
+<TMPL_IF REMOVEURL>
+<li><a href="<TMPL_VAR REMOVEURL>" rel="nofollow">Remove comment</a></li>
+</TMPL_IF>
+</ul>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
diff --git a/commentmoderation.tmpl b/commentmoderation.tmpl
new file mode 100644
index 0000000..dfa63c2
--- /dev/null
+++ b/commentmoderation.tmpl
@@ -0,0 +1,32 @@
+<TMPL_IF COMMENTS>
+<br />
+<form action="<TMPL_VAR CGIURL>" method="post">
+<input type="hidden" name="do" value="commentmoderation" />
+<input type="hidden" name="sid" value="<TMPL_VAR SID>" />
+<input type="submit" value="Submit" />
+<input id="rejectalldefer" type="checkbox" name="rejectalldefer" value="1" />
+<label for="rejectalldefer">Reject all comments marked <em>Defer</em></label>
+<br />
+<TMPL_LOOP COMMENTS>
+<div>
+<div>
+<TMPL_VAR VIEW>
+</div>
+<input id="defer_<TMPL_VAR ID>" type="radio" value="Defer" name="<TMPL_VAR ID>" checked="checked" />
+<label for="defer_<TMPL_VAR ID>">Defer</label>
+<input id="dccept_<TMPL_VAR ID>" type="radio" value="Accept" name="<TMPL_VAR ID>" />
+<label for="dccept_<TMPL_VAR ID>">Accept</label>
+<input id="reject_<TMPL_VAR ID>" type="radio" value="Reject" name="<TMPL_VAR ID>" />
+<label for="reject_<TMPL_VAR ID>">Reject</label>
+</div>
+<br />
+</TMPL_LOOP>
+<input type="submit" value="Submit" />
+<input id="rejectalldefer2" type="checkbox" name="rejectalldefer" value="1" />
+<label for="rejectalldefer2">Reject all comments marked <em>Defer</em></label>
+</form>
+<TMPL_ELSE>
+<p>
+No comments need moderation at this time.
+</p>
+</TMPL_IF>
diff --git a/editcomment.tmpl b/editcomment.tmpl
new file mode 100644
index 0000000..a2edc69
--- /dev/null
+++ b/editcomment.tmpl
@@ -0,0 +1,39 @@
+<div class="editcomment">
+<TMPL_VAR MESSAGE>
+<br />
+<TMPL_VAR FORM-START>
+<TMPL_VAR FIELD-DO>
+<TMPL_VAR FIELD-SID>
+<TMPL_VAR FIELD-PAGE>
+<TMPL_UNLESS NAME=USERNAME>
+<TMPL_IF NAME=ALLOWAUTHOR>
+<label for="author" class="block">Name:</label>
+<TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>)
+<br/>
+<label for="url" class="block">Website:</label>
+<TMPL_VAR NAME=FIELD-URL> (optional)
+<br />
+<TMPL_ELSE>
+(You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?)
+<br />
+</TMPL_IF>
+</TMPL_UNLESS>
+<label for="subject" class="block">Subject:</label>
+<TMPL_VAR FIELD-SUBJECT><br />
+<label for="editcontent" class="block">Comment:</label>
+<TMPL_VAR FIELD-EDITCONTENT><br />
+<TMPL_VAR FORM-SUBMIT> <TMPL_VAR FIELD-TYPE> <TMPL_VAR HELPONFORMATTINGLINK><br />
+<TMPL_VAR NAME="FORM-END">
+<TMPL_VAR WMD_PREVIEW>
+
+<TMPL_IF NAME="PAGE_PREVIEW">
+<hr />
+<div class="header">
+<span>Comment preview:</span>
+</div><!-- .header -->
+<div id="preview">
+<TMPL_VAR PAGE_PREVIEW>
+</div><!-- #preview -->
+</TMPL_IF>
+
+</div><!-- .editcomment -->
diff --git a/editpage.tmpl b/editpage.tmpl
index 4b54db2..d6ad806 100644
--- a/editpage.tmpl
+++ b/editpage.tmpl
@@ -1,6 +1,6 @@
-<br />
 <TMPL_VAR JAVASCRIPT>
 <TMPL_VAR MESSAGE>
+<br />
 <TMPL_VAR FORM-START>
 <TMPL_VAR FIELD-DO>
 <TMPL_VAR FIELD-SID>
@@ -8,17 +8,18 @@
 <TMPL_VAR FIELD-RCSINFO>
 <TMPL_VAR FIELD-NEWFILE>
 <TMPL_IF NAME="PAGE_SELECT">
-Page location: <TMPL_VAR FIELD-PAGE>
-Page type: <TMPL_VAR FIELD-TYPE>
+<label for="page" class="inline">Page location:</label><TMPL_VAR FIELD-PAGE>
+<label for="type" class="inline">Page type:</label><TMPL_VAR FIELD-TYPE>
 <TMPL_ELSE>
-<br />
 <TMPL_VAR FIELD-PAGE>
 <TMPL_VAR FIELD-TYPE>
 </TMPL_IF>
+<div class="editcontentdiv">
 <TMPL_VAR FIELD-EDITCONTENT><br />
+</div>
 <TMPL_IF NAME="CAN_COMMIT">
-Optional comment about this change:<br />
-<TMPL_VAR FIELD-COMMENTS><br />
+<label for="editmessage" class="block">Optional comment about this change:</label>
+<TMPL_VAR FIELD-EDITMESSAGE><br />
 </TMPL_IF>
 <TMPL_VAR FORM-SUBMIT>
 <TMPL_VAR HELPONFORMATTINGLINK>
@@ -37,6 +38,7 @@ Optional comment about this change:<br />
 </div>
 </TMPL_IF>
 <TMPL_VAR FORM-END>
+<TMPL_VAR WMD_PREVIEW>
 
 <TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
@@ -47,3 +49,12 @@ Optional comment about this change:<br />
 <TMPL_VAR PAGE_PREVIEW>
 </div>
 </TMPL_IF>
+<TMPL_IF NAME="PAGE_DIFF">
+<hr />
+<div class="header">
+<span>Diff:</span>
+</div>
+<div id="diff">
+<TMPL_VAR PAGE_DIFF>
+</div>
+</TMPL_IF>
diff --git a/feedlink.tmpl b/feedlink.tmpl
index 2963156..be8637f 100644
--- a/feedlink.tmpl
+++ b/feedlink.tmpl
@@ -1,8 +1,8 @@
 <div id="feedlink">
-<TMPL_IF NAME="RSSURL">
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR NAME=RSSURL>">RSS</a>
+<TMPL_IF RSSURL>
+<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
 </TMPL_IF>
-<TMPL_IF NAME="ATOMURL">
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR NAME=ATOMURL>">Atom</a>
+<TMPL_IF ATOMURL>
+<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
 </TMPL_IF>
 </div>
diff --git a/googleform.tmpl b/googleform.tmpl
index 523cff0..9468e06 100644
--- a/googleform.tmpl
+++ b/googleform.tmpl
@@ -1,6 +1,8 @@
+
 <form method="get" action="http://www.google.com/search" id="searchform">
  <div>
-  <input name="sitesearch" value="<TMPL_VAR SITEFQDN>" type="hidden">
-  <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text">
+  <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> />
  </div>
 </form>
diff --git a/inlinepage.tmpl b/inlinepage.tmpl
index ffcb897..b0b53d0 100644
--- a/inlinepage.tmpl
+++ b/inlinepage.tmpl
@@ -1,43 +1,41 @@
-<div class="inlinepage">
+<TMPL_IF HTML5><article class="inlinepage"><TMPL_ELSE><div class="inlinepage"></TMPL_IF>
 
-<div class="inlineheader">
-
-<TMPL_IF NAME="AUTHOR">
+<TMPL_IF HTML5><section class="inlineheader"><TMPL_ELSE><div class="inlineheader"></TMPL_IF>
+<TMPL_IF AUTHOR>
 <span class="author">
-<TMPL_IF NAME="AUTHORURL">
-<a href="<TMPL_VAR NAME=AUTHORURL>"><TMPL_VAR NAME=AUTHOR></a>
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
 <TMPL_ELSE>
-<TMPL_VAR NAME=AUTHOR>
+<TMPL_VAR AUTHOR>
 </TMPL_IF>
 </span>
 </TMPL_IF>
-<span class="header">
-<TMPL_IF NAME="PERMALINK">
+<TMPL_IF HTML5><header class="header"><TMPL_ELSE><span class="header"></TMPL_IF>
+<TMPL_IF PERMALINK>
 <a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
 <TMPL_ELSE>
 <a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
 </TMPL_IF>
-</span>
-
-</div><!--.inlineheader-->
+<TMPL_IF HTML5></header><TMPL_ELSE></span></TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div class="inlinecontent">
+<TMPL_IF HTML5><section class="inlinecontent"><TMPL_ELSE><div class="inlinecontent"></TMPL_IF>
 <TMPL_VAR CONTENT>
-</div><!--.inlinecontent-->
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
-<div class="inlinefooter">
+<TMPL_IF HTML5><footer class="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF>
 
 <span class="pagedate">
 Posted <TMPL_VAR CTIME>
 </span>
 
-<TMPL_IF NAME="TAGS">
-<span class="tags">
+<TMPL_IF TAGS>
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><span class="tags"></TMPL_IF>
 Tags:
-<TMPL_LOOP NAME="TAGS">
-<TMPL_VAR NAME=LINK>
+<TMPL_LOOP TAGS>
+<TMPL_VAR LINK>
 </TMPL_LOOP>
-</span>
+<TMPL_IF HTML5></nav><TMPL_ELSE></span></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF COPYRIGHT>
@@ -52,19 +50,23 @@ License: <TMPL_VAR LICENSE>
 </div>
 </TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HAVE_ACTIONS>
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="EDITURL">
+<TMPL_IF EDITURL>
 <li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="DISCUSSIONLINK">
+<TMPL_IF COMMENTSLINK>
+<li><TMPL_VAR COMMENTSLINK></li>
+<TMPL_ELSE>
+<TMPL_IF DISCUSSIONLINK>
 <li><TMPL_VAR DISCUSSIONLINK></li>
 </TMPL_IF>
+</TMPL_IF>
 </ul>
-</div><!--.actions-->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-</div><!--.inlinefooter-->
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
-</div><!--.inlinepage-->
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
diff --git a/microblog.tmpl b/microblog.tmpl
new file mode 100644
index 0000000..e22d65c
--- /dev/null
+++ b/microblog.tmpl
@@ -0,0 +1,22 @@
+<div class="microblog">
+
+<div class="inlinecontent">
+<TMPL_VAR CONTENT>
+</div>
+
+<div class="microblog-header">
+
+<TMPL_IF AUTHOR>
+<span class="author">
+<TMPL_IF AUTHORURL>
+<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a>
+<TMPL_ELSE>
+<TMPL_VAR AUTHOR>
+</TMPL_IF>
+</span>
+</TMPL_IF>
+
+&mdash; <TMPL_VAR CTIME>
+
+</div> <!--.microblog-header-->
+</div> <!--.microblog-->
diff --git a/misc.tmpl b/misc.tmpl
deleted file mode 100644
index f902c81..0000000
--- a/misc.tmpl
+++ /dev/null
@@ -1,71 +0,0 @@
-<!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">
-<head>
-<TMPL_IF NAME="FORCEBASEURL">
-<base href="<TMPL_VAR FORCEBASEURL>" />
-<TMPL_ELSE>
-<base href="<TMPL_VAR BASEURL>" />
-</TMPL_IF>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title><TMPL_VAR TITLE></title>
-<link rel="stylesheet" href="<TMPL_VAR BASEURL>nn4.css" type="text/css" media="screen" />
-<!--link before import prevents Flash Of Unstyled Content in ie6pc -->
-<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>real.css");</style>
-<!-- import with quotes and brackets hides css from:
-Netscape 4.x
-Win IE 3
-Win IE 4
-Mac IE 4.01
-Mac IE 4.5
-Konqueror 2.1.2
-Win Amaya 5.1
-isn't that nice to know? -->
-<!-- Source of above: http://www.thenoodleincident.com/tutorials/typography/ -->
-<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>style.css");</style>
-<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>local.css");</style>
-<TMPL_IF NAME="FAVICON">
-<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
-</TMPL_IF>
-</head>
-<body>
-
-<div id="container">
-
-<TMPL_IF NAME="BRANDING_LOGO_TEXT">
-<div id="branding">
-<div id="branding-logo">
-<TMPL_IF NAME="BRANDING_LOGO">
-<a href="<TMPL_VAR BASEURL>"><img src="<TMPL_VAR BASEURL><TMPL_VAR NAME=BRANDING_LOGO>" alt="<TMPL_VAR NAME=BRANDING_LOGO_TEXT>" /></a>
-<TMPL_ELSE>
-<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=BRANDING_LOGO_TEXT></a>
-</TMPL_IF>
-</div>
-<TMPL_IF NAME="BRANDING_LOGO_TAGLINE">
-<div id="branding-tagline">
-<a href="<TMPL_VAR BASEURL>"><TMPL_VAR NAME=BRANDING_LOGO_TAGLINE></a>
-</div>
-</TMPL_IF>
-</div>
-</TMPL_IF>
-
-<div class="header">
-<span>
-<TMPL_VAR INDEXLINK>/ <TMPL_VAR TITLE>
-</span>
-</div>
-
-<div id="wrapper">
-<div id="content">
-<TMPL_VAR PAGEBODY>
-</div>
-</div>
-
-<div id="footer">
-<!-- from <TMPL_VAR NAME=WIKINAME> -->
-</div>
-
-</div><!-- #container -->
-
-</body>
-</html>
diff --git a/openid-selector.tmpl b/openid-selector.tmpl
new file mode 100644
index 0000000..0659ee5
--- /dev/null
+++ b/openid-selector.tmpl
@@ -0,0 +1,43 @@
+<script type="text/javascript" src="ikiwiki/openid/jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+	openid.init('openid_identifier','<TMPL_IF NONOPENIDFORM>nonopenidform</TMPL_IF>');
+});
+</script>
+
+<noscript>
+<h2>OpenID:</h2>
+</noscript>
+
+<form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
+	<fieldset>
+		<script>
+		$('fieldset').append("<legend>Select your account provider</legend>");
+		</script>
+		
+		<input type="hidden" name="do" value="signin" />
+		<input type="hidden" name="action" value="verify" />
+		<div id="openid_choice">
+			<div id="openid_btns"></div>
+		</div>
+		<div id="openid_input_area">
+			<label for="openid_identifier" class="block">Enter your OpenID:</label>
+			<input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/>
+			<input id="openid_submit" type="submit" value="Login"/>
+		</div>
+		<TMPL_IF OPENID_ERROR>
+		<div class="error"><TMPL_VAR OPENID_ERROR></div>
+		</TMPL_IF>
+	</fieldset>
+</form>
+
+<div id="nonopenidform">
+<TMPL_IF NONOPENIDFORM>
+<br />
+<noscript>
+<h2>Other:</h2>
+</noscript>
+</TMPL_IF>
+<TMPL_VAR NONOPENIDFORM>
+</div>
diff --git a/page.tmpl b/page.tmpl
index be90767..579af56 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -1,10 +1,19 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<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>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<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_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 NAME="FAVICON">
+<TMPL_IF FAVICON>
 <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 </TMPL_IF>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>nn4.css" type="text/css" media="screen" />
@@ -21,18 +30,23 @@ Win Amaya 5.1
 isn't that nice to know? -->
 <!-- Source of above: http://www.thenoodleincident.com/tutorials/typography/ -->
 <style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>style.css");</style>
+<TMPL_IF LOCAL_CSS>
+<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>");</style>
+<TMPL_ELSE>
 <style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>local.css");</style>
-<TMPL_IF NAME="EDITURL">
+</TMPL_IF>
+<TMPL_IF EDITURL>
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
-<TMPL_IF NAME="FEEDLINKS"><TMPL_VAR FEEDLINKS></TMPL_IF>
-<TMPL_IF NAME="META"><TMPL_VAR META></TMPL_IF>
+<TMPL_IF FEEDLINKS><TMPL_VAR FEEDLINKS></TMPL_IF>
+<TMPL_IF RELVCS><TMPL_VAR RELVCS></TMPL_IF>
+<TMPL_IF META><TMPL_VAR META></TMPL_IF>
 </head>
 <body>
 
-<div id="container">
+<TMPL_IF HTML5><article class="page"><TMPL_ELSE><div class="page"></TMPL_IF>
 
-<div class="pageheader">
+<TMPL_IF HTML5><section class="pageheader"><TMPL_ELSE><div class="pageheader"></TMPL_IF>
 
 <TMPL_IF NAME="BRANDING_LOGO_TEXT">
 <div id="branding">
@@ -51,91 +65,135 @@ isn't that nice to know? -->
 </div>
 </TMPL_IF>
 
-<div class="header">
+<TMPL_IF HTML5><header class="header"><TMPL_ELSE><div class="header"></TMPL_IF>
 <span>
 <span class="parentlinks">
-<TMPL_LOOP NAME="PARENTLINKS">
-<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>/ 
+<TMPL_LOOP PARENTLINKS>
+<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>/ 
 </TMPL_LOOP>
 </span>
 <span class="title">
 <TMPL_VAR TITLE>
+<TMPL_IF ISTRANSLATION>
+&nbsp;(<TMPL_VAR PERCENTTRANSLATED>%)
+</TMPL_IF>
+</span>
 </span>
-</span><!--.header-->
-<TMPL_IF NAME="SEARCHFORM">
+<TMPL_IF SEARCHFORM>
 <TMPL_VAR SEARCHFORM>
 </TMPL_IF>
-</div>
+<TMPL_IF HTML5></header><TMPL_ELSE></div></TMPL_IF>
 
-<TMPL_IF NAME="HAVE_ACTIONS">
-<div class="actions">
+<TMPL_IF HAVE_ACTIONS>
+<TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF NAME="RECENTCHANGESURL">
+<TMPL_IF RECENTCHANGESURL>
 <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="HISTORYURL">
+<TMPL_IF HISTORYURL>
 <li><a href="<TMPL_VAR HISTORYURL>">History</a></li>
 </TMPL_IF>
-<TMPL_IF NAME="DISCUSSIONLINK">
-<li><TMPL_VAR DISCUSSIONLINK><br /></li>
+<TMPL_IF GETSOURCEURL>
+<li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li>
+</TMPL_IF>
+<TMPL_IF COMMENTSLINK>
+<li><TMPL_VAR COMMENTSLINK></li>
+<TMPL_ELSE>
+<TMPL_IF DISCUSSIONLINK>
+<li><TMPL_VAR DISCUSSIONLINK></li>
+</TMPL_IF>
 </TMPL_IF>
 </ul>
-</div>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF OTHERLANGUAGES>
+<TMPL_IF HTML5><nav id="otherlanguages"><TMPL_ELSE><div id="otherlanguages"></TMPL_IF>
+<ul>
+<TMPL_LOOP OTHERLANGUAGES>
+<li>
+<a href="<TMPL_VAR URL>"><TMPL_VAR LANGUAGE></a>
+<TMPL_IF MASTER>
+(master)
+<TMPL_ELSE>
+&nbsp;(<TMPL_VAR PERCENT>%)
 </TMPL_IF>
-</div> <!-- .pageheader -->
+</li>
+</TMPL_LOOP>
+</ul>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
 <TMPL_IF TOPBAR>
-<div id="topbar">
+<div class="topbar">
 <TMPL_VAR TOPBAR>
 </div>
 </TMPL_IF>
 
-<div id="wrapper">
-<div id="content">
+<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_IF COMMENTS>
+<TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
+<TMPL_VAR COMMENTS>
+<TMPL_IF ADDCOMMENTURL>
+<div class="addcomment">
+<a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
 </div>
+<TMPL_ELSE>
+<div class="addcomment">Comments on this page are closed.</div>
+</TMPL_IF>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
 </div>
 
 <TMPL_IF SIDEBAR>
-<div id="sidebar">
+<TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
 <TMPL_VAR SIDEBAR>
-</div>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF FARBAR>
-<div id="farbar">
+<TMPL_IF HTML5><aside class="farbar"><TMPL_ELSE><div class="farbar"></TMPL_IF>
 <TMPL_VAR FARBAR>
-</div>
+<TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<div id="footer" class="pagefooter">
-<div id="pageinfo">
+<TMPL_IF HTML5><footer id="footer" class="pagefooter"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF>
+<TMPL_UNLESS DYNAMIC>
+<TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF>
 
-<TMPL_IF NAME="TAGS">
-<div class="tags">
+<TMPL_IF TAGS>
+<TMPL_IF HTML5><nav class="tags"><TMPL_ELSE><div class="tags"></TMPL_IF>
 Tags:
-<TMPL_LOOP NAME="TAGS">
-<TMPL_VAR NAME=LINK>
+<TMPL_LOOP TAGS>
+<TMPL_VAR LINK>
 </TMPL_LOOP>
-</div>
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
-<TMPL_IF NAME="BACKLINKS">
-<div id="backlinks">
+<TMPL_IF BACKLINKS>
+<TMPL_IF HTML5><nav id="backlinks"><TMPL_ELSE><div id="backlinks"></TMPL_IF>
 Links:
-<TMPL_LOOP NAME="BACKLINKS">
-<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
+<TMPL_LOOP BACKLINKS>
+<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
-<TMPL_IF NAME="MORE_BACKLINKS">
+<TMPL_IF MORE_BACKLINKS>
 <span class="popup">...
 <span class="balloon">
-<TMPL_LOOP NAME="MORE_BACKLINKS">
-<a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=PAGE></a>
+<TMPL_LOOP MORE_BACKLINKS>
+<a href="<TMPL_VAR URL>"><TMPL_VAR PAGE></a>
 </TMPL_LOOP>
 </span>
 </span>
 </TMPL_IF>
-</div><!-- #backlinks -->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
 <TMPL_IF COPYRIGHT>
@@ -153,16 +211,17 @@ License: <TMPL_VAR LICENSE>
 </TMPL_IF>
 
 <div class="pagedate">
-Last edited <TMPL_VAR NAME=MTIME>
-<!-- Created <TMPL_VAR NAME=CTIME> -->
+Last edited <TMPL_VAR MTIME>
+<!-- Created <TMPL_VAR CTIME> -->
 </div>
 
-</div><!-- #pageinfo -->
+<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 <TMPL_IF EXTRAFOOTER><TMPL_VAR EXTRAFOOTER></TMPL_IF>
-<!-- from <TMPL_VAR NAME=WIKINAME> -->
-</div><!-- .pagefooter #footer -->
+</TMPL_UNLESS>
+<!-- from <TMPL_VAR WIKINAME> -->
+<TMPL_IF HTML5></footer><TMPL_ELSE></div></TMPL_IF>
 
-</div><!-- #container -->
+<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
 
 </body>
 </html>
diff --git a/pocreatepage.tmpl b/pocreatepage.tmpl
new file mode 100644
index 0000000..f22ee50
--- /dev/null
+++ b/pocreatepage.tmpl
@@ -0,0 +1,3 @@
+<p>
+<b>WARNING</b> this page must be written in <TMPL_VAR LANG>.
+</p>
diff --git a/renamesummary.tmpl b/renamesummary.tmpl
index 60f81b3..7a8dc92 100644
--- a/renamesummary.tmpl
+++ b/renamesummary.tmpl
@@ -11,14 +11,14 @@
 <TMPL_IF FIXEDLINKS>
 The following pages have been automatically modified to update their links to <TMPL_VAR DEST>:
 <ul>
-<TMPL_LOOP NAME=FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
+<TMPL_LOOP FIXEDLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
 </TMPL_IF>
 <TMPL_IF BROKENLINKS_CHECKED>
 <TMPL_IF BROKENLINKS>
 The following pages still link to <TMPL_VAR SRC>:
 <ul>
-<TMPL_LOOP NAME=BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
+<TMPL_LOOP BROKENLINKS><li><TMPL_VAR PAGE></li></TMPL_LOOP>
 </ul>
 </TMPL_IF>
 </TMPL_IF>
diff --git a/rssitem.tmpl b/rssitem.tmpl
index 42936a6..a64a4eb 100644
--- a/rssitem.tmpl
+++ b/rssitem.tmpl
@@ -1,26 +1,29 @@
 <item>
-	<TMPL_IF NAME="AUTHOR">
+<TMPL_IF AUTHOR>
 	<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
 	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
-	<TMPL_ELSE>
+<TMPL_ELSE>
 	<title><TMPL_VAR TITLE></title>
-	</TMPL_IF>
-	<TMPL_IF NAME="GUID">
-	  <guid isPermaLink="no"><TMPL_VAR GUID></guid>
-	<TMPL_ELSE>
-	  <guid><TMPL_VAR URL></guid>
-	</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF GUID>
+	<guid isPermaLink="no"><TMPL_VAR GUID></guid>
+<TMPL_ELSE>
+	<guid><TMPL_VAR URL></guid>
+</TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
-	<TMPL_IF NAME="CATEGORIES">
-	<TMPL_LOOP NAME="CATEGORIES">
+<TMPL_IF CATEGORIES>
+<TMPL_LOOP CATEGORIES>
 	<category><TMPL_VAR CATEGORY></category>
-	</TMPL_LOOP>
-	</TMPL_IF>
+</TMPL_LOOP>
+</TMPL_IF>
 	<pubDate><TMPL_VAR CDATE_822></pubDate>
 	<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
-	<TMPL_IF NAME="ENCLOSURE">
+<TMPL_IF ENCLOSURE>
 	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
-	<TMPL_ELSE>
+<TMPL_ELSE>
 	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
-	</TMPL_IF>
+</TMPL_IF>
+<TMPL_IF COMMENTSURL>
+	<comments><TMPL_VAR COMMENTSURL></comments>
+</TMPL_IF>
 </item>
diff --git a/searchform.tmpl b/searchform.tmpl
index afae2eb..cb65d12 100644
--- a/searchform.tmpl
+++ b/searchform.tmpl
@@ -1,5 +1,6 @@
 <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform">
 <div>
-<input type="text" id="searchbox" name="P" value="" size="16" />
+<input type="text" id="searchbox" name="P" value="" size="16"
+<TMPL_IF HTML5>placeholder="search"</TMPL_IF> />
 </div>
 </form>
diff --git a/searchquery.tmpl b/searchquery.tmpl
index 782b12c..5b9fbbf 100644
--- a/searchquery.tmpl
+++ b/searchquery.tmpl
@@ -33,7 +33,7 @@ $def{NEXT,$if{$ne{$last,$msize},<INPUT TYPE=submit NAME="&gt;" VALUE="Next">}}
 
 <FORM NAME=P METHOD=GET 
 ACTION="$html{$env{CGIURL}}" TARGET="_top">
-<center>
+<div style="text-align:center">
 <INPUT NAME=P VALUE="$html{$query}" SIZE=65>
 <INPUT TYPE=SUBMIT VALUE="Search">
 $env{HELPLINK}
@@ -54,7 +54,7 @@ $if{$not{$msizeexact},
   $nice{$add{$topdoc,1}}$if{$ne{$add{$topdoc,1},$last},-$nice{$last}} of exactly $nice{$msize} matches}
 }
 <hr>
-</center>
+</div>
 $list{$map{$queryterms,$list{$html{$uniq{$unstem{$_}}},<b>,</b>/<b>,</b>}:&nbsp;$nice{$freq{$_}}},Term frequencies: ,$. ,}
 <br><small>Search took $time seconds</small>
 <table>
@@ -77,8 +77,9 @@ $percentage% relevant$. matching:
 <i>$list{$map{$terms,$html{$prettyterm{$_}}},$. ,</i> and <i>}</i></small>${for lynx:}<p></td></tr>}
 </table>
 
-<br><center>
+<br />
 
+<div style="text-align:center">
 ${suppress next, prev, and page links if there's only one page}
 $if{$ne{$lastpage,1},
 $set{a,$if{$opt{pagelink_height}, HEIGHT=$opt{pagelink_height}}$if{$opt{pagelink_width}, WIDTH=$opt{pagelink_width}}}
@@ -97,7 +98,7 @@ $if{$ne{$opt{y},$lastpage},...}
 $NEXT
 }
 }}
-</center><br>
+</div><br />
 $if{$dbname,<INPUT TYPE=hidden NAME=DB VALUE="$html{$dbname}">}
 $if{$ne{$topdoc,0},<INPUT TYPE=hidden NAME=TOPDOC VALUE=$topdoc>}
 $if{$ne{$hitsperpage,10},<INPUT TYPE=hidden NAME=HITSPERPAGE VALUE=$hitsperpage>}
diff --git a/titlepage.tmpl b/titlepage.tmpl
index f5cd5bc..6326bab 100644
--- a/titlepage.tmpl
+++ b/titlepage.tmpl
@@ -1 +1,7 @@
-<p><a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a></p>
+<p>
+<TMPL_IF PERMALINK>
+<a href="<TMPL_VAR PERMALINK>"><TMPL_VAR TITLE></a>
+<TMPL_ELSE>
+<a href="<TMPL_VAR PAGEURL>"><TMPL_VAR TITLE></a>
+</TMPL_IF>
+</p>