Menu
▾
▴
[TWiki-Dev] [SVN] PeterThoeny r18285 - in twiki/trunk/AnyWikiDrawPlugin: . data/TWiki lib/TWiki/Plugins lib/TWiki/Plugins/AnyWikiDrawPlugin pub/TWiki/AnyWikiDrawPlugin
|
From: <de...@de...> - 2010-01-18 05:42:03
|
Author: PeterThoeny Date: 2010-01-17 23:41:55 -0600 (Sun, 17 Jan 2010) New Revision: 18285 Trac url: http://develop.twiki.org/trac/changeset/18285 Added: twiki/trunk/AnyWikiDrawPlugin/pub/TWiki/AnyWikiDrawPlugin/Splash.gif Removed: twiki/trunk/AnyWikiDrawPlugin/bin/ twiki/trunk/AnyWikiDrawPlugin/pub/TWiki/AnyWikiDrawPlugin/AnyWikiDrawForTWiki.jar.gz Modified: twiki/trunk/AnyWikiDrawPlugin/data/TWiki/AnyWikiDrawPlugin.txt twiki/trunk/AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin.pm twiki/trunk/AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin/MANIFEST twiki/trunk/AnyWikiDrawPlugin/pub/TWiki/AnyWikiDrawPlugin/AnyWikiDrawForTWiki.jar twiki/trunk/AnyWikiDrawPlugin/pub/TWiki/AnyWikiDrawPlugin/AnyWikiDrawForTWiki.jar.pack.gz Log: Item5364: anywikidraw-0.14-for-twiki-4.3 by WernerRandelshofer Modified: twiki/trunk/AnyWikiDrawPlugin/data/TWiki/AnyWikiDrawPlugin.txt =================================================================== --- twiki/trunk/AnyWikiDrawPlugin/data/TWiki/AnyWikiDrawPlugin.txt 2010-01-17 20:49:42 UTC (rev 18284) +++ twiki/trunk/AnyWikiDrawPlugin/data/TWiki/AnyWikiDrawPlugin.txt 2010-01-18 05:41:55 UTC (rev 18285) @@ -48,17 +48,16 @@ ---++ Installation Instructions * Download on of the archive and unpack into your TWiki installation directory. - * Fix the shebang line and file extension for =/bin/pack200=. * Fix your files access right. - * Review your apache configuration keeping in mind the newly added script =/bin/pack200=. ---++ Plugin Info | Plugin Author: | TWiki:Main.WernerRandelshofer | | Copyright: | © 2007, TWiki:Main.WernerRandelshofer | | License: | Client-side code: LGPL ([[http://www.gnu.org/licenses/lgpl.html][Lesser GNU General Public License]]) and/or CC-By 3.0 ([[http://creativecommons.org/licenses/by/3.0/][Creative Commons Attribution 3.0]]). Server-side code: GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]). | -| Plugin Version: | 30 Aug 2007 (V1.000) | +| Plugin Version: | 4 Jul 2009 (V0.13.2) | | Change History: | <!-- versions below in reverse order --> | +| 4 JUL 2009: | Fixed 'can't call method forceAuthentication on undefined value' issue by TWiki:Main.WernerRandelshofer | | 14 Feb 2008: | Proper packaging and code cleaning by TWiki:Main.StephaneLenclud | | 30 Aug 2007: | Initial version | | TWiki Dependency: | $TWiki::Plugins::VERSION 1.1 | @@ -79,3 +78,6 @@ %META:FILEATTACHMENT{name="example.draw" attachment="example.draw" attr="" comment="TWiki Draw draw file" date="1180861883" path="/~werni/twiki/pub/TWiki/AnyWikiDrawPlugin/example.draw" size="28830" stream="/~werni/twiki/pub/TWiki/AnyWikiDrawPlugin/example.draw" user="Main.WernerRandelshofer" version="1"}% %META:FILEATTACHMENT{name="example.map" attachment="example.map" attr="" comment="TWiki Draw map file" date="1180861884" path="/~werni/twiki/pub/TWiki/AnyWikiDrawPlugin/example.map" size="3724" stream="/~werni/twiki/pub/TWiki/AnyWikiDrawPlugin/example.map" user="Main.WernerRandelshofer" version="1"}% %META:FILEATTACHMENT{name="example.gif" attachment="example.gif" attr="" comment="TWiki Draw GIF file" date="1180861885" path="/~werni/twiki/pub/TWiki/AnyWikiDrawPlugin/example.gif" size="10175" stream="/~werni/twiki/pub/TWiki/AnyWikiDrawPlugin/example.gif" user="Main.WernerRandelshofer" version="1"}% +%META:FILEATTACHMENT{name="empty.svg" attachment="empty.svg" attr="" comment="" date="1181542123" path="empty.svg" size="237" stream="empty.svg" user="Main.WernerRandelshofer" version="1"}% +%META:FILEATTACHMENT{name="empty.svg.png" attachment="empty.svg.png" attr="" comment="" date="1181542123" path="empty.svg.png" size="3940" stream="empty.svg.png" user="Main.WernerRandelshofer" version="1"}% +%META:FILEATTACHMENT{name="empty.svg.map" attachment="empty.svg.map" attr="" comment="" date="1181542124" path="empty.svg.map" size="43" stream="empty.svg.map" user="Main.WernerRandelshofer" version="1"}% Modified: twiki/trunk/AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin/MANIFEST =================================================================== --- twiki/trunk/AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin/MANIFEST 2010-01-17 20:49:42 UTC (rev 18284) +++ twiki/trunk/AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin/MANIFEST 2010-01-18 05:41:55 UTC (rev 18285) @@ -1,7 +1,65 @@ data/TWiki/AnyWikiDrawPlugin.txt 0644 Plugin doc page lib/TWiki/Plugins/AnyWikiDrawPlugin.pm 0444 Plugin Perl module -bin/pack200 0555 Plugin Perl CGI +lib/TWiki/Plugins/AnyWikiDrawPlugin/twikidraw-source.zip 0444 templates/anywikidraw.tmpl 0444 Template templates/anywikidraw.pattern.tmpl 0444 Template pub/TWiki/AnyWikiDrawPlugin/AnyWikiDrawForTWiki.jar 0444 Java applet - +pub/TWiki/AnyWikiDrawPlugin/AnyWikiDrawForTWiki.jar.pack.gz 0444 +pub/TWiki/AnyWikiDrawPlugin/edit.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/example.draw 0664 +pub/TWiki/AnyWikiDrawPlugin/example.gif 0664 +pub/TWiki/AnyWikiDrawPlugin/example.map 0664 +pub/TWiki/AnyWikiDrawPlugin/Splash.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/ATEXT1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/ATEXT2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/ATEXT3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/BORDDEC1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/BORDDEC2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/BORDDEC3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/CONN1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/CONN2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/CONN3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/DIAMOND2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/DIAMOND3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/ELLIPSE1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/ELLIPSE2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/ELLIPSE3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/ERASER2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/ERASER3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/LINE1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/LINE2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/LINE3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/OCONN1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/OCONN2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/OCONN3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/PERT2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/PERT3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/POLYGON1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/POLYGON2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/POLYGON3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/RECT1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/RECT2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/RECT3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/RRECT1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/RRECT2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/RRECT3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/screenshot.png 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/SCRIBBL1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/SCRIBBL2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/SCRIBBL3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/SEL1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/SEL2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/SEL3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/TEXT1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/TEXT2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/TEXT3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/TOBACK2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/TOBACK3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/TOFRONT2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/TOFRONT3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/TRIANGLE2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/TRIANGLE3.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/twikidraw.jar 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/URL1.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/URL2.gif 0444 +pub/TWiki/AnyWikiDrawPlugin/TWikiDraw/URL3.gif 0444 Modified: twiki/trunk/AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin.pm =================================================================== --- twiki/trunk/AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin.pm 2010-01-17 20:49:42 UTC (rev 18284) +++ twiki/trunk/AnyWikiDrawPlugin/lib/TWiki/Plugins/AnyWikiDrawPlugin.pm 2010-01-18 05:41:55 UTC (rev 18285) @@ -3,7 +3,7 @@ # Copyright (C) 2000-2003 Andrea Sterbini, a.s...@fl... # Copyright (C) 2001-2006 Peter Thoeny, pe...@th... # Copyright (C) 2002-2006 Crawford Currie, cc...@c-... -# Copyright (C) 2007 Werner Randelshofer, wer...@bl... +# Copyright (C) 2007-2009 Werner Randelshofer, wer...@bl... # Copyright (C) 2008 Stéphane Lenclud, ste...@le... # and TWiki Contributors. All Rights Reserved. TWiki Contributors @@ -91,7 +91,7 @@ # This is a free-form string you can use to "name" your own plugin version. # It is *not* used by the build automation tools, but is reported as part # of the version number in PLUGINDESCRIPTIONS. -$RELEASE = '0.12'; +$RELEASE = '0.13.2'; # Short description of this plugin # One line description, is shown in the %TWIKIWEB%.TextFormattingRules topic: @@ -230,7 +230,7 @@ { if ($query->param('editDrawing') eq $fileName) { - return editAnyDrawing($fileName, $width, $height, $theTopic, $theWeb); + return editAnyDrawing($session, $fileName, $width, $height, $theTopic, $theWeb); } else { @@ -943,51 +943,56 @@ # should really use TWiki server-side include mechanism.... my $mapFile = TWiki::Func::getPubDir() . "/$web/$topic/$nameVal.map"; my $img = ''; - if($nameVal =~ /\.svg$/) { + if($nameVal =~ /\.svg(z)?$/) { $img = "src=\"%ATTACHURLPATH%/$nameVal.png\""; } else { $img = "src=\"%ATTACHURLPATH%/$nameVal\""; } - my $editUrl = $ENV["REQUEST_URI"]."?editDrawing=$nameVal"; my $imgText = ""; + my $editUrl = "?editDrawing=$nameVal"; my $edittext = $editmess; - $edittext =~ s/%F%/$nameVal/g; + my $imgFile = TWiki::Func::getPubDir() . "/$web/$topic/$nameVal"; my $hover = - "onmouseover=\"window.status='$edittext';return true;\" ". - "onmouseout=\"window.status='';return true;\""; - - if ( -e $mapFile ) { - my $mapname = $nameVal; - $mapname =~ s/^.*\/([^\/]+)$/$1/; - $img .= " usemap=\"#$mapname\""; - my $map = TWiki::Func::readFile($mapFile); - # Unashamed hack to handle Web.TopicName links - $map =~ s/href=\"((\w+)\.)?(\w+)(#\w+)?\"/&_processHref($2,$3,$4,$web)/ge; - $map = TWiki::Func::expandCommonVariables( $map, $topic ); - $map =~ s/%MAPNAME%/$mapname/g; - $map =~ s/%ANYWIKIDRAW%/$editUrl/g; - $map =~ s/%EDITTEXT%/$edittext/g; - $map =~ s/%HOVER%/$hover/g; - $map =~ s/[\r\n]+//g; - - # Add an edit link just above the image if required - if ($editButton eq 1) { - $imgText .= "$map<img $img>"; - $imgText .= "<a href=\"$editUrl\" $hover>Edit</a>"; - } else { - $imgText .= "<a href=\"$editUrl\" $hover>". - "<img $img $hover alt=\"$edittext\" title=\"$edittext\" />$map</a>"; - } + "onmouseover=\"window.status='$edittext';return true;\" ". + "onmouseout=\"window.status='';return true;\""; + if (-e $imgFile) { + $edittext =~ s/%F%/$nameVal/g; + + if ( -e $mapFile ) { + my $mapname = $nameVal; + $mapname =~ s/^.*\/([^\/]+)$/$1/; + $img .= " usemap=\"#$mapname\""; + my $map = TWiki::Func::readFile($mapFile); + # Unashamed hack to handle Web.TopicName links + $map =~ s/href=\"((\w+)\.)?(\w+)(#\w+)?\"/&_processHref($2,$3,$4,$web)/ge; + $map = TWiki::Func::expandCommonVariables( $map, $topic ); + $map =~ s/%MAPNAME%/$mapname/g; + $map =~ s/%ANYWIKIDRAW%/$editUrl/g; + $map =~ s/%EDITTEXT%/$edittext/g; + $map =~ s/%HOVER%/$hover/g; + $map =~ s/[\r\n]+//g; + + # Add an edit link just above the image if required + if ($editButton eq 1) { + $imgText .= "$map<img $img>"; + $imgText .= "<a href=\"$editUrl\" $hover>Edit</a>"; + } else { + $imgText .= "<a href=\"$editUrl\" $hover>". + "<img $img $hover alt=\"$edittext\" title=\"$edittext\" />$map</a>"; + } + } else { + # insensitive drawing; the whole image gets a rather more + # decorative version of the edit URL + if ($editButton eq 1) { + $imgText .= "<img $img>"; + $imgText .= "<a href=\"$editUrl\" $hover>Edit</a>"; + } else { + $imgText .= "<a href=\"$editUrl\" $hover>". + "<img $img $hover alt=\"$edittext\" title=\"$edittext\" /></a>"; + } + } } else { - # insensitive drawing; the whole image gets a rather more - # decorative version of the edit URL - if ($editButton eq 1) { - $imgText .= "<img $img>"; - $imgText .= "<a href=\"$editUrl\" $hover>Edit</a>"; - } else { - $imgText .= "<a href=\"$editUrl\" $hover>". - "<img $img $hover alt=\"$edittext\" title=\"$edittext\" /></a>"; - } + $imgText .= "<a href=\"$editUrl\" $hover>Create $nameVal</a>"; } return $imgText; } @@ -999,26 +1004,38 @@ sub editAnyDrawing { - my( $fileName, $width, $height, $topic, $web ) = @_; - + my( $session, $fileName, $width, $height, $topic, $web ) = @_; + + # Only authenticated users may edit a drawing. + $session->{users}->{loginManager}->forceAuthentication(); + my $nameVal = $fileName; - my $drawingFile = TWiki::Func::getPubDir() . "/$web/$topic/$nameVal"; my $downloadURL = "%ATTACHURLPATH%/$nameVal"; - my $scriptURLPath = "%SCRIPTURLPATH%/pack200%SCRIPTSUFFIX%"; + my $pluginPubPath = "%PUBURLPATH%/TWiki/AnyWikiDrawPlugin"; - my $output = '<a name="appletdrawing"></a>'. + my $output = '<a name="anywikidraw" id="anywikidraw"></a>'. '<div style="z-index: 101;">'. '<applet codebase="/" '. - ' archive="'.$scriptURLPath.'/pub/TWiki/AnyWikiDrawPlugin/AnyWikiDrawForTWiki.jar"'. + ' archive="'.$pluginPubPath.'/AnyWikiDrawForTWiki.jar"'. ' code="org.anywikidraw.twiki.TWikiDrawingApplet.class"'. - ' width="'.(($width + 4 < 400) ? 400 : $width+4).'" height="'.(($height + 130 < 200) ? 200 : $height+130).'">'. + ' width="'.(($width + 24 < 600) ? 600 : (($width + 24 > 800) ? 800 : $width+24)).'"'. + ' height="'.(($height + 160 < 480) ? 480 : (($height + 4 > 600) ? 600 : $height+160)).'">'. '<param name="DrawingName" value="'.$nameVal.'">'. '<param name="DrawingWidth" value="'.$width.'">'. '<param name="DrawingHeight" value="'.$height.'">'. ((-e $drawingFile) ? '<param name="DrawingURL" value="'.$downloadURL.'">' : ''). '<param name="PageURL" value="'."%SCRIPTURLPATH%/view%SCRIPTSUFFIX%/%WEB%/%TOPIC%".'">'. '<param name="UploadURL" value="'."%SCRIPTURLPATH%/upload%SCRIPTSUFFIX%/%WEB%/%TOPIC%".'">'. + + # BEGIN Parameters for Sun Java Plugin + '<param name="codebase_lookup" value="false">'. + '<param name="classloader_cache" value="false">'. + '<param name="java_arguments" value="-Djnlp.packEnabled=true"/>'. + '<param name="image" value="'.$pluginPubPath.'/Splash.gif"/>'. + '<param name="boxborder" value="false"/>'. + '<param name="centerimage" value="true"/>'. + # END Parameters for Sun Java Plugin '</applet>'. '</div>'; return $output; @@ -1034,7 +1051,4 @@ } - - 1; - Modified: twiki/trunk/AnyWikiDrawPlugin/pub/TWiki/AnyWikiDrawPlugin/AnyWikiDrawForTWiki.jar =================================================================== (Binary files differ) Deleted: twiki/trunk/AnyWikiDrawPlugin/pub/TWiki/AnyWikiDrawPlugin/AnyWikiDrawForTWiki.jar.gz =================================================================== (Binary files differ) Modified: twiki/trunk/AnyWikiDrawPlugin/pub/TWiki/AnyWikiDrawPlugin/AnyWikiDrawForTWiki.jar.pack.gz =================================================================== (Binary files differ) Added: twiki/trunk/AnyWikiDrawPlugin/pub/TWiki/AnyWikiDrawPlugin/Splash.gif =================================================================== (Binary files differ) Property changes on: twiki/trunk/AnyWikiDrawPlugin/pub/TWiki/AnyWikiDrawPlugin/Splash.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream |