Sync with ikiwiki 3.20130904.1.

author: Jonas Smedegaard <dr@jones.dk> 2013-10-09 14:04:09 +0200
committer: Jonas Smedegaard <dr@jones.dk> 2013-10-09 14:04:09 +0200
commit: 67b676bd50fb475c3b6c314942be14b4677e426b (patch)
tree: 83aae0ffb1aa7a8c2cce0241ebc720f543d0d31d
parent: 32379c9538d54499f62d03ed310cdabb31a81de6 (diff)
8 files changed, 53 insertions, 13 deletions
diff --git a/aggregatepost.tmpl b/aggregatepost.tmpl
index 4e89efe..a89ccfc 100644
--- a/aggregatepost.tmpl
+++ b/aggregatepost.tmpl
@@ -11,5 +11,9 @@
 <TMPL_IF COPYRIGHT>
 [[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
 </TMPL_IF>
+<TMPL_IF AUTHOR>
+[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>: <TMPL_VAR AUTHOR ESCAPE=HTML>"]]
+<TMPL_ELSE>
 [[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
+</TMPL_IF>
 [[!meta authorurl="<TMPL_VAR URL ESCAPE=HTML>"]]
diff --git a/archivepage.tmpl b/archivepage.tmpl
index 93bdd9c..3e0bd9b 100644
--- a/archivepage.tmpl
+++ b/archivepage.tmpl
@@ -1,10 +1,10 @@
-<p>
+<div class="archivepage">
 <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>
+<span class="archivepagedate">
 Posted <TMPL_VAR CTIME>
 <TMPL_IF AUTHOR>
 by <span class="author">
@@ -15,5 +15,5 @@ by <span class="author">
 </TMPL_IF>
 </span>
 </TMPL_IF>
-</i>
-</p>
+</span>
+</div>
diff --git a/atomitem.tmpl b/atomitem.tmpl
index 4ed17bc..9b056e0 100644
--- a/atomitem.tmpl
+++ b/atomitem.tmpl
@@ -34,11 +34,12 @@
 	<published><TMPL_VAR CDATE_3339></published>
 <TMPL_IF ENCLOSURE>
 	<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
-<TMPL_ELSE>
+</TMPL_IF>
+<TMPL_UNLESS SIMPLEPODCAST>
 	<content type="html" xml:lang="en">
 	<TMPL_VAR CONTENT ESCAPE=HTML>
 	</content>
-</TMPL_IF>
+</TMPL_UNLESS>
 <TMPL_IF COMMENTSURL>
 	<link rel="comments" href="<TMPL_VAR COMMENTSURL>" type="text/html" />
 </TMPL_IF>
diff --git a/change.tmpl b/change.tmpl
index d7ec908..cb02222 100644
--- a/change.tmpl
+++ b/change.tmpl
@@ -9,6 +9,11 @@
 <div id="change-<TMPL_VAR REV>" class="metadata">
 <span class="desc"><br />Changed pages:</span>
 <span class="pagelinks">
+<TMPL_UNLESS HAS_DIFFURL>
+<TMPL_IF DIFF>
+<a href="#diff-<TMPL_VAR REV>" class="toggle" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a>
+</TMPL_IF>
+</TMPL_UNLESS>
 <TMPL_LOOP PAGES>
 <TMPL_IF DIFFURL><a href="<TMPL_VAR DIFFURL>" title="diff" rel="nofollow">[[diff|wikiicons/diff.png]]</a><TMPL_VAR LINK>
 <TMPL_ELSE><TMPL_VAR LINK></TMPL_IF>
@@ -39,7 +44,11 @@
 </TMPL_LOOP>
 </div>
 <TMPL_IF DIFF>
+<TMPL_IF HAS_DIFFURL>
 <div class="diff">
+<TMPL_ELSE>
+<div class="toggleable" id="diff-<TMPL_VAR REV>">
+</TMPL_IF>
 <pre>
 <TMPL_VAR DIFF>
 </pre>
diff --git a/inlinepage.tmpl b/inlinepage.tmpl
index b0b53d0..37d7e48 100644
--- a/inlinepage.tmpl
+++ b/inlinepage.tmpl
@@ -23,6 +23,12 @@
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_IF ENCLOSURE>
+<TMPL_IF HTML5><section id="inlineenclosure"><TMPL_ELSE><div id="inlineenclosure"></TMPL_IF>
+<a href="<TMPL_VAR ENCLOSURE>">Download</a>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
 <TMPL_IF HTML5><footer class="inlinefooter"><TMPL_ELSE><div class="inlinefooter"></TMPL_IF>
 
 <span class="pagedate">
diff --git a/page.tmpl b/page.tmpl
index 89b4f3a..c886b22 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -21,6 +21,8 @@
 <TMPL_ELSE>
 <link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 </TMPL_IF>
+
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF EDITURL>
 <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
 </TMPL_IF>
@@ -36,6 +38,8 @@
 <link rel="next" href="<TMPL_VAR NEXTURL>" title="<TMPL_VAR NEXTTITLE>" />
 </TMPL_IF>
 </TMPL_LOOP>
+</TMPL_UNLESS>
+
 </head>
 <body>
 
@@ -56,9 +60,11 @@
 </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>
@@ -112,15 +118,19 @@
 <TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
 
+<TMPL_UNLESS DYNAMIC>
 <TMPL_VAR TRAILS>
+</TMPL_UNLESS>
 
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_UNLESS DYNAMIC>
 <TMPL_IF SIDEBAR>
 <TMPL_IF HTML5><aside class="sidebar"><TMPL_ELSE><div class="sidebar"></TMPL_IF>
 <TMPL_VAR SIDEBAR>
 <TMPL_IF HTML5></aside><TMPL_ELSE></div></TMPL_IF>
 </TMPL_IF>
+</TMPL_UNLESS>
 
 <div id="pagebody">
 
@@ -128,6 +138,12 @@
 <TMPL_VAR CONTENT>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
 
+<TMPL_IF ENCLOSURE>
+<TMPL_IF HTML5><section id="enclosure"><TMPL_ELSE><div id="enclosure"></TMPL_IF>
+<a href="<TMPL_VAR ENCLOSURE>">Download</a>
+<TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
+</TMPL_IF>
+
 <TMPL_UNLESS DYNAMIC>
 <TMPL_IF COMMENTS>
 <TMPL_IF HTML5><section id="comments"><TMPL_ELSE><div id="comments"></TMPL_IF>
diff --git a/rssitem.tmpl b/rssitem.tmpl
index 831daa8..bb03ca5 100644
--- a/rssitem.tmpl
+++ b/rssitem.tmpl
@@ -1,16 +1,14 @@
 <item>
-<TMPL_IF AUTHOR>
-	<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
-	<dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
-<TMPL_ELSE>
 	<title><TMPL_VAR TITLE></title>
-</TMPL_IF>
 <TMPL_IF GUID>
 	<guid isPermaLink="false"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
 	<guid isPermaLink="false"><TMPL_VAR URL></guid>
 </TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
+<TMPL_IF AUTHOR>
+	<dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator>
+</TMPL_IF>
 <TMPL_IF CATEGORIES>
 <TMPL_LOOP CATEGORIES>
 	<category><TMPL_VAR CATEGORY></category>
@@ -20,9 +18,10 @@
 	<dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
 <TMPL_IF ENCLOSURE>
 	<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
-<TMPL_ELSE>
-	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
 </TMPL_IF>
+<TMPL_UNLESS SIMPLEPODCAST>
+	<description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+</TMPL_UNLESS>
 <TMPL_IF COMMENTSURL>
 	<comments><TMPL_VAR COMMENTSURL></comments>
 </TMPL_IF>
diff --git a/rsspage.tmpl b/rsspage.tmpl
index e54094a..45265f2 100644
--- a/rsspage.tmpl
+++ b/rsspage.tmpl
@@ -5,7 +5,12 @@
 <channel>
 <title><TMPL_VAR TITLE></title>
 <link><TMPL_VAR PAGEURL></link>
+<TMPL_IF COPYRIGHT>
+<copyright><TMPL_VAR COPYRIGHT ESCAPE=HTML></copyright>
+</TMPL_IF>
 <description><TMPL_VAR FEEDDESC ESCAPE=HTML></description>
+<generator>ikiwiki</generator>
+<pubDate><TMPL_VAR FEEDDATE_822></pubDate>
 <TMPL_VAR CONTENT>
 </channel>
 </rss>
author	Jonas Smedegaard <dr@jones.dk>	2013-10-09 14:04:09 +0200
committer	Jonas Smedegaard <dr@jones.dk>	2013-10-09 14:04:09 +0200
commit	67b676bd50fb475c3b6c314942be14b4677e426b (patch)
tree	83aae0ffb1aa7a8c2cce0241ebc720f543d0d31d
parent	32379c9538d54499f62d03ed310cdabb31a81de6 (diff)