[TWiki-Dev] [SVN] r7824 - in twiki/branches/DEVELOP: data/TWiki pub/TWiki/TWikiDocGraphics tools twi

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Author: ArthurClemens
Date: 2005-12-09 16:01:43 -0800 (Fri, 09 Dec 2005)
New Revision: 7824

Added:
   twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleclose-small.gif
   twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleopen-small.gif
Modified:
   twiki/branches/DEVELOP/data/TWiki/TWikiDocGraphics.txt
   twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleclose.gif
   twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleopen.gif
   twiki/branches/DEVELOP/tools/MANIFEST
   twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/attach.pattern.tmpl
   twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/edit.pattern.tmpl
   twiki/branches/DEVELOP/twikiplugins/TwistyPlugin/data/TWiki/TwistyPlugin.txt
   twiki/branches/DEVELOP/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm
Log:
Item660: updating toggle icons; adding support for TwistyPlugin left image; updating pattern templates that use twisties

Modified: twiki/branches/DEVELOP/data/TWiki/TWikiDocGraphics.txt
===================================================================

--- twiki/branches/DEVELOP/data/TWiki/TWikiDocGraphics.txt	2005-12-09 20:03:04 UTC (rev 7823)
+++ twiki/branches/DEVELOP/data/TWiki/TWikiDocGraphics.txt	2005-12-10 00:01:43 UTC (rev 7824)
@@ -169,9 +169,10 @@
 | <img src="%ATTACHURLPATH%/go_ff.gif" alt="Go fast forward" title="Go fast forward" />  | =go_ff.gif= | Go fast forward | =%<nop>ICON{go_ff}%= |
 | <img src="%ATTACHURLPATH%/go_end.gif" alt="Go to end" title="Go to end" />  | =go_end.gif= | Go to end | =%<nop>ICON{go_end}%= |
 | <img src="%ATTACHURLPATH%/toggleclose.gif" alt="Close toggle, Twisty close toggle" title="Close toggle, Twisty close toggle" />  | =toggleclose.gif= | Close toggle, Twisty close toggle | =%<nop>ICON{toggleclose}%= |
+| <img src="%ATTACHURLPATH%/toggleclose-small.gif" alt="Close toggle, Twisty close toggle" title="Close toggle, Twisty close toggle" />  | =toggleclose-small.gif= | Close toggle, Twisty close toggle | =%<nop>ICON{toggleclose-small}%= |
 | <img src="%ATTACHURLPATH%/toggleopen.gif" alt="Open toggle, Twisty open toggle" title="Open toggle, Twisty open toggle" />  | =toggleopen.gif= | Open toggle, Twisty open toggle | =%<nop>ICON{toggleopen}%= |
+| <img src="%ATTACHURLPATH%/toggleopen-small.gif" alt="Open toggle, Twisty open toggle" title="Open toggle, Twisty open toggle" />  | =toggleopen-small.gif= | Open toggle, Twisty open toggle | =%<nop>ICON{toggleopen-small}%= |
 
-
 ---+++ %ICON{line_ur}% Block graphics
 
 | *&nbsp;* | *File Name* | *Description* | *Write...* |
@@ -401,7 +402,9 @@
 %META:FILEATTACHMENT{name="tip.gif" attr="" autoattached="1" comment="" date="1128927097" path="tip.gif" size="233" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="todo.gif" attr="" autoattached="1" comment="" date="1128927098" path="todo.gif" size="318" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="toggleclose.gif" attr="" autoattached="1" comment="" date="1128927099" path="toggleclose.gif" size="135" user="UnknownUser" version=""}%
+%META:FILEATTACHMENT{name="toggleclose-small.gif" attr="" autoattached="1" comment="" date="1128927099" path="toggleclose-small.gif" size="135" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="toggleopen.gif" attr="" autoattached="1" comment="" date="1128927100" path="toggleopen.gif" size="138" user="UnknownUser" version=""}%
+%META:FILEATTACHMENT{name="toggleopen-small.gif" attr="" autoattached="1" comment="" date="1128927100" path="toggleopen-small.gif" size="138" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="topicbacklinks.gif" attr="" autoattached="1" comment="" date="1128927101" path="topicbacklinks.gif" size="130" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="topicdiffs.gif" attr="" autoattached="1" comment="" date="1128927103" path="topicdiffs.gif" size="157" user="UnknownUser" version=""}%
 %META:FILEATTACHMENT{name="trash.gif" attr="" autoattached="1" comment="" date="1128927104" path="trash.gif" size="224" user="UnknownUser" version=""}%

Added: twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleclose-small.gif
===================================================================
(Binary files differ)


Property changes on: twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleclose-small.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleclose.gif
===================================================================
(Binary files differ)

Added: twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleopen-small.gif
===================================================================
(Binary files differ)


Property changes on: twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleopen-small.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: twiki/branches/DEVELOP/pub/TWiki/TWikiDocGraphics/toggleopen.gif
===================================================================
(Binary files differ)

Modified: twiki/branches/DEVELOP/tools/MANIFEST
===================================================================
--- twiki/branches/DEVELOP/tools/MANIFEST	2005-12-09 20:03:04 UTC (rev 7823)
+++ twiki/branches/DEVELOP/tools/MANIFEST	2005-12-10 00:01:43 UTC (rev 7824)
@@ -568,7 +568,9 @@
 pub/TWiki/TWikiDocGraphics/tip.gif 0660
 pub/TWiki/TWikiDocGraphics/todo.gif 0660
 pub/TWiki/TWikiDocGraphics/toggleclose.gif 0660
+pub/TWiki/TWikiDocGraphics/toggleclose-small.gif 0660
 pub/TWiki/TWikiDocGraphics/toggleopen.gif 0660
+pub/TWiki/TWikiDocGraphics/toggleopen-small.gif 0660
 pub/TWiki/TWikiDocGraphics/topicbacklinks.gif 0660
 pub/TWiki/TWikiDocGraphics/topicdiffs.gif 0660
 pub/TWiki/TWikiDocGraphics/trash.gif 0660

Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/attach.pattern.tmpl
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/attach.pattern.tmpl	2005-12-09 20:03:04 UTC (rev 7823)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/attach.pattern.tmpl	2005-12-10 00:01:43 UTC (rev 7824)
@@ -29,7 +29,7 @@
 <table cellpadding="0" cellspacing="0" border="0">
 <tr>
 <td class="patternToolBar">
-<span id="attachhelpshow" class="twistyMakeVisible"><a href="#" class="twistyTrigger">%MAKETEXT{"Show help"}%%ICON{toggleopen}%</a></span><span id="attachhelphide" class="twistyHidden twistyMakeVisible"><a href="#" class="twistyTrigger">%MAKETEXT{"Hide help"}%%ICON{toggleclose}%</a></span>
+<span id="attachhelpshow" class="twistyMakeVisible"><a href="#" class="twistyTrigger">%ICON{toggleopen-small}%<span class="twikiLinkLabel">%MAKETEXT{"Show help"}%</span></a></span><span id="attachhelphide" class="twistyHidden twistyMakeVisible"><a href="#" class="twistyTrigger">%ICON{toggleclose-small}%<span class="twikiLinkLabel">%MAKETEXT{"Hide help"}%</span></a></span>
 </td>
 </tr>
 </table>
@@ -46,7 +46,7 @@
 
 
 %TMPL:DEF{"existingattachments"}%
-<span class="twikiSmallish"><span id="attachexistingshow" class="twistyMakeVisible"><a href="#" class="twistyTrigger"><span class="twikiLinkLabel">%MAKETEXT{"Show existing attachments"}%</span>%ICON{toggleopen}%</a></span><span id="attachexistinghide" class="twistyHidden twistyMakeVisible"><a href="#" class="twistyTrigger"><span class="twikiLinkLabel">%MAKETEXT{"Hide existing attachments"}%</span>%ICON{toggleclose}%</a></span></span>
+<span class="twikiSmallish"><span id="attachexistingshow" class="twistyMakeVisible"><a href="#" class="twistyTrigger">%ICON{toggleopen-small}%<span class="twikiLinkLabel">%MAKETEXT{"Show existing attachments"}%</span></a></span><span id="attachexistinghide" class="twistyHidden twistyMakeVisible"><a href="#" class="twistyTrigger">%ICON{toggleclose-small}%<span class="twikiLinkLabel">%MAKETEXT{"Hide existing attachments"}%</span></a></span></span>
 <div id="attachexistingtoggle" class="twistyMakeHidden twistyRememberSetting">
 %META{"attachments" all="on" title="<h2>%MAKETEXT{"Existing attachments"}%</h2>"}%
 </div>

Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/edit.pattern.tmpl
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/edit.pattern.tmpl	2005-12-09 20:03:04 UTC (rev 7823)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/edit.pattern.tmpl	2005-12-10 00:01:43 UTC (rev 7824)
@@ -16,7 +16,7 @@
 <table cellpadding="0" cellspacing="0" border="0">
 <tr>
 <td class="patternToolBar">
-<span id="edithelpshow" class="twistyMakeVisible"><a href="#" class="twistyTrigger">%MAKETEXT{"Show formatting help"}%%ICON{toggleopen}%</a></span><span id="edithelphide" class="twistyHidden twistyMakeVisible"><a href="#" class="twistyTrigger">%MAKETEXT{"Hide formatting help"}%%ICON{toggleclose}%</a></span>&nbsp;
+<span id="edithelpshow" class="twistyMakeVisible"><a href="#" class="twistyTrigger">%ICON{toggleopen-small}%<span class="twikiLinkLabel">%MAKETEXT{"Show formatting help"}%</span></a></span><span id="edithelphide" class="twistyHidden twistyMakeVisible"><a href="#" class="twistyTrigger">%ICON{toggleclose-small}%<span class="twikiLinkLabel">%MAKETEXT{"Hide formatting help"}%</span></a></span>&nbsp;
 </td>
 </tr>
 </table>

Modified: twiki/branches/DEVELOP/twikiplugins/TwistyPlugin/data/TWiki/TwistyPlugin.txt
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/TwistyPlugin/data/TWiki/TwistyPlugin.txt	2005-12-09 20:03:04 UTC (rev 7823)
+++ twiki/branches/DEVELOP/twikiplugins/TwistyPlugin/data/TWiki/TwistyPlugin.txt	2005-12-10 00:01:43 UTC (rev 7824)
@@ -25,8 +25,10 @@
     | =link="Link Text"= | The text to be used in the Twisty Show link  | optional |
     | =mode="div/span"= | Specify if the Twisty Show link will use a =&lt;div&gt;= or a =&lt;span&gt;= tag  | optional, defaults to =&lt;span&gt;= |
     | =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#VarICONPATH][ICONPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image |
-	* Example: =%<nop>TWISTYSHOW{id="demo" link=" Click to Unfold " img="%<nop>ICONPATH{toggleopen}%"}%= expands to: <br /> 
-	=&lt;span id="demoshow" class="twistyMakeVisible"&gt;&lt;a href="#" class="twistyTrigger"&gt;&lt;span class="twikiLinkLabel"&gt; Click to Unfold &lt;/span&gt;&lt;img src="http://visiblearea.com/devtwiki/pub/TWiki/TWikiDocGraphics/toggleopen.gif" alt="" /&gt;&lt;/a&gt;&lt;/span&gt;=
+    | =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#VarICONPATH][ICONPATH]] 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#VarICONPATH][ICONPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image |
+	* Example: =%<nop>TWISTYSHOW{id="demo" link=" Click to Unfold " imgleft="%<nop>ICONPATH{toggleopen}%"}%= expands to: <br /> 
+	=&lt;span id="demoshow" class="twistyMakeVisible"&gt;&lt;a href="#" class="twistyTrigger"&gt;&lt;img src="http://visiblearea.com/devtwiki/pub/TWiki/TWikiDocGraphics/toggleopen.gif" alt="" /&gt;&lt;span class="twikiLinkLabel"&gt; Click to Unfold &lt;/span&gt;&lt;/a&gt;&lt;/span&gt;=
 	* Related: [[#VarTWISTYHIDE][TWISTYHIDE]] and [[#VarTWISTYTOGGLE][TWISTYTOGGLE]]
 
 #VarTWISTYHIDE
@@ -39,8 +41,8 @@
     | =link="Link Text"= | The text to be used in the Twisty Hide link  | optional |
     | =mode="div/span"= | Specify if the Twisty Hide link will use a =&lt;div&gt;= or a =&lt;span&gt;= tag  | optional, defaults to =&lt;span&gt;= |
     | =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#VarICONPATH][ICONPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image |
-	* Example: =%<nop>TWISTYHIDE{id="demo" link=" Click to Fold " img="%<nop>ICONPATH{toggleclose}%"}%= expands to: <br /> 
-	=&lt;span id="demohide" class="twistyHidden twistyMakeVisible"&gt;&lt;a href="#" class="twistyTrigger"&gt;&lt;span class="twikiLinkLabel"&gt; Click to Fold &lt;/span&gt;&lt;img src="http://visiblearea.com/devtwiki/pub/TWiki/TWikiDocGraphics/toggleclose.gif" alt="" /&gt;&lt;/a&gt;&lt;/span&gt;=
+	* Example: =%<nop>TWISTYHIDE{id="demo" link=" Click to Fold " imgleft="%<nop>ICONPATH{toggleclose}%"}%= expands to: <br /> 
+	=&lt;span id="demohide" class="twistyHidden twistyMakeVisible"&gt;&lt;a href="#" class="twistyTrigger"&gt;&lt;img src="http://visiblearea.com/devtwiki/pub/TWiki/TWikiDocGraphics/toggleclose.gif" alt="" /&gt;&lt;span class="twikiLinkLabel"&gt; Click to Fold &lt;/span&gt;&lt;/a&gt;&lt;/span&gt;=
 	* Related: [[#VarTWISTYSHOW][TWISTYSHOW]] and [[#VarTWISTYTOGGLE][TWISTYTOGGLE]]
 
 #VarTWISTYTOGGLE
@@ -77,6 +79,8 @@
     | =showlink="Link Text"= | The text to be used in the Twisty show link  | optional |
     | =mode="div/span"= | Specify if the Twisty link will use a =&lt;div&gt;= or a =&lt;span&gt;= tag  | optional, defaults to =&lt;span&gt;= |
     | =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#VarICONPATH][ICONPATH]] 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#VarICONPATH][ICONPATH]] 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#VarICONPATH][ICONPATH]] to display one of the %TWIKIWEB%.TWikiDocGraphics icons. Alternatively use an image attached to the topic. | optional, defaults to no image |
     | =hideimg="image url"= | Specify the image to be show in the Twisty hide link | optiona, defaults to =img= value |
     | =showimg="image url"= | Specify the image to be show in the Twisty show link | optional, defaults to =img= value |
 	* Related: [[#VarTWISTYSHOW][TWISTYSHOW]] and [[#VarTWISTYHIDE][TWISTYHIDE]]
@@ -103,7 +107,7 @@
  If the plugin is properly installed, you should see the Twisty effect below:
 
 
-%TWISTYSHOW{id="demo" link="Click to show" img="%ICONPATH{toggleopen}%"}% %TWISTYHIDE{id="demo" link="Click to hide" img="%ICONPATH{'toggleclose'}%"}% 
+%TWISTYSHOW{id="demo" link="Click to show" imgleft="%ICONPATH{toggleopen}%" }% %TWISTYHIDE{id="demo" link="Click to hide" imgleft="%ICONPATH{'toggleclose'}%"}% 
 ---
 %TWISTYTOGGLE{id="demo" mode="div" remember="on"}% 
 *TwistyPlugin is properly installed!*

Modified: twiki/branches/DEVELOP/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm	2005-12-09 20:03:04 UTC (rev 7823)
+++ twiki/branches/DEVELOP/twikiplugins/TwistyPlugin/lib/TWiki/Plugins/TwistyPlugin.pm	2005-12-10 00:01:43 UTC (rev 7824)
@@ -121,10 +121,16 @@
     my $link = $params->{$theState.'link'} || $params->{'link'} || '';
     my $mode = $params->{'buttonmode'} || $params->{'mode'} || 'span';
     my $img = $params->{$theState.'img'} || $params->{'img'} || '';
+    my $imgright = $params->{$theState.'imgright'} || $params->{'imgright'} || '';
+    my $imgleft = $params->{$theState.'imgleft'} || $params->{'imgleft'} || '';
     $img =~ s/['\"]//go;
+    $imgright =~ s/['\"]//go;
+    $imgleft =~ s/['\"]//go;
     my $imgTag = ($img ne '') ? '<img src="'.$img.'" border="0" alt="" />' : '';
+    my $imgRightTag = ($imgright ne '') ? '<img src="'.$imgright.'" border="0" alt="" />' : '';
+    my $imgLeftTag = ($imgleft ne '') ? '<img src="'.$imgleft.'" border="0" alt="" />' : '';
     my $initialHidden = ($theState eq 'hide') ? 'twistyHidden ' : '';
-    return '<'.$mode.' id="'.$id.$theState.'" class="'.$initialHidden.'twistyMakeVisible"><a href="#" class="twistyTrigger"><span class="twikiLinkLabel">'.$link.'</span>'.$imgTag.'</a></'.$mode.'>';
+    return '<'.$mode.' id="'.$id.$theState.'" class="'.$initialHidden.'twistyMakeVisible"><a href="#" class="twistyTrigger">'.$imgLeftTag.'<span class="twikiLinkLabel">'.$link.'</span>'.$imgTag.$imgRightTag.'</a></'.$mode.'>';
 }
 
 





[TWiki-Dev] [SVN] r7824 - in twiki/branches/DEVELOP: data/TWiki pub/TWiki/TWikiDocGraphics tools twi

Open Source Enterprise Wiki and Web Application Platform

[TWiki-Dev] [SVN] r7824 - in twiki/branches/DEVELOP: data/TWiki pub/TWiki/TWikiDocGraphics tools twikiplugins/PatternSkin/templates twikiplugins/TwistyPlugin/data/TWiki twikiplugins/TwistyPlugin/lib/TWiki/Plugins