urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename postvote to postlink 

This better explains what it contains, which is a wikilink to the page
to go to after posting the vote. And postlink is more consistent a name
with posttrail.
master
Joey Hess 2018-11-26 13:23:50 -04:00
parent 97d921ca67
commit 4f0b10c13d
No known key found for this signature in database
GPG Key ID: DB12DB0FF05F8F38
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -10,7 +10,7 @@ ikiwiki (3.20180312) UNRELEASED; urgency=medium
[ Joey Hess ]
* aggregate: Fix aggregation of posts without a title.
Thanks, Alexandre Oliva
* poll: Added postvote and posttrail options for better multi-page polls.
* poll: Added postlink and posttrail options for better multi-page polls.
-- Simon McVittie <smcv@debian.org> Wed, 16 May 2018 13:09:27 +0100

8
IkiWiki/Plugin/poll.pm
View File

@ -69,8 +69,8 @@ sub preprocess (@) {
$ret.="<input type=\"hidden\" name=\"num\" value=\"$num\" />\n";
$ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n";
$ret.="<input type=\"hidden\" name=\"choice\" value=\"$choice\" />\n";
if (defined $params{postvote}) {
$ret.="<input type=\"hidden\" name=\"postvote\" value=\"".linkpage($params{postvote})."\" />\n";
if (defined $params{postlink}) {
$ret.="<input type=\"hidden\" name=\"postlink\" value=\"".linkpage($params{postlink})."\" />\n";
}
if (defined $params{posttrail}) {
$ret.="<input type=\"hidden\" name=\"posttrail\" value=\"".linkpage($params{posttrail})."\" />\n";
@ -119,8 +119,8 @@ sub sessioncgi ($$) {
}
my $postvote=urlto($page);
if (defined $cgi->param('postvote') && length $cgi->param('postvote')) {
$postvote=urlto(bestlink($page, $cgi->param('postvote')));
if (defined $cgi->param('postlink') && length $cgi->param('postlink')) {
$postvote=urlto(bestlink($page, $cgi->param('postlink')));
}
elsif (defined $cgi->param('posttrail') && length $cgi->param('posttrail')) {
my $trailname=bestlink($page, $cgi->param('posttrail'));

2
doc/ikiwiki/directive/poll.mdwn
View File

@ -23,7 +23,7 @@ Parameters:
another choice to the poll.
* `total` - Show total number of votes at bottom of poll. Default is "yes".
* `percent` - Whether to display percents. Default is "yes".
* `postvote` - By default after voting the updated page containing the poll
* `postlink` - By default after voting the updated page containing the poll
is displayed. This parameter allows advancing onward to another page.
This is useful for multi-page polls.
* `posttrail` - Similar to postvote, but allows advancing to the next page