Menu
▾
▴
[TWiki-Dev] [SVN] PeterThoeny r18414 - in twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin: data/TWiki lib/TWiki/Plugins lib/TWiki/Plugins/TwistyPlugin
|
From: <de...@de...> - 2010-03-31 23:04:17
|
Author: PeterThoeny Date: 2010-03-31 18:04:07 -0500 (Wed, 31 Mar 2010) New Revision: 18414 Trac url: http://develop.twiki.org/trac/changeset/18414 Modified: twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/data/TWiki/TwistyPlugin.txt twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin/MANIFEST Log: Item6354: Make TwistyPlugin work with VarCachePlugin; added VarTWISTY variable documentation Modified: twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/data/TWiki/TwistyPlugin.txt =================================================================== --- twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/data/TWiki/TwistyPlugin.txt 2010-03-31 22:57:18 UTC (rev 18413) +++ twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/data/TWiki/TwistyPlugin.txt 2010-03-31 23:04:07 UTC (rev 18414) @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="BaseUserMapping_333" date="1195487956" format="1.1" version="1.2"}% +%META:TOPICINFO{author="TWikiContributor" date="1270075617" format="1.1" version="$Rev$"}% ---+!! <nop>%TOPIC% *A "twisty" is an interface toggle control to show and hide content.* @@ -366,7 +366,7 @@ ---++ Special syntax: format tokens If you use TWiki variables inside TWISTY parameters chances are it will mess up the variable, or the rendered html. Use format tokens to 'delay' rendering of these variables until the Twisty parameters are parsed. -The format tokens are the same as with %TWIKIWEB%.FormattedSearch: +The format tokens are the same as with %SYSTEMWEB%.FormattedSearch: | *Escape:* | *Expands To:* | | =$n= or =$n()= | New line. Use =$n()= if followed by alphanumeric character, e.g. write =Foo$n()Bar= instead of =Foo$nBar= | @@ -398,7 +398,7 @@ my twisty content %ENDTWISTY% -Or a more complex example using %TWIKIWEB%.SpreadsheetPlugin; do not write: +Or a more complex example using %SYSTEMWEB%.SpreadsheetPlugin; do not write: <verbatim> link="Count: (%CALC{"$GET(infoCount)"}%)" @@ -424,10 +424,10 @@ | =hidelink= | Link label | Hide link label | optional | | =showlink= | Link label | Show link label | optional | | =mode= | ="div"= or ="span"= | Specify if the Twisty Toggle section will use a =<div>= or a =<span>= tag. Note that if the contents contains block elements such as =div=, =mode= should be =div= as well to create valid HTML markup. | optional, defaults to =<span>= | - | =showimgleft= | Image url | Specify the url of an image that will be displayed with the show link at the left side of the link. <br />You may use [[%TWIKIWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | - | =hideimgleft= | Image url | Specify the url of an image that will be displayed with the hide link at the left side of the link. <br />You may use [[%TWIKIWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | - | =showimgright= | Image url | Specify the url of an image that will be displayed with the show link at the right side of the link. <br />You may use [[%TWIKIWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | - | =hideimgright= | Image url | Specify the url of an image that will be displayed with the hide link at the right side of the link. <br />You may use [[%TWIKIWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | + | =showimgleft= | Image url | Specify the url of an image that will be displayed with the show link at the left side of the link. <br />You may use [[%SYSTEMWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %SYSTEMWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | + | =hideimgleft= | Image url | Specify the url of an image that will be displayed with the hide link at the left side of the link. <br />You may use [[%SYSTEMWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %SYSTEMWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | + | =showimgright= | Image url | Specify the url of an image that will be displayed with the show link at the right side of the link. <br />You may use [[%SYSTEMWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %SYSTEMWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | + | =hideimgright= | Image url | Specify the url of an image that will be displayed with the hide link at the right side of the link. <br />You may use [[%SYSTEMWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %SYSTEMWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | | =remember= | ="on"=, ="off"= | If ="on"=, the Twisty state is remembered the next time the page is shown. If ="off"=, the stored setting will be cleared.<br /> *Note:* when used, think carefully about a unique name (id) for the Twisty, otherwise the cookie that is set might affect other Twisties with the same name. Also note that only interaction is stored, not the state of the Twisty when left unclicked. | optional, no default | | =start= | ="hide"= or ="show"= | Initial state of the Twisty; this will override any setting stored in a cookie (see =remember=). | optional, default no initial state | | =firststart= | ="hide"= or ="show"= | Initial state of the Twisty the first time the visitor gets to see the Twisty; this will NOT override cookie settings (see =remember=). | optional, default no initial state | @@ -478,9 +478,9 @@ | =id= | Unique identifier | Used to link [[#VarTWISTYSHOW][TWISTYSHOW]], [[#VarTWISTYHIDE ][TWISTYHIDE ]] and [[#VarTWISTYTOGGLE][TWISTYTOGGLE]] | required | | =link= | Link label | Show link label | optional | | =mode= | ="div"= or ="span"= | Specify if the Twisty Show link will use a =<div>= or a =<span>= tag. Note that if the contents contains block elements such as =div=, =mode= should be =div= as well to create valid HTML markup. | optional, defaults to =<span>= | - | =img= | Image url | Specify the url of an image that will be displayed at the *right side* of the link. <br />You may use [[%TWIKIWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | - | =imgleft=| Image url | Specify the url of an image that will be displayed at the left side of the link. <br />You may use [[%TWIKIWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | - | =imgright= | Image url | Specify the url of an image that will be displayed at the right side of the link. <br />You may use [[%TWIKIWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | + | =img= | Image url | Specify the url of an image that will be displayed at the *right side* of the link. <br />You may use [[%SYSTEMWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %SYSTEMWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | + | =imgleft=| Image url | Specify the url of an image that will be displayed at the left side of the link. <br />You may use [[%SYSTEMWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %SYSTEMWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | + | =imgright= | Image url | Specify the url of an image that will be displayed at the right side of the link. <br />You may use [[%SYSTEMWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %SYSTEMWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | | =remember= | ="on"=, ="off"= | If ="on"=, the Twisty state is remembered the next time the page is shown. If ="off"=, the stored setting will be cleared.<br /> *Note:* when used, think carefully about a unique name (id) for the Twisty, otherwise the cookie that is set might affect other Twisties with the same name. Also note that only interaction is stored, not the state of the Twisty when left unclicked. | optional, no default | | =start= | ="hide"= or ="show"= | Initial state of the Twisty; this will override any setting stored in a cookie (see =remember=). | optional, default no initial state | | =firststart= | ="hide"= or ="show"= | Initial state of the Twisty the first time the visitor gets to see the Twisty; this will NOT override cookie settings (see =remember=). | optional, default no initial state | @@ -496,7 +496,7 @@ | =id= | Unique identifier | Used to link [[#VarTWISTYSHOW][TWISTYSHOW]], [[#VarTWISTYHIDE ][TWISTYHIDE ]] and [[#VarTWISTYTOGGLE][TWISTYTOGGLE]] | required | | =link= | Link label | Hide link label | optional | | =mode= | ="div"= or ="span"= | Specify if the Twisty Hide link will use a =<div>= or a =<span>= tag. Note that if the contents contains block elements such as =div=, =mode= should be =div= as well to create valid HTML markup. | optional, defaults to =<span>= | - | =img= | Image url | Specify the url of an image that will be displayed at the *right side* of the link. <br />You may use [[%TWIKIWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | + | =img= | Image url | Specify the url of an image that will be displayed at the *right side* of the link. <br />You may use [[%SYSTEMWEB%.TWikiVariables#VarICONURLPATH][ICONURLPATH]] to display one of the %SYSTEMWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image | | =remember= | ="on"=, ="off"= | If ="on"=, the Twisty state is remembered the next time the page is shown. If ="off"=, the stored setting will be cleared.<br /> *Note:* when used, think carefully about a unique name (id) for the Twisty, otherwise the cookie that is set might affect other Twisties with the same name. Also note that only interaction is stored, not the state of the Twisty when left unclicked. | optional, no default | | =start= | ="hide"= or ="show"= | Initial state of the Twisty; this will override any setting stored in a cookie (see =remember=). | optional, default no initial state | | =firststart= | ="hide"= or ="show"= | Initial state of the Twisty the first time the visitor gets to see the Twisty; this will NOT override cookie settings (see =remember=). | optional, default no initial state | @@ -596,12 +596,13 @@ ---++ Plugin Info -| Authors: | TWiki:Main.RafaelAlvarez, TWiki:Main.ArthurClemens | -| Copyright ©: | 2005 Rafael Alvarez; 2006-2008 Arthur Clemens | +| Authors: | TWiki:Main/RafaelAlvarez, TWiki:Main/ArthurClemens, TWiki:Main/PeterThoeny | +| Copyright ©: | 2005 Rafael Alvarez; 2006-2008 Arthur Clemens; 2010 Peter Thoeny | | License: | [[http://www.gnu.org/copyleft/gpl.html][GPL]] | | Dependencies: | None | -| Plugin Version: | 10 Oct 2008 (version 1.4.12) | +| Plugin Version: | 2010-03-31 (version 1.5) | | Change History: | <!-- versions below in reverse order --> | +| 2010-03-31 | 1.5 TWikibug:Item6354, Peter Thoeny: Make !TwistyPlugin work with TWiki:Plugins/VarCachePlugin; added VarTWISTY variable documentation | | 08 Oct 2008 | 1.4.11, 1.4.12 It is now possible to have a twisty on the same line without a linebreak. | | 03 Aug 2008 | 1.4.10 TWiki 4.2.1 release version | | 13 Dec 2007 | 1.4.9 fix to the loading order of javascript files in head | @@ -619,3 +620,5 @@ | Home: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC% | | Feedback: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev | | Appraisal: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal | + +__Related Topics:__ TwistyContrib, VarTWISTY, %SYSTEMWEB%.TWikiPlugins, %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory Modified: twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin/MANIFEST =================================================================== --- twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin/MANIFEST 2010-03-31 22:57:18 UTC (rev 18413) +++ twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin/MANIFEST 2010-03-31 23:04:07 UTC (rev 18414) @@ -1,2 +1,9 @@ data/TWiki/TwistyPlugin.txt 0644 +data/TWiki/VarTWISTY.txt 0644 lib/TWiki/Plugins/TwistyPlugin.pm 0444 +templates/twistyplugin.tmpl 0444 +templates/twistyplugin.dojo.tmpl 0444 +pub/TWiki/TwistyPlugin/twistie.dojo.js 0644 +templates/twistyplugin.jquery.tmpl 0444 +pub/TWiki/TwistyPlugin/twistie.jquery.css 0644 +pub/TWiki/TwistyPlugin/twistie.jquery.js 0644 Modified: twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm =================================================================== --- twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm 2010-03-31 22:57:18 UTC (rev 18413) +++ twiki/branches/TWikiRelease04x03/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm 2010-03-31 23:04:07 UTC (rev 18414) @@ -1,6 +1,7 @@ # Plugin for TWiki Collaboration Platform, http://TWiki.org/ # # Copyright (C) 2005 Rafael Alvarez, sor...@so... +# Copyright (C) 2010 Peter Thoeny, pe...@th... # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -39,12 +40,12 @@ # This should always be $Rev: 15653 (19 Nov 2007) $ so that TWiki can determine the checked-in # status of the plugin. It is used by the build automation tools, so # you should leave it alone. -$VERSION = '$Rev: 15653 (19 Nov 2007) $'; +$VERSION = '$Rev: 15653$'; # 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 = '1.4.12'; +$RELEASE = '1.5'; $pluginName = 'TwistyPlugin'; @@ -94,6 +95,14 @@ return 1; } +sub beforeCommonTagsHandler +{ + # Special case: We need to add JS to header if VarCachePlugin is used + if( $_[0] =~ /%VARCACHE/ && $_[0] =~ /%TWISTY/ ) { + _addHeader(); + } +} + sub _setDefaults { $defaultMode = 'span'; $defaultShowLink = ''; |