Merge branch 'master' of ssh://git.ikiwiki.info

diff --git a/debian/changelog b/debian/changelog
index cfcf8a3d9f30e0a80ce2441976dd8cf39182c350..97ddc4e65d482e4873627fbe6e570757ea7b0a7a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (3.20130904.2) UNRELEASED; urgency=low
+
+  * aggregate: Improve display of post author.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 05 Sep 2013 10:01:10 -0400
+
 ikiwiki (3.20130904.1) unstable; urgency=low
 
   * Fix cookiejar default setting.

diff --git a/doc/bugs/poll_in_inline.mdwn b/doc/bugs/poll_in_inline.mdwn
new file mode 100644 (file)
index 0000000..f78231f
--- /dev/null
+++ b/doc/bugs/poll_in_inline.mdwn
@@ -0,0 +1,4 @@
+When the poll directive appears in an inline, clicking on the button is
+supposed to vote and go to the page for that poll. Instead, I see it always
+apparantly skip counting my vote, and redirect to the page for that poll.
+--[[Joey]]

diff --git a/doc/todo/polltrails.mdwn b/doc/todo/polltrails.mdwn
new file mode 100644 (file)
index 0000000..387ab3f
--- /dev/null
+++ b/doc/todo/polltrails.mdwn
@@ -0,0 +1,3 @@
+When the poll directive is used on a page in a trail, voting on the poll
+should advance to the next page in the trail. This would allow multiple
+poll questionairres with a reasonable UI. --[[Joey]]

diff --git a/templates/aggregatepost.tmpl b/templates/aggregatepost.tmpl
index a89ccfcdfdccfcbe5449eb59f518f145acc1c57e..5a0f6e7805b299feee7b4077a58cad0af557e02b 100644 (file)
--- a/templates/aggregatepost.tmpl
+++ b/templates/aggregatepost.tmpl
@@ -12,7 +12,7 @@
 [[!meta copyright="<TMPL_VAR COPYRIGHT ESCAPE=HTML>"]]
 </TMPL_IF>
 <TMPL_IF AUTHOR>
-[[!meta author="<TMPL_VAR NAME ESCAPE=HTML>: <TMPL_VAR AUTHOR ESCAPE=HTML>"]]
+[[!meta author="<TMPL_VAR AUTHOR ESCAPE=HTML> (<TMPL_VAR NAME ESCAPE=HTML>)"]]
 <TMPL_ELSE>
 [[!meta author="<TMPL_VAR NAME ESCAPE=HTML>"]]
 </TMPL_IF>