diff options
| -rw-r--r-- | IkiWiki/Plugin/progress.pm | 8 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/No_progress_in_progress_bar.mdwn | 5 | ||||
| -rw-r--r-- | doc/plugins/discussion.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/Default_text_for_new_pages.mdwn | 5 | ||||
| -rw-r--r-- | doc/todo/Feature_parity_with_Trac.mdwn | 2 | ||||
| -rw-r--r-- | doc/todo/Unit_tests.mdwn | 5 | ||||
| -rw-r--r-- | doc/users/Will.mdwn | 5 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 4 |
9 files changed, 35 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm index e459637b8..6cb21a916 100644 --- a/IkiWiki/Plugin/progress.pm +++ b/IkiWiki/Plugin/progress.pm @@ -5,7 +5,7 @@ use warnings; use strict; use IkiWiki 2.00; -my $percentage_pattern = qr/[0-9]+\%/; # pattern to validate percentages +my $percentage_pattern = qr/[0-9]+\%?/; # pattern to validate percentages sub import { #{{{ hook(type => "getsetup", id => "progress", call => \&getsetup); @@ -29,6 +29,12 @@ sub preprocess (@) { #{{{ if (defined $params{percent}) { $fill = $params{percent}; ($fill) = $fill =~ m/($percentage_pattern)/; # fill is untainted now + if (! defined $fill || ! length $fill || $fill > 100 || $fill < 0) { + error("illegal percent value $params{percent}"); + } + elsif ($fill !~ /%$/) { + $fill.="%"; + } } elsif (defined $params{totalpages} and defined $params{donepages}) { add_depends($params{page}, $params{totalpages}); diff --git a/debian/changelog b/debian/changelog index bf44d9851..ffa266137 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ikiwiki (2.65) UNRELEASED; urgency=low * editdiff: Broken since 2.62 due to wrong syntax, now fixed. * aggregate: Support atom feeds with only a summary element, and no content elements. + * progress: Display an error if the progress cannot be parsed, and allow + the percent parameter to only optionally end with "%". -- Joey Hess <joeyh@debian.org> Wed, 17 Sep 2008 14:26:56 -0400 diff --git a/doc/bugs/No_progress_in_progress_bar.mdwn b/doc/bugs/No_progress_in_progress_bar.mdwn index 1843bcd1d..0b36b9e49 100644 --- a/doc/bugs/No_progress_in_progress_bar.mdwn +++ b/doc/bugs/No_progress_in_progress_bar.mdwn @@ -27,6 +27,11 @@ Anyone can confirm the bug? --[[Paweł|ptecza]] >> that '%' sign is confusing here and should be dropped. I hope it's clear for all >> people that "percent" parameter passes values in percentages. --[[Paweł|ptecza]] +>>> [[fixed|done]] --[[Joey]] + >>> I've forgotten to add that now the HTML code is OK, but I can see only >>> "75%" string on white background wihout any border. I need to look closer >>> at CSS styles for the progress bar. --[[Paweł|ptecza]] + +>>>> You need the `div.progress` and `div.progress-done` from ikiwiki's +>>>> default `style.css`. --[[Joey]] diff --git a/doc/plugins/discussion.mdwn b/doc/plugins/discussion.mdwn index c3541a44e..70157f1e2 100644 --- a/doc/plugins/discussion.mdwn +++ b/doc/plugins/discussion.mdwn @@ -36,6 +36,8 @@ Any objections to listing plugins alphabetically rather than by creation date? >> the main list to be alphabetical. -- [[Will]] How about adding a deprecated tag in order to clean up the plugin list? + +> AFAIK it's currently the only one. --[[Joey]] For instance [[googlecalendar]] is listed as plugin but should probably be removed from Ikiwiki in a future major version (v3?). diff --git a/doc/todo/Default_text_for_new_pages.mdwn b/doc/todo/Default_text_for_new_pages.mdwn index 17feddf7e..590a80a00 100644 --- a/doc/todo/Default_text_for_new_pages.mdwn +++ b/doc/todo/Default_text_for_new_pages.mdwn @@ -95,3 +95,8 @@ in-house means instead of this patch; use a procedure as I do in the Hurd wiki? > [[ikiwiki/directive/edittemplate]] should be added to [[ikiwiki/directive/inline]] > (and I'd make that change myself, but the edit needs to happen in the underlay, > not in the online docs). -- [[Will]] + +>> Go ahead and make the edit, ikiwiki's source is arranged such that edits +>> on this wiki to files that form the underlay will affect the underlay. +>> (Clearly I won't be adding duplicate functionality.) +>> --[[Joey]] diff --git a/doc/todo/Feature_parity_with_Trac.mdwn b/doc/todo/Feature_parity_with_Trac.mdwn index f09301ebe..a1443234f 100644 --- a/doc/todo/Feature_parity_with_Trac.mdwn +++ b/doc/todo/Feature_parity_with_Trac.mdwn @@ -10,3 +10,5 @@ Features needed: * Bug tracking: see [[tips/integrated_issue_tracking_with_ikiwiki]]. * Queries on bug database: e.g. all open bugs that don't depend on an open bug. See [[todo/tracking_bugs_with_dependencies]] and [[todo/structured_page_data]]. * Build Status: Maybe this is just a link to an external (centralised) status board (e.g. [BuildBot](http://buildbot.net/)). + +[[!tag wishlist]] diff --git a/doc/todo/Unit_tests.mdwn b/doc/todo/Unit_tests.mdwn index b1b0160a0..9c579a62e 100644 --- a/doc/todo/Unit_tests.mdwn +++ b/doc/todo/Unit_tests.mdwn @@ -3,3 +3,8 @@ Not sure about this TODO, but here it is anyway... It would be nice to have unit tests for IkiWiki. This would make sure that we don't break things when adding more functionality. > mmm unit tests. --[[schmonz]] + +>> Ikiwiki has over 500 tests, most of them of the unit test variety. They +>> are located in the 't' directory and are run by 'make test'. Most of the +>> core ikiwiki functions are covered. Feel free to contribute more.. +>> --[[Joey]] [[done]] diff --git a/doc/users/Will.mdwn b/doc/users/Will.mdwn index 33fe5c043..5d91f5930 100644 --- a/doc/users/Will.mdwn +++ b/doc/users/Will.mdwn @@ -4,6 +4,11 @@ Lately I've been using Ikiwiki for other things and seem to be scratching a few I generally use my [[ikiwiki/openid]] login when editing here: <http://www.cse.unsw.edu.au/~willu/> +> Regarding your recent change to [[ikiwiki/directive]], won't the inlined +> list of directives tend to be empty when it's shown? Only if +> listdirectives is installed will the directives underlay be enabled. +> --[[Joey]] + ### Open Bugs: [[!inline pages="link(users/Will) and bugs/* and !bugs/done and !bugs/discussion and !link(patch) and !link(bugs/done) and !bugs/*/*" archive="yes" feeds="no" ]] diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 4383972e6..635344b58 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-09-14 16:58-0400\n" +"POT-Creation-Date: 2008-09-19 12:57-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -120,7 +120,7 @@ msgstr "" msgid "feed crashed XML::Feed!" msgstr "" -#: ../IkiWiki/Plugin/aggregate.pm:584 +#: ../IkiWiki/Plugin/aggregate.pm:590 #, perl-format msgid "creating new page %s" msgstr "" |