From: <de...@de...> - 2007-05-25 08:17:38
|
Author: MichaelDaum Date: 2007-05-25 03:17:33 -0500 (Fri, 25 May 2007) New Revision: 13869 Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeCreateNewTag.txt twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDebugSearch.txt twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDebugViewTags.txt twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDeleteTag.txt twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMePlugin.txt twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeRenameTag.txt twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeSearch.txt twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeViewAllTags.txt twiki/branches/MAIN/twikiplugins/TagMePlugin/lib/TWiki/Plugins/TagMePlugin.pm Log: Item4131:Item4132: * replaced links like %SCRIPTURL%/view%SCRIPTSUFFIX% with %SCRIPTURL{view}% * storing tag data in a work area now...and not in pub/TWiki/TagMePlugin If you upgrade TagMePlugin you will have to move all tag files from: pub/TWiki/TagMePlugin to: pub/_work_areas/TagMePlugin. Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeCreateNewTag.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeCreateNewTag.txt 2007-05-25 08:11:52 UTC (rev 13868) +++ twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeCreateNewTag.txt 2007-05-25 08:17:33 UTC (rev 13869) @@ -17,7 +17,7 @@ %STARTSECTION{"create"}% Create a new tag - then add it to a topic. -<noautolink>%TAGME{ tpaction="%URLPARAM{"newaction" default="nop"}%" tag="%URLPARAM{newtag}%" note="%URLPARAM{newtagnote}%" }%<form name="addtag" action="%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%" method="post" onsubmit="return cleanTag(this.newtag.value);"> +<noautolink>%TAGME{ tpaction="%URLPARAM{"newaction" default="nop"}%" tag="%URLPARAM{newtag}%" note="%URLPARAM{newtagnote}%" }%<form name="addtag" action="%SCRIPTURL{viewauth}%/%BASEWEB%/%BASETOPIC%" method="post" onsubmit="return cleanTag(this.newtag.value);"> <div class="twikiFormSteps"> <div class="twikiFormStep twikiLast"> Name of new tag: <input type="text" class="twikiInputField" name="newtag" id="newtag" size="30" value="%URLPARAM{"createtag"}%" onblur="this.value=cleanTag(this.value)" /> <input type="submit" class="twikiSubmit" value="%MAKETEXT{"Create"}%" /> @@ -31,7 +31,7 @@ %ENDSECTION{"create"}% %STARTSECTION{"existing"}% -Existing tags: %TAGME{ tpaction="showalltags" format="[[%SCRIPTURL%/view%SCRIPTSUFFIX%/%TWIKIWEB%/TagMeSearch?tag=$tag][$tag]]" separator=", " }% +Existing tags: %TAGME{ tpaction="showalltags" format="[[%SCRIPTURL{view}%/%TWIKIWEB%/TagMeSearch?tag=$tag][$tag]]" separator=", " }% %ENDSECTION{"existing"}% %STOPINCLUDE% @@ -123,4 +123,4 @@ // </pre>-hide --> </script> -%ENDSECTION{"cleanTagJavascript"}% \ No newline at end of file +%ENDSECTION{"cleanTagJavascript"}% Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDebugSearch.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDebugSearch.txt 2007-05-25 08:11:52 UTC (rev 13868) +++ twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDebugSearch.txt 2007-05-25 08:17:33 UTC (rev 13869) @@ -3,7 +3,7 @@ ---+ Tag-me: Debug Tag Search <noautolink> -<form action="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%"> +<form action="%SCRIPTURL{view}%/%WEB%/%TOPIC%"> | web: | <input name="qweb" value="%URLPARAM{ "qweb" encode="entity" }%" size="80" /> | | topic: | <input name="qtopic" value="%URLPARAM{ "qtopic" encode="entity" }%" size="80" /> | | tag: | <input name="qtag" value="%URLPARAM{ "qtag" encode="entity" }%" size="80" /> | Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDebugViewTags.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDebugViewTags.txt 2007-05-25 08:11:52 UTC (rev 13868) +++ twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDebugViewTags.txt 2007-05-25 08:17:33 UTC (rev 13869) @@ -2,14 +2,14 @@ ---+ Tag-me: Debug View Tags <noautolink> -<form action="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%"> +<form action="%SCRIPTURL{view}%/%WEB%/%TOPIC%"> | by: | <input name="qby" value="%URLPARAM{ "qby" encode="entity" }%" size="80" /> | | web: | <input name="qweb" value="%URLPARAM{ "qweb" encode="entity" }%" size="80" /> | | topic: | <input name="qtopic" value="%URLPARAM{ "qtopic" encode="entity" }%" size="80" /> | | exclude: | <input name="qexclude" value="%URLPARAM{ "qexclude" encode="entity" }%" size="80" /> | | minsize: | <input name="qmin" value="%URLPARAM{ "qmin" encode="entity" }%" size="80" /> | | maxsize: | <input name="qmax" value="%URLPARAM{ "qmax" encode="entity" }%" size="80" /> | -| format: | <input name="qformat" value="%URLPARAM{ "qformat" encode="entity" }%" size="80" />%BR% =<a href=\"%<nop>SCRIPTURL%/view%<nop>SCRIPTSUFFIX%/%<nop>WEB%/TagMeSearch?tag=$tag\" style=\"font-size:$size%\">$tag</a>= | +| format: | <input name="qformat" value="%URLPARAM{ "qformat" encode="entity" }%" size="80" />%BR% =<a href=\"%<nop>SCRIPTURL{view}%/%<nop>WEB%/TagMeSearch?tag=$tag\" style=\"font-size:$size%\">$tag</a>= | | separator: | <input name="qseparator" value="%URLPARAM{ "qseparator" encode="entity" }%" size="80" /> | | | <input type="submit" /> | </form> Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDeleteTag.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDeleteTag.txt 2007-05-25 08:11:52 UTC (rev 13868) +++ twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeDeleteTag.txt 2007-05-25 08:17:33 UTC (rev 13869) @@ -15,7 +15,7 @@ <tr bgcolor="#EAE9DE"><td style="width:100%;"></td></tr> </table> %STARTSECTION{"delete"}% -<noautolink><form name="renametag" action="%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%" method="post" onsubmit="return confirmDelete(this.oldtag.value, this.postChangeRequest);">%TAGME{ tpaction="%URLPARAM{"deleteaction" default="deletetaginit"}%" oldtag="%URLPARAM{oldtag}%" note="%URLPARAM{renametagnote}%" }% +<noautolink><form name="renametag" action="%SCRIPTURL{viewauth}%/%BASEWEB%/%BASETOPIC%" method="post" onsubmit="return confirmDelete(this.oldtag.value, this.postChangeRequest);">%TAGME{ tpaction="%URLPARAM{"deleteaction" default="deletetaginit"}%" oldtag="%URLPARAM{oldtag}%" note="%URLPARAM{renametagnote}%" }% <div class="twikiFormSteps"> <div class="twikiFormStep"> Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMePlugin.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMePlugin.txt 2007-05-25 08:11:52 UTC (rev 13868) +++ twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMePlugin.txt 2007-05-25 08:17:33 UTC (rev 13869) @@ -88,7 +88,7 @@ Screenshot of tag cloud in the list all tags view: <br /> <img src="%ATTACHURLPATH%/alltagcloud.gif" alt="Screenshot of view all tags tag cloud" width="598" height="168" /> -__%T% Tip:__ In a <nop>%HOMETOPIC% of a web you can show a tag cloud of all tagged topics in that web with this variable:%BR% =%<nop>TAGME{ tpaction="showalltags" web="%<nop>WEB%" format="<a href=\"%<nop>SCRIPTURL%/view%<nop>SCRIPTSUFFIX%/%<nop>TWIKIWEB%/TagMeSearch?tag=$tag;qweb=%<nop>WEB%\" style=\"font-size:$size%\">$tag</a>" }%= +__%T% Tip:__ In a <nop>%HOMETOPIC% of a web you can show a tag cloud of all tagged topics in that web with this variable:%BR% =%<nop>TAGME{ tpaction="showalltags" web="%<nop>WEB%" format="<a href=\"%<nop>SCRIPTURL{view}%/%<nop>TWIKIWEB%/TagMeSearch?tag=$tag;qweb=%<nop>WEB%\" style=\"font-size:$size%\">$tag</a>" }%= ---+++ List My Tags Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeRenameTag.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeRenameTag.txt 2007-05-25 08:11:52 UTC (rev 13868) +++ twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeRenameTag.txt 2007-05-25 08:17:33 UTC (rev 13869) @@ -16,7 +16,7 @@ <tr bgcolor="#EAE9DE"><td style="width:100%;"></td></tr> </table> %STARTSECTION{"create"}% -<noautolink><form name="renametag" action="%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%" method="post" onsubmit="return cleanTag(this.newtag.value);">%TAGME{ tpaction="%URLPARAM{"renameaction" default="renametaginit"}%" oldtag="%URLPARAM{oldtag}%" newtag="%URLPARAM{newtag}%" note="%URLPARAM{renametagnote}%" }% +<noautolink><form name="renametag" action="%SCRIPTURL{viewauth}%/%BASEWEB%/%BASETOPIC%" method="post" onsubmit="return cleanTag(this.newtag.value);">%TAGME{ tpaction="%URLPARAM{"renameaction" default="renametaginit"}%" oldtag="%URLPARAM{oldtag}%" newtag="%URLPARAM{newtag}%" note="%URLPARAM{renametagnote}%" }% <div class="twikiFormSteps"> <div class="twikiFormStep"> Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeSearch.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeSearch.txt 2007-05-25 08:11:52 UTC (rev 13868) +++ twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeSearch.txt 2007-05-25 08:17:33 UTC (rev 13869) @@ -3,12 +3,12 @@ ---+ Tag-me: Tag Search %STARTINCLUDE% -<form name="tagmesearch" action="%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%" method="get"> +<form name="tagmesearch" action="%SCRIPTURL{view}%/%WEB%/%TOPIC%" method="get"> <table class="tagmeNavigation" border="0" cellpadding="3" cellspacing="0"><tr> <td> </td> <td bgcolor="#F6F4EB"> [[TagMeViewAllTags][All Tags]] </td> <td> </td> -<td bgcolor="#F6F4EB"> [[%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%WEB%/TagMeViewMyTags][My Tags]] </td> +<td bgcolor="#F6F4EB"> [[%SCRIPTURL{viewauth}%/%WEB%/TagMeViewMyTags][My Tags]] </td> <td> </td> <td bgcolor="#EAE9DE"> *Tag Search* </td> </tr></table> Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeViewAllTags.txt =================================================================== --- twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeViewAllTags.txt 2007-05-25 08:11:52 UTC (rev 13868) +++ twiki/branches/MAIN/twikiplugins/TagMePlugin/data/TWiki/TagMeViewAllTags.txt 2007-05-25 08:17:33 UTC (rev 13869) @@ -7,7 +7,7 @@ <td> </td> <td bgcolor="#EAE9DE"> *All Tags* </td> <td> </td> -<td bgcolor="#F6F4EB"> [[%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%WEB%/TagMeViewMyTags][My Tags]] </td> +<td bgcolor="#F6F4EB"> [[%SCRIPTURL{viewauth}%/%WEB%/TagMeViewMyTags][My Tags]] </td> <td> </td> <td bgcolor="#F6F4EB"> [[TagMeSearch][Tag Search]] </td> </tr></table> @@ -15,7 +15,7 @@ <tr bgcolor="#EAE9DE"><td style="width:100%;"></td></tr> </td></tr></table> -%TAGME{ tpaction="showalltags" format="<a href=\"%SCRIPTURL%/view%SCRIPTSUFFIX%/%WEB%/TagMeSearch?tag=$tag\" style=\"font-size:$size%\">$tag</a>" separator=", " }% +%TAGME{ tpaction="showalltags" format="<a href=\"%SCRIPTURL{view}%/%WEB%/TagMeSearch?tag=$tag\" style=\"font-size:$size%\">$tag</a>" separator=", " }% %STOPINCLUDE% %BR% Modified: twiki/branches/MAIN/twikiplugins/TagMePlugin/lib/TWiki/Plugins/TagMePlugin.pm =================================================================== --- twiki/branches/MAIN/twikiplugins/TagMePlugin/lib/TWiki/Plugins/TagMePlugin.pm 2007-05-25 08:11:52 UTC (rev 13868) +++ twiki/branches/MAIN/twikiplugins/TagMePlugin/lib/TWiki/Plugins/TagMePlugin.pm 2007-05-25 08:17:33 UTC (rev 13869) @@ -28,7 +28,7 @@ # ========================= use vars qw( $web $topic $user $installWeb $VERSION $RELEASE $pluginName $debug - $initialized $attachDir $attachUrl $logAction $tagLinkFormat $tagQueryFormat + $initialized $workAreaDir $attachUrl $logAction $tagLinkFormat $tagQueryFormat $alphaNum $doneHeader $normalizeTagInput $lineRegex $topicsRegex ); @@ -78,11 +78,11 @@ return if ($initialized); # Initialization - $attachDir = TWiki::Func::getPubDir() . "/$installWeb/$pluginName"; + $workAreaDir = TWiki::Func::getWorkArea($pluginName); $attachUrl = TWiki::Func::getPubUrlPath() . "/$installWeb/$pluginName"; $logAction = TWiki::Func::getPreferencesFlag("\U$pluginName\E_LOGACTION"); $tagLinkFormat = - '<a href="%SCRIPTURL%/view%SCRIPTSUFFIX%/' + '<a href="%SCRIPTURL{view}%/' . $installWeb . '/TagMeSearch?tag=$tag;by=$by">$tag</a>'; $tagQueryFormat = @@ -90,7 +90,7 @@ . '<td class="tagmeTopicTd"> <b>[[$web.$topic][<nop>$topic]]</b> ' . '<span class="tagmeTopicTdWeb">in <nop>$web web</span></td>$n' . '<td class="tagmeDateTd">' - . '[[%SCRIPTURL%/rdiff%SCRIPTSUFFIX%/$web/$topic][$date]] - r$rev </td>$n' + . '[[%SCRIPTURL{rdiff}%/$web/$topic][$date]] - r$rev </td>$n' . '<td class="tagmeAuthorTd"> $wikiusername </td>$n' . '</tr></table>$n' . '<p class="tagmeResultsDetails">' @@ -247,20 +247,19 @@ if ($normalizeTagInput) { # plain sort can be used and should be just a little faster - $text .= join( ', ', map { $seen{$_} } sort keys(%seen) ); + $text .= join( ' ', map { $seen{$_} } sort keys(%seen) ); } else { # uppercase characters are possible, so sort with lowercase comparison $text .= - join( ', ', map { $seen{$_} } sort { lc $a cmp lc $b } keys(%seen) ); + join( ' ', map { $seen{$_} } sort { lc $a cmp lc $b } keys(%seen) ); } my @allTags = _readAllTags(); my @notSeen = (); foreach (@allTags) { push( @notSeen, $_ ) unless ( $seen{$_} ); } - $text .= ', ' if ( scalar @tagInfo && scalar @notSeen ); if ( scalar @notSeen ) { if ( $tagMode eq 'nojavascript' ) { $text .= _createNoJavascriptSelectBox(@notSeen); @@ -269,10 +268,10 @@ $text .= _createJavascriptSelectBox(@notSeen); } } - $text .= ', ' if $text; - $text .= -"<a href=\"%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/$installWeb/TagMeCreateNewTag" - . "?from=$web.$topic\">create new tag</a>"; + $text .= + _wrapHtmlTagControl("<a href=\"%SCRIPTURL{viewauth}%/$installWeb/TagMeCreateNewTag". + "?from=$web.$topic\">create new tag</a>"); + return _wrapHtmlTagMeShowForm($text); } @@ -321,7 +320,7 @@ "\nif (text.length > 0) {createSelectBox(text, \"$selectControlId\"); document.getElementById(\"tagmeAddNewButton\").style.display=\"inline\";}\n//]]>\n</script>"; my $noscript .= -'<noscript><a href="%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%?tagmode=nojavascript">tag this topic</a></noscript>'; +'<noscript><a href="%SCRIPTURL{viewauth}%/%BASEWEB%/%BASETOPIC%?tagmode=nojavascript">tag this topic</a></noscript>'; $selectControl .= '<span id="tagmeAddNewButton" style="display:none;">' @@ -979,7 +978,7 @@ if ($tag) { $text = -"<a class=\"tagmeAction $image\" href=\"%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%?" +"<a class=\"tagmeAction $image\" href=\"%SCRIPTURL{viewauth}%/%BASEWEB%/%BASETOPIC%?" . "tpaction=$action;tag=" . _urlEncode($tag) . ";tagmode=$tagMode\">"; @@ -997,7 +996,7 @@ # ========================= sub _getTagInfoList { my @list = (); - if ( opendir( DIR, "$attachDir" ) ) { + if ( opendir( DIR, "$workAreaDir" ) ) { my @files = grep { !/^_tags_all\.txt$/ } grep { /^_tags_.*\.txt$/ } readdir(DIR); closedir DIR; @@ -1011,7 +1010,7 @@ my ($webTopic) = @_; $webTopic =~ s/[\/\\]/\./g; - my $text = TWiki::Func::readFile("$attachDir/_tags_$webTopic.txt"); + my $text = TWiki::Func::readFile("$workAreaDir/_tags_$webTopic.txt"); my @info = grep { /^[0-9]/ } split( /\n/, $text ); return @info; } @@ -1020,7 +1019,7 @@ sub _writeTagInfo { my ( $webTopic, @info ) = @_; $webTopic =~ s/[\/\\]/\./g; - my $file = "$attachDir/_tags_$webTopic.txt"; + my $file = "$workAreaDir/_tags_$webTopic.txt"; if ( scalar @info ) { my $text = "# This file is generated, do not edit\n" @@ -1038,8 +1037,8 @@ $oldWebTopic =~ s/[\/\\]/\./g; $newWebTopic =~ s/[\/\\]/\./g; - my $oldFile = "$attachDir/_tags_$oldWebTopic.txt"; - my $newFile = "$attachDir/_tags_$newWebTopic.txt"; + my $oldFile = "$workAreaDir/_tags_$oldWebTopic.txt"; + my $newFile = "$workAreaDir/_tags_$newWebTopic.txt"; if ( -e $oldFile ) { my $text = TWiki::Func::readFile($oldFile); TWiki::Func::saveFile( $newFile, $text ); @@ -1049,7 +1048,7 @@ # ========================= sub _readAllTags { - my $text = TWiki::Func::readFile("$attachDir/_tags_all.txt"); + my $text = TWiki::Func::readFile("$workAreaDir/_tags_all.txt"); #my @tags = grep{ /^[${alphaNum}_]/ } split( /\n/, $text ); # we assume that this file has been written by TagMe, so tags should be @@ -1066,7 +1065,7 @@ my $text = "# This file is generated, do not edit\n" . join( "\n", sort { lc $a cmp lc $b } @tags ) . "\n"; - TWiki::Func::saveFile( "$attachDir/_tags_all.txt", $text ); + TWiki::Func::saveFile( "$workAreaDir/_tags_all.txt", $text ); } # ========================= @@ -1302,7 +1301,7 @@ sub _wrapHtmlTagMeShowForm { my ($text) = @_; return -"<form name=\"tagmeshow\" action=\"%SCRIPTURL%/viewauth%SCRIPTSUFFIX%/%BASEWEB%/%BASETOPIC%\" method=\"post\">$text</form>"; +"<form name=\"tagmeshow\" action=\"%SCRIPTURL{viewauth}%/%BASEWEB%/%BASETOPIC%\" method=\"post\">$text</form>"; } # ========================= |