From: <de...@de...> - 2007-02-12 15:18:56
|
Author: MichaelDaum Date: 2007-02-12 09:18:18 -0600 (Mon, 12 Feb 2007) New Revision: 12847 Modified: twiki/branches/Patch04x01/twikiplugins/SlideShowPlugin/data/TWiki/SlideShowPlugin.txt twiki/branches/Patch04x01/twikiplugins/SlideShowPlugin/lib/TWiki/Plugins/SlideShowPlugin/SlideShow.pm Log: Item3616: fixed construction of view urls Modified: twiki/branches/Patch04x01/twikiplugins/SlideShowPlugin/data/TWiki/SlideShowPlugin.txt =================================================================== --- twiki/branches/Patch04x01/twikiplugins/SlideShowPlugin/data/TWiki/SlideShowPlugin.txt 2007-02-12 15:17:04 UTC (rev 12846) +++ twiki/branches/Patch04x01/twikiplugins/SlideShowPlugin/data/TWiki/SlideShowPlugin.txt 2007-02-12 15:18:18 UTC (rev 12847) @@ -152,6 +152,7 @@ | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) | | Plugin Version: | 12011 | | Change History: | <!-- versions below in reverse order --> | +| 12 Feb 2007: | fixed construction of view urls (TWiki:Main/MichaelDaum) | | 19 Nov 2006: | 12011: Preserve URL parameters in slideshow (suggested by TWiki:Main/ThomasWeigert); changed logo in default template to T-logo; fixed warning errors introduced by 1.005 | | 16 Mar 2005: | 1.005 Crawford Currie prepped for Dakar, and fixed multiple evaluation bug | | 21 Nov 2004: | 1.004 Added support for =%<nop>SLIDECOMMENT%= template keyword (TWiki:Main/ArthurClemens); added benchmarks | Modified: twiki/branches/Patch04x01/twikiplugins/SlideShowPlugin/lib/TWiki/Plugins/SlideShowPlugin/SlideShow.pm =================================================================== --- twiki/branches/Patch04x01/twikiplugins/SlideShowPlugin/lib/TWiki/Plugins/SlideShowPlugin/SlideShow.pm 2007-02-12 15:17:04 UTC (rev 12846) +++ twiki/branches/Patch04x01/twikiplugins/SlideShowPlugin/lib/TWiki/Plugins/SlideShowPlugin/SlideShow.pm 2007-02-12 15:18:18 UTC (rev 12847) @@ -158,7 +158,7 @@ my $prev = $theNum - 1 || 1; my $next = $theNum + 1; my $text = '<span style="white-space: nowrap">'; - my $viewUrl = "%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/$theWeb/$theTopic"; + my $viewUrl = TWiki::Func::getViewUrl($theWeb, $theTopic); if( $theButtons =~ /f/ ) { # first slide button if( $theButtons =~ / f/ ) { @@ -224,7 +224,7 @@ my $slideNum = 1; my $text = ''; - my $viewUrl = "%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/$theWeb/$theTopic"; + my $viewUrl = TWiki::Func::getViewUrl($theWeb, $theTopic); foreach( @theTitles ) { $text .= "\t\* "; $text .= "<a href=\"$viewUrl?slideshow=on&skin=print#GoSlide$slideNum\">"; |