diff options
| author | Joey Hess <joey@kitenet.net> | 2013-01-10 12:43:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-10 12:43:27 -0400 |
| commit | 37cf511f06cd7a187d4b85c1cc4bf0abaaa7bd7d (patch) | |
| tree | 5e9ebf1f2e2fa5ff48eb1b104bea9375a1c1a107 | |
| parent | 5e547c3aa1efbd78b5c1610f27ebcd2d61f16409 (diff) | |
| download | ikiwiki-37cf511f06cd7a187d4b85c1cc4bf0abaaa7bd7d.tar ikiwiki-37cf511f06cd7a187d4b85c1cc4bf0abaaa7bd7d.tar.gz | |
poll: Add expandable option to allow users to easily add new choices to a poll.
| -rw-r--r-- | IkiWiki/Plugin/poll.pm | 28 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/ikiwiki/directive/poll.mdwn | 2 |
3 files changed, 29 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/poll.pm b/IkiWiki/Plugin/poll.pm index 2773486a6..32756a571 100644 --- a/IkiWiki/Plugin/poll.pm +++ b/IkiWiki/Plugin/poll.pm @@ -23,11 +23,13 @@ sub getsetup () { my %pagenum; sub preprocess (@) { - my %params=(open => "yes", total => "yes", percent => "yes", @_); + my %params=(open => "yes", total => "yes", percent => "yes", + expandable => "no", @_); my $open=IkiWiki::yesno($params{open}); my $showtotal=IkiWiki::yesno($params{total}); my $showpercent=IkiWiki::yesno($params{percent}); + my $expandable=IkiWiki::yesno($params{expandable}); $pagenum{$params{page}}++; my %choices; @@ -74,6 +76,19 @@ sub preprocess (@) { $ret.="</form>\n"; } } + + if ($expandable && $open && exists $config{cgiurl}) { + $ret.="<p>\n"; + $ret.="<form method=\"POST\" action=\"".IkiWiki::cgiurl()."\">\n"; + $ret.="<input type=\"hidden\" name=\"do\" value=\"poll\" />\n"; + $ret.="<input type=\"hidden\" name=\"num\" value=\"$pagenum{$params{page}}\" />\n"; + $ret.="<input type=\"hidden\" name=\"page\" value=\"$params{page}\" />\n"; + $ret.=gettext("Write in").": <input name=\"choice\" size=50 />\n"; + $ret.="<input type=\"submit\" value=\"".gettext("vote")."\" />\n"; + $ret.="</form>\n"; + $ret.="</p>\n"; + } + if ($showtotal) { $ret.="<span>".gettext("Total votes:")." $total</span>\n"; } @@ -85,7 +100,7 @@ sub sessioncgi ($$) { my $session=shift; if (defined $cgi->param('do') && $cgi->param('do') eq "poll") { my $choice=decode_utf8($cgi->param('choice')); - if (! defined $choice) { + if (! defined $choice || not length $choice) { error("no choice specified"); } my $num=$cgi->param('num'); @@ -118,7 +133,14 @@ sub sessioncgi ($$) { my $params=shift; return "\\[[$prefix $params]]" if $escape; if (--$num == 0) { - $params=~s/(^|\s+)(\d+)\s+"?\Q$choice\E"?(\s+|$)/$1.($2+1)." \"$choice\"".$3/se; + if ($params=~s/(^|\s+)(\d+)\s+"?\Q$choice\E"?(\s+|$)/$1.($2+1)." \"$choice\"".$3/se) { + } + elsif ($params=~/expandable=(\w+)/ + & &IkiWiki::yesno($1)) { + $choice=~s/["\]\n\r]//g; + $params.=" 1 \"$choice\"" + if length $choice; + } if (defined $oldchoice) { $params=~s/(^|\s+)(\d+)\s+"?\Q$oldchoice\E"?(\s+|$)/$1.($2-1 >=0 ? $2-1 : 0)." \"$oldchoice\"".$3/se; } diff --git a/debian/changelog b/debian/changelog index e9eb2704b..cf6d90a8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ ikiwiki (3.20121213) UNRELEASED; urgency=low and the page defining the trail. Thanks, smcv. * opendiscussion: Don't allow editing discussion pages if discussion pages are disabled. (smcv) + * poll: Add expandable option to allow users to easily add new choices to + a poll. -- Joey Hess <joeyh@debian.org> Sat, 22 Dec 2012 16:15:24 -0400 diff --git a/doc/ikiwiki/directive/poll.mdwn b/doc/ikiwiki/directive/poll.mdwn index 6aa3d2cea..0b47a2167 100644 --- a/doc/ikiwiki/directive/poll.mdwn +++ b/doc/ikiwiki/directive/poll.mdwn @@ -19,6 +19,8 @@ Parameters: * `open` - Whether voting is still open. Set to "no" to close the poll to voting. +* `expandable` - Set to "yes" to make this poll have an interface to add + 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". |