Author: MichaelDaum Date: 2006-07-28 13:56:33 -0500 (Fri, 28 Jul 2006) New Revision: 11222 Modified: twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/data/TWiki/FlexWebListPlugin.txt twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/lib/TWiki/Plugins/FlexWebListPlugin.pm twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/lib/TWiki/Plugins/FlexWebListPlugin/Core.pm Log: Item2707: preserve order in "webs" parameter Modified: twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/data/TWiki/FlexWebListPlugin.txt =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/data/TWiki/FlexWebListPlugin.txt 2006-07-28 17:14:19 UTC (rev 11221) +++ twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/data/TWiki/FlexWebListPlugin.txt 2006-07-28 18:56:33 UTC (rev 11222) @@ -9,6 +9,8 @@ Instead, you could check your fix in, raise a bug in the Bugs web, or mail the author. --> ---+!! <nop>%TOPIC% +%TOC% +---++ Description This is a replacement for TWiki's standard [[%TWIKIWEB%.VarWEBLIST][WEBLIST]] variable. It is extended to improve the display of hierarchical web structures, a feature added to TWiki4 and adds more flexibility when used in @@ -71,6 +73,10 @@ * =$indent=: expands to three spaces for each level a web is embeded; main level webs get three spaces, subwebs on first level six spaces and so on. * =$indent(string)=: same as =$indent= but using =string= instead of three spaces + * =$n=: replaced with a newline char (\n) + * =$percnt=: replaced with a percent char (%) + * =$dollar=: replaced with a dollar char ($) + * =$nop=: removed from the format string before expanding common TWiki variables The following picture illustrates when which format strings are used <div class="box"> @@ -137,8 +143,9 @@ | Plugin Author: | TWiki:Main.MichaelDaum | | Copyright ©: | 2006, Michael Daum | | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) | -| Plugin Version: | v0.01 | +| Plugin Version: | v0.02 | | Change History: | | +| 28 Jul 2006: | preserve order in webs parameter | | 26 Jul 2006: | first release | | 05 Jul 2006: | initial version | | CPAN Dependencies: | none | @@ -149,4 +156,4 @@ | Feedback: | TWiki:Plugins/%TOPIC%Dev | | Appraisal: | TWiki:Plugins/%TOPIC%Appraisal | --- TWiki:Main/MichaelDaum - 27 Jul 2006 +-- TWiki:Main/MichaelDaum - 28 Jul 2006 Modified: twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/lib/TWiki/Plugins/FlexWebListPlugin/Core.pm =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/lib/TWiki/Plugins/FlexWebListPlugin/Core.pm 2006-07-28 17:14:19 UTC (rev 11221) +++ twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/lib/TWiki/Plugins/FlexWebListPlugin/Core.pm 2006-07-28 18:56:33 UTC (rev 11222) @@ -95,6 +95,7 @@ if ($aweb eq 'public' || $aweb eq 'webtemplate') { foreach my $bweb (sort keys %{$this->getWebs($aweb)}) { next if $seen{$bweb}; + next if $this->{webs} =~ /\b$bweb\b/; $seen{$bweb} = 1; push @list, $bweb; } @@ -104,6 +105,7 @@ push @list, $aweb if defined $allWebs->{$aweb}; # only add if it exists } } + #writeDebug("list=".join(',', @list)); # format result my @result; Modified: twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/lib/TWiki/Plugins/FlexWebListPlugin.pm =================================================================== --- twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/lib/TWiki/Plugins/FlexWebListPlugin.pm 2006-07-28 17:14:19 UTC (rev 11221) +++ twiki/branches/TWikiRelease04x00/twikiplugins/FlexWebListPlugin/lib/TWiki/Plugins/FlexWebListPlugin.pm 2006-07-28 18:56:33 UTC (rev 11222) @@ -18,7 +18,7 @@ use vars qw( $VERSION $RELEASE $core); $VERSION = '$Rev$'; -$RELEASE = 'v0.01'; +$RELEASE = 'v0.02'; ############################################################################### sub initPlugin { |