summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-06-15 12:43:29 +0200
committerJonas Smedegaard <dr@jones.dk>2011-06-15 12:43:29 +0200
commit22aab9de14269b30aeacec7717e5447e24b0f457 (patch)
tree72d5f98148fe04f5b7a127a0a891b7deb08abe8a
parent84b24bb78093106008157c05a7e4cfe0bb6f5fd1 (diff)
Sync with ikiwiki 3.20110608.
-rw-r--r--blogpost.tmpl8
-rw-r--r--change.tmpl10
-rw-r--r--comment.tmpl5
-rw-r--r--feedlink.tmpl6
-rw-r--r--revert.tmpl21
5 files changed, 39 insertions, 11 deletions
diff --git a/blogpost.tmpl b/blogpost.tmpl
index 5a31e3f..9e49c47 100644
--- a/blogpost.tmpl
+++ b/blogpost.tmpl
@@ -1,10 +1,10 @@
-<form action="<TMPL_VAR CGIURL>" method="get">
-<div id="blogform">
+<form <TMPL_IF POSTFORMID>id="<TMPL_VAR POSTFORMID ESCAPE=HTML>"</TMPL_IF> action="<TMPL_VAR CGIURL>" method="get">
+<div class="blogform">
<TMPL_IF RSSURL>
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
+<a class="feedbutton" type="application/rss+xml" rel="alternate" title="<TMPL_VAR RSSDESC>" href="<TMPL_VAR RSSURL>">RSS</a>
</TMPL_IF>
<TMPL_IF ATOMURL>
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
+<a class="feedbutton" type="application/atom+xml" rel="alternate" title="<TMPL_VAR ATOMDESC>" 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/change.tmpl b/change.tmpl
index 671b9e4..d7ec908 100644
--- a/change.tmpl
+++ b/change.tmpl
@@ -10,10 +10,8 @@
<span class="desc"><br />Changed pages:</span>
<span class="pagelinks">
<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>
+<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>
</TMPL_LOOP>
</span>
<span class="desc"><br />Changed by:</span>
@@ -28,6 +26,10 @@
<span class="committype"><TMPL_VAR COMMITTYPE></span>
<span class="desc"><br />Date:</span>
<span class="changedate"><TMPL_VAR COMMITDATE></span>
+<span class="desc"><br /></span>
+<TMPL_IF REVERTURL><span class="revert">
+<a href="<TMPL_VAR REVERTURL>" title="revert" rel="nofollow">[[revert|wikiicons/revert.png]]</a>
+</span></TMPL_IF>
</div>
<div class="changelog">
<TMPL_LOOP MESSAGE>
diff --git a/comment.tmpl b/comment.tmpl
index c2ee5a3..c16ca7c 100644
--- a/comment.tmpl
+++ b/comment.tmpl
@@ -1,6 +1,10 @@
<TMPL_IF HTML5><article class="comment" id="<TMPL_VAR COMMENTID>">
<TMPL_ELSE><div class="comment" id="<TMPL_VAR COMMENTID>"></TMPL_IF>
+<TMPL_IF COMMENTAUTHORAVATAR><div class="comment-avatar">
+<img src="<TMPL_VAR COMMENTAUTHORAVATAR>" alt="" />
+</div></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>
@@ -58,4 +62,5 @@ Comment by
<TMPL_IF HTML5></nav><TMPL_ELSE></div></TMPL_IF>
</TMPL_IF>
+<div style="clear: both"></div>
<TMPL_IF HTML5></article><TMPL_ELSE></div></TMPL_IF>
diff --git a/feedlink.tmpl b/feedlink.tmpl
index be8637f..c67ad9c 100644
--- a/feedlink.tmpl
+++ b/feedlink.tmpl
@@ -1,8 +1,8 @@
-<div id="feedlink">
+<div <TMPL_IF ID>id="<TMPL_VAR ID ESCAPE=HTML>"</TMPL_IF> class="feedlink">
<TMPL_IF RSSURL>
-<a class="feedbutton" type="application/rss+xml" href="<TMPL_VAR RSSURL>">RSS</a>
+<a class="feedbutton" type="application/rss+xml" rel="alternate" title="<TMPL_VAR RSSDESC>" href="<TMPL_VAR RSSURL>">RSS</a>
</TMPL_IF>
<TMPL_IF ATOMURL>
-<a class="feedbutton" type="application/atom+xml" href="<TMPL_VAR ATOMURL>">Atom</a>
+<a class="feedbutton" type="application/atom+xml" rel="alternate" title="<TMPL_VAR ATOMDESC>" href="<TMPL_VAR ATOMURL>">Atom</a>
</TMPL_IF>
</div>
diff --git a/revert.tmpl b/revert.tmpl
new file mode 100644
index 0000000..0de3281
--- /dev/null
+++ b/revert.tmpl
@@ -0,0 +1,21 @@
+<TMPL_VAR FORM-START>
+<div>
+ <TMPL_VAR FIELD-DO>
+ <TMPL_VAR FIELD-SID>
+ <TMPL_VAR FIELD-REV>
+<label for="revertmessage" class="block">Optional comment about this change:</label>
+ <TMPL_VAR FIELD-REVERTMESSAGE>
+</div>
+<div class="revert buttons">
+<TMPL_VAR form-submit>
+<TMPL_VAR form-cancel>
+</div>
+<TMPL_VAR FORM-END>
+<br \>
+<div class="header">
+<span>Diff being reverted:</span>
+</div>
+<div id="diff">
+<pre>
+<TMPL_VAR diff>
+</pre>