From 74e9b123ac173806df8d48e92c62d80d3fe5b12b Mon Sep 17 00:00:00 2001 From: "http://www.cse.unsw.edu.au/~willu/" Date: Sat, 9 Aug 2008 18:03:14 -0400 Subject: Fix patch to work around HTMLScrubber, and add a potential documentation page --- doc/todo/progressbar_plugin.mdwn | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/doc/todo/progressbar_plugin.mdwn b/doc/todo/progressbar_plugin.mdwn index d8c0a5cec..4677160fb 100644 --- a/doc/todo/progressbar_plugin.mdwn +++ b/doc/todo/progressbar_plugin.mdwn @@ -62,6 +62,8 @@ Any comments? --[[Paweł|ptecza]] >>> Thank you for the code! I know how to fix that problem, because I had >>> the same issue while writing [[todo/color_plugin]] :) --[[Paweł|ptecza]] +>>>> Ahh - good idea. Patch updated to work with HTMLScrubber. --[[Will]] + #!/usr/bin/perl package IkiWiki::Plugin::progress; @@ -74,6 +76,7 @@ Any comments? --[[Paweł|ptecza]] sub import { #{{{ hook(type => "getsetup", id => "progress", call => \&getsetup); hook(type => "preprocess", id => "progress", call => \&preprocess); + hook(type => "format", id => "progress", call => \&format); } # }}} sub getsetup () { #{{{ @@ -124,4 +127,38 @@ Any comments? --[[Paweł|ptecza]] } # }}} + sub format(@) { #{{{ + my %params = @_; + + # If HTMLScrubber has removed the style attribute, then bring it back + + $params{content} =~ s!
($percentage_pattern)
!
$1
!g; + + return $params{content}; + } #}}} + 1 + +Here is a potential documentation page: + +----- + +[[!template id=plugin name=progress author="[[Will]]"]] +[[!tag type/meta]] + +Provides a \\[[!progress ]] [[ikiwiki/PreProcessorDirective]] that is +replaced with a progress bar. + +There are two possible parameter sets. The first is a single parameter +`percent` which holds a percentage figure for how complete the progress bar is. + +The second possible set of parameters is a pair of [[ikiwiki/PageSpec]]s, +`totalpages` and `donepages`. The progress plugin counts the number of +pages in each pagespec and shows the percentage of the total pages that are +done. + +This plugin is included in ikiwiki, but is not enabled by default. + +If it is turned on it can show what percentage of pages have discussion pages: + +[[!progress totalpages="* and !*/Discussion" donepages="*/Discussion"]] -- cgit v1.2.3 From 5e0e6cecfcfe66002590628d011164d2f0d8e88c Mon Sep 17 00:00:00 2001 From: "http://ptecza.myopenid.com/" Date: Sun, 10 Aug 2008 08:39:37 -0400 Subject: * Response --- doc/todo/progressbar_plugin.mdwn | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/todo/progressbar_plugin.mdwn b/doc/todo/progressbar_plugin.mdwn index 4677160fb..436da4e1b 100644 --- a/doc/todo/progressbar_plugin.mdwn +++ b/doc/todo/progressbar_plugin.mdwn @@ -64,6 +64,9 @@ Any comments? --[[Paweł|ptecza]] >>>> Ahh - good idea. Patch updated to work with HTMLScrubber. --[[Will]] +>>>>> I like it, but I think that Joey should take a look at that patch too :) +>>>>> --[[Paweł|ptecza]] + #!/usr/bin/perl package IkiWiki::Plugin::progress; -- cgit v1.2.3 From a6fa03c9615ffab24909d6fac4d3bf06a104f400 Mon Sep 17 00:00:00 2001 From: bremner Date: Sun, 10 Aug 2008 21:08:33 -0400 Subject: Could we factor out the attachment pagespec code so that other plugins can use it? --- doc/ikiwiki/pagespec/attachment/discussion.mdwn | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 doc/ikiwiki/pagespec/attachment/discussion.mdwn diff --git a/doc/ikiwiki/pagespec/attachment/discussion.mdwn b/doc/ikiwiki/pagespec/attachment/discussion.mdwn new file mode 100644 index 000000000..e520cf151 --- /dev/null +++ b/doc/ikiwiki/pagespec/attachment/discussion.mdwn @@ -0,0 +1,3 @@ +Would it be possible to factor out this pagespec +code so that other plugins can use it without enabling attachments? +I am interested for [[todo/mbox]] --[[DavidBremner]] -- cgit v1.2.3