Menu
▾
▴
[TWiki-Dev] [SVN] PeterThoeny r18700 - in twiki/trunk/EditTablePlugin: data/TWiki lib/TWiki/Plugins lib/TWiki/Plugins/EditTablePlugin test/unit/EditTablePlugin
|
From: <de...@de...> - 2010-05-16 07:45:18
|
Author: PeterThoeny Date: 2010-05-16 02:45:10 -0500 (Sun, 16 May 2010) New Revision: 18700 Trac url: http://develop.twiki.org/trac/changeset/18700 Modified: twiki/trunk/EditTablePlugin/data/TWiki/EditTablePlugin.txt twiki/trunk/EditTablePlugin/data/TWiki/VarEDITTABLE.txt twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin.pm twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm twiki/trunk/EditTablePlugin/test/unit/EditTablePlugin/EditTablePluginTests.pm Log: Item6433: Doc improvements; replacing TWIKIWEB with SYSTEMWEB Modified: twiki/trunk/EditTablePlugin/data/TWiki/EditTablePlugin.txt =================================================================== --- twiki/trunk/EditTablePlugin/data/TWiki/EditTablePlugin.txt 2010-05-16 06:53:01 UTC (rev 18699) +++ twiki/trunk/EditTablePlugin/data/TWiki/EditTablePlugin.txt 2010-05-16 07:45:10 UTC (rev 18700) @@ -1,12 +1,18 @@ -%META:TOPICINFO{author="TWikiContributor" date="1240035399" format="1.1" version="$Rev$"}% +%META:TOPICINFO{author="TWikiContributor" date="1273993921" format="1.1" version="$Rev$"}% +---+!! Edit Table Plugin <!-- - Contributions to this plugin are appreciated. Please update the plugin page - at http://twiki.org/cgi-bin/view/Plugins/EditTablePlugin or provide feedback - at http://twiki.org/cgi-bin/view/Plugins/EditTablePluginDev. + Contributions to this TWiki plugin are appreciated. Please update the plugin page at + http://twiki.org/cgi-bin/view/Plugins/EditTablePlugin or provide feedback at + http://twiki.org/cgi-bin/view/Plugins/EditTablePluginDev. If you are a TWiki contributor please update the plugin in the SVN repository. --> ----+!! Edit Table Plugin +<div style="float:right; background-color:#EBEEF0; margin:0 0 20px 20px; padding: 0 10px 0 10px;"> +%TOC% +</div> +%SHORTDESCRIPTION% +---++ Introduction + Edit TWiki tables in place, using edit fields and drop down boxes, without having to edit the complete topic. Simply add an *[ Edit table ]* button to an existing table by writing =%<nop>EDITTABLE{}%= directly above the table. This can be added to tables that are formatted with TablePlugin: add the =EDITTABLE= variable just above or below the =TABLE= tag. It can also be used without any =TABLE= tag. @@ -15,8 +21,6 @@ Multiple tables per topic are editable, but only one at a time can be edited. -%TOC% - ---++ Per Table Settings Add a =%<nop>EDITTABLE{...}%= variable just before an existing table to make it editable, or add the variable anywhere in a topic to start a new table. @@ -37,15 +41,13 @@ | =$percnt= | Percent sign (=%=) | | =$dollar= | Dollar sign (=$=) | - #DateField ---+++ Date Field Type <img src="%ATTACHURLPATH%/EditTablePluginCalendarExample.gif" alt="Edit Table Calendar Example" width="638" height="250" /> -The =date= field type allows one to choose a date with a popup calendar. Popup calendar works with all modern browsers. The date picker button is inactive if the browser cannot support the popup calendar or if javascript is disabled. +The =date= field type allows one to choose a date with a popup calendar. Popup calendar works with all modern browsers. The date picker button is inactive if the browser cannot support the popup calendar or if Javascript is disabled. - ---++ Per Cell Settings An individual edit field type can be defined for each table cell. Place an =%<nop>EDITCELL{ "type, ..." }%= variable at the end of the cell content. This is useful to override the per column =%<nop>EDITTABLE{ format="..." }%= settings, or to create tables with key/value rows. All edit field types of the =format="..."= parameter are supported. For example, to define a text field, type: =| cell content %<nop>EDITCELL{ "text, 20" }% |= @@ -65,8 +67,7 @@ * <input type="submit" class="twikiButton" name="etaddrow" value="Add row" onclick="return(false);" /> - add row to the table (if enabled) * <input type="submit" class="twikiButton" name="etdelrow" value="Delete last row" onclick="return(false);" /> - remove last row from the table (if enabled) * <input type="submit" class="twikiButtonCancel" name="etcancel" value="Cancel" onclick="return(false);" /> - cancel without saving and release edit lock - * <img src="%ATTACHURLPATH%/btn_move.gif"> - Move a row by clicking this button next to the row to - be moved, then at a destination. + * <img src="%ATTACHURLPATH%/btn_move.gif"> - Move a row by clicking this button next to the row to be moved, then at a destination. * <img src="%ATTACHURLPATH%/btn_delete.gif"> - Deletes the row next to this button. </form> @@ -86,30 +87,30 @@ <div class="editTable editTableEdit"> <input type="hidden" name="ettablenr" value="1" /> <table cellspacing="0" id="default" cellpadding="0" class="twikiTable" rules="rows" border="1"> - <thead> - <tr class="twikiTableEven twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> - <th bgcolor="#6b7f93" valign="top" class="twikiTableCol0 twikiFirstCol"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=0;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Nr<input type="hidden" name="etcell1x1" value="*Nr*" /></font></a> </th> - <th bgcolor="#6b7f93" valign="top" class="twikiTableCol1"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=1;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Text field<input type="hidden" name="etcell1x2" value="*Text field*" /></font></a> </th> - <th bgcolor="#6b7f93" valign="top" class="twikiTableCol2"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=2;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Drop down<input type="hidden" name="etcell1x3" value="*Drop down*" /></font></a> </th> - <th bgcolor="#6b7f93" valign="top" class="twikiTableCol3"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=3;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Mood<input type="hidden" name="etcell1x4" value="*Mood*" /></font></a> </th> - <th bgcolor="#6b7f93" valign="top" class="twikiTableCol4 twikiLastCol"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=4;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Timestamp<input type="hidden" name="etcell1x5" value="*Timestamp*" /></font></a> </th> - </tr> - </thead> - <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol"> <span class="et_rowlabel">1<input type="hidden" name="etcell2x1" value="1" /></span> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol1"> <input class="twikiInputField editTableInput" type="text" name="etcell2x2" size="20" value="hello table" /> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol2"> <select class="twikiSelect" name="etcell2x3" size="1"> <option selected="selected">one</option> <option>two</option> <option>three</option> <option>four</option></select> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol3"> <input type="radio" name="etcell2x4" value=":-)" checked="checked" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/smile.gif" alt="smile" title="smile" border="0" /> <input type="radio" name="etcell2x4" value=":-I" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/indifferent.gif" alt="indifferent" title="indifferent" border="0" /> <input type="radio" name="etcell2x4" value=":-(" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/frown.gif" alt="frown" title="frown" border="0" /> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol4 twikiLastCol"> 26 Jun 2002 12:30<input type="hidden" name="etcell2x5" value="26 Jun 2002 12:30" /> </td> - </tr> - <tr class="twikiTableEven twikiTableRowdataBgSorted1 twikiTableRowdataBg1"> - <td bgcolor="#edf4f9" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <span class="et_rowlabel">2<input type="hidden" name="etcell3x1" value="2" /></span> </td> - <td bgcolor="#edf4f9" valign="top" class="twikiTableCol1 twikiLast"> <input class="twikiInputField editTableInput" type="text" name="etcell3x2" size="20" value="" /> </td> + <thead> + <tr class="twikiTableEven twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> + <th bgcolor="#6b7f93" valign="top" class="twikiTableCol0 twikiFirstCol"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=0;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Nr<input type="hidden" name="etcell1x1" value="*Nr*" /></font></a> </th> + <th bgcolor="#6b7f93" valign="top" class="twikiTableCol1"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=1;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Text field<input type="hidden" name="etcell1x2" value="*Text field*" /></font></a> </th> + <th bgcolor="#6b7f93" valign="top" class="twikiTableCol2"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=2;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Drop down<input type="hidden" name="etcell1x3" value="*Drop down*" /></font></a> </th> + <th bgcolor="#6b7f93" valign="top" class="twikiTableCol3"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=3;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Mood<input type="hidden" name="etcell1x4" value="*Mood*" /></font></a> </th> + <th bgcolor="#6b7f93" valign="top" class="twikiTableCol4 twikiLastCol"> <a rel="nofollow" href="%SCRIPTURL{"viewauth"}%/%SYSTEMWEB%/EditTablePlugin?ettablenr=1&amp;etedit=on&amp;etrows=3&amp;x=27&amp;y=13&amp;sortcol=4;table=2;up=0#sorted_table" title="Sort by this column"><font color="#ffffff">Timestamp<input type="hidden" name="etcell1x5" value="*Timestamp*" /></font></a> </th> + </tr> + </thead> + <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol"> <span class="et_rowlabel">1<input type="hidden" name="etcell2x1" value="1" /></span> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol1"> <input class="twikiInputField editTableInput" type="text" name="etcell2x2" size="20" value="hello table" /> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol2"> <select class="twikiSelect" name="etcell2x3" size="1"> <option selected="selected">one</option> <option>two</option> <option>three</option> <option>four</option></select> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol3"> <input type="radio" name="etcell2x4" value=":-)" checked="checked" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/smile.gif" alt="smile" title="smile" border="0" /> <input type="radio" name="etcell2x4" value=":-I" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/indifferent.gif" alt="indifferent" title="indifferent" border="0" /> <input type="radio" name="etcell2x4" value=":-(" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/frown.gif" alt="frown" title="frown" border="0" /> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol4 twikiLastCol"> 26 Jun 2002 12:30<input type="hidden" name="etcell2x5" value="26 Jun 2002 12:30" /> </td> + </tr> + <tr class="twikiTableEven twikiTableRowdataBgSorted1 twikiTableRowdataBg1"> + <td bgcolor="#edf4f9" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <span class="et_rowlabel">2<input type="hidden" name="etcell3x1" value="2" /></span> </td> + <td bgcolor="#edf4f9" valign="top" class="twikiTableCol1 twikiLast"> <input class="twikiInputField editTableInput" type="text" name="etcell3x2" size="20" value="" /> </td> - <td bgcolor="#edf4f9" valign="top" class="twikiTableCol2 twikiLast"> <select class="twikiSelect" name="etcell3x3" size="1"> <option>one</option> <option selected="selected">two</option> <option>three</option> <option>four</option></select> </td> - <td bgcolor="#edf4f9" valign="top" class="twikiTableCol3 twikiLast"> <input type="radio" name="etcell3x4" value=":-)" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/smile.gif" alt="smile" title="smile" border="0" /> <input type="radio" name="etcell3x4" value=":-I" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/indifferent.gif" alt="indifferent" title="indifferent" border="0" /> <input type="radio" name="etcell3x4" value=":-(" checked="checked" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/frown.gif" alt="frown" title="frown" border="0" /> </td> - <td bgcolor="#edf4f9" valign="top" class="twikiTableCol4 twikiLastCol twikiLast"> 27 Jun 2002 12:40<input type="hidden" name="etcell3x5" value="27 Jun 2002 12:40" /> </td> - </tr></table> + <td bgcolor="#edf4f9" valign="top" class="twikiTableCol2 twikiLast"> <select class="twikiSelect" name="etcell3x3" size="1"> <option>one</option> <option selected="selected">two</option> <option>three</option> <option>four</option></select> </td> + <td bgcolor="#edf4f9" valign="top" class="twikiTableCol3 twikiLast"> <input type="radio" name="etcell3x4" value=":-)" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/smile.gif" alt="smile" title="smile" border="0" /> <input type="radio" name="etcell3x4" value=":-I" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/indifferent.gif" alt="indifferent" title="indifferent" border="0" /> <input type="radio" name="etcell3x4" value=":-(" checked="checked" /> <img src="%PUBURL%/%SYSTEMWEB%/SmiliesPlugin/frown.gif" alt="frown" title="frown" border="0" /> </td> + <td bgcolor="#edf4f9" valign="top" class="twikiTableCol4 twikiLastCol twikiLast"> 27 Jun 2002 12:40<input type="hidden" name="etcell3x5" value="27 Jun 2002 12:40" /> </td> + </tr></table> <input type="hidden" name="etrows" value="3" /> <input type="submit" name="etsave" id="etsave" value="Save table" class="twikiSubmit" /> <input type="submit" name="etqsave" id="etqsave" value="Quiet save" class="twikiButton" /> @@ -154,8 +155,7 @@ ---++ Plugin Settings -Plugin settings are stored as preferences variables. To reference -a plugin setting write ==%<nop><plugin>_<setting>%==, for example, ==%<nop>EDITTABLEPLUGIN_SHORTDESCRIPTION%== +Plugin settings are stored as preferences variables. To reference a plugin setting write ==%<nop><plugin>_<setting>%==, for example, ==%<nop>EDITTABLEPLUGIN_SHORTDESCRIPTION%== * One line description, shown in the %SYSTEMWEB%.TextFormattingRules topic: * Set SHORTDESCRIPTION = Edit TWiki tables using edit fields, date pickers and drop down boxes @@ -183,7 +183,7 @@ * Default help texts * Set INCLUDED_TOPIC_DOES_NOT_EXIST = <span class="twikiAlert">%MAKETEXT{"Warning: 'include' topic does not exist!"}%</span> - + __Note:__ The Plugin uses base settings like date format, language and style from the JSCalendarContrib. ---++ Limitations and Known Issues @@ -194,8 +194,6 @@ * You can include %-vars now in select values, by quoting them with <nop>, as in %<nop>X% for %<nop>X%, say for instance: <br /> =select,1,%<nop>X%,%<nop>Y%= - - ---++ Installation Instructions * Download the ZIP file from the Plugin web (see below) @@ -204,23 +202,19 @@ * Manually resolve the dependencies listed below. %$DEPENDENCIES% * The Plugin depends on the =viewauth= script to authenticate the user. As described in %SYSTEMWEB%.TWikiAccessControl, copy the =view= script to =viewauth= (or better, create a symbolic link) and add =viewauth= to the list of authenticated scripts in the =.htaccess= file. - * (Dakar) Visit =configure= in your TWiki installation, and enable the plugin in the {Plugins} section. + * Visit =configure= in your TWiki installation, and enable the plugin in the {Plugins} section. * Test if the Plugin is correctly installed: * Check above example if there is an *[ Edit table ]* button below the table in above example * Click on *[ Edit table ]*, make changes and save the table ----++ License - - * The Edit Table Plugin is released under the [[http://www.gnu.org/licenses/gpl.html][GPL]] - - ---++ Plugin Info | Plugin Author: | Arthur Clemens, TWiki:Main/PeterThoeny | -| Copyright: | © 2008 Arthur Clemens, 2002-2009 TWiki:Main.PeterThoeny ([[http://www.twiki.net/][TWIKI.NET]]) and TWiki Contributors | +| Copyright: | © 2008 Arthur Clemens;%BR% © 2002-2010 TWiki:Main.PeterThoeny ([[http://www.twiki.net/][Twiki, Inc.]]); © 2002-2010 TWiki:TWiki/TWikiContributor | | License: | GPL ([[http://www.gnu.org/copyleft/gpl.html][GNU General Public License]]) | -| Plugin Version: | 4.9.1 (17 Apr 2009) | +| Plugin Version: | 5.0 (2010-05-16) | | Change History: | <!-- specify latest version first --> | +| 2010-05-16: | 5.0: TWikibug:Item6433 - doc improvements; replacing TWIKIWEB with SYSTEMWEB | | 17 Apr 2009: | 4.9.1: Save of table can only be done with http POST method, not GET | | 01 Nov 2008: | 4.9: Arthur Clemens: Fixed rendering of =verbatim= blocks when editing. Added parameter =buttonrow="top"= to allow the buttons to be positioned at the top of the table. | | 26 Sep 2008: | 4.8.7: Arthur Clemens: Let empty table initialize more than one column from =header= parameter | @@ -235,7 +229,7 @@ | 01 Dec 2007: | 4.3: Arthur Clemens: added support for TablePlugin =headerrows= and =footerrows=; updated edit button | | 16 Oct 2007: | 4.2: Arthur Clemens: refactoring, bug fixes. | | 07 Oct 2007: | 15182: PTh: Added %SYSTEMWEB%.VarEDITTABLE to have it listed in %SYSTEMWEB%.TWikiVariables | -| 15 Mar 2007: | Arthur Clemens: Fixed eating of double newlines; icons for javascript buttons and interface improvements. By default the javascript interface is turned off, set =JAVASCRIPTINTERFACE= to use it in edit mode. | +| 15 Mar 2007: | Arthur Clemens: Fixed eating of double newlines; icons for Javascript buttons and interface improvements. By default the Javascript interface is turned off, set =JAVASCRIPTINTERFACE= to use it in edit mode. | | 05 Mar 2007: | Byron Darrah: Added ability to dynamically move and delete rows. | | 12 Oct 2006: | <a rel="nofollow" href="http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item2982">Item2982</a> Use default date format from JSCalendarContrib | | 02 Oct 2006: | <a rel="nofollow" href="http://develop.twiki.org/~develop/cgi-bin/view/Bugs/Item2884">Item2884</a> Check also for access permission in meta data; proper fix to not warn if oneself has a lock on topic | @@ -252,7 +246,7 @@ | 20 Dec 2003: | Fixed bug where calendar did not work after adding a row (TWiki:Main/PaulineCheung); added all language files of Mishoo DHTML calendar 0.9.5 | | 13 Dec 2003: | Added CHANGEROWS, JSCALENDARDATEFORMAT, JSCALENDARLANGUAGE, JSCALENDAROPTIONS settings | | 16 Oct 2003: | small typo fixed (garbled if ---<nop>+ header on top) | -| 15 Oct 2003: | new date field type with javascript calendar - CN | +| 15 Oct 2003: | new date field type with Javascript calendar - CN | | 14 Oct 2003: | docfix: the documentation page was an old one - CN | | 13 Oct 2003: | bugfix: %-vars in select were resetted to first on add/del row - CN | | 18 Sep 2003: | incompatibility: changed default of =changerows= to =on=; support for %-vars, Quiet save for saving without notification; all other fixes in Dev topic integrated - CN | @@ -273,15 +267,15 @@ __Related Topics:__ %SYSTEMWEB%.VarEDITTABLE, %SYSTEMWEB%.TWikiPreferences, %SYSTEMWEB%.TWikiPlugins -%META:FILEATTACHMENT{name="EditTablePluginCalendarExample.gif" attr="h" comment="" date="1071283396" path="EditTablePluginCalendarExample.gif" size="7823" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="ScreenshotEditCell1.gif" attr="h" comment="Screenshot" date="1077050633" path="ScreenshotEditCell1.gif" size="2017" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="ScreenshotEditCell2.gif" attr="h" comment="Screenshot" date="1077050702" path="ScreenshotEditCell2.gif" size="3199" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="img.gif" attr="h" comment="Component of Mishoo DHTML calendar" date="1077813483" path="img.gif" size="145" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="menuarrow.gif" attr="h" comment="Component of Mishoo DHTML calendar" date="1077813470" path="menuarrow.gif" size="68" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="edittable.gif" attr="h" comment="Edit table image button" date="1077933805" path="edittable.gif" size="298" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="btn_move.gif" attr="h" comment="Javascript button: move row" date="1077933805" path="btn_move.gif" size="298" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="btn_target.gif" attr="h" comment="Javascript button: move target (animated)" date="1077933805" path="btn_target.gif" size="298" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="btn_delete.gif" attr="h" comment="Javascript button: delete row" date="1077933805" path="btn_delete.gif" size="298" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="btn_delete_disabled.gif" attr="h" comment="Javascript button: delete (disabled)" date="1077933805" path="btn_delete_disabled.gif" size="298" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="edittable.css" attr="h" comment="Plugin Style Sheet" date="1077933805" path="edittable.css" size="298" user="TWikiContributor" version="1.1"}% -%META:FILEATTACHMENT{name="edittable.js" attr="h" comment="Javascript for table editing without page refresh" date="1077933805" path="edittable.js" size="298" user="TWikiContributor" version="1.1"}% +%META:FILEATTACHMENT{name="EditTablePluginCalendarExample.gif" attr="h" comment="" date="1071283396" path="EditTablePluginCalendarExample.gif" size="7823" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="ScreenshotEditCell1.gif" attr="h" comment="Screenshot" date="1077050633" path="ScreenshotEditCell1.gif" size="2017" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="ScreenshotEditCell2.gif" attr="h" comment="Screenshot" date="1077050702" path="ScreenshotEditCell2.gif" size="3199" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="img.gif" attr="h" comment="Component of Mishoo DHTML calendar" date="1077813483" path="img.gif" size="145" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="menuarrow.gif" attr="h" comment="Component of Mishoo DHTML calendar" date="1077813470" path="menuarrow.gif" size="68" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="edittable.gif" attr="h" comment="Edit table image button" date="1077933805" path="edittable.gif" size="298" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="btn_move.gif" attr="h" comment="Javascript button: move row" date="1077933805" path="btn_move.gif" size="298" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="btn_target.gif" attr="h" comment="Javascript button: move target (animated)" date="1077933805" path="btn_target.gif" size="298" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="btn_delete.gif" attr="h" comment="Javascript button: delete row" date="1077933805" path="btn_delete.gif" size="298" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="btn_delete_disabled.gif" attr="h" comment="Javascript button: delete (disabled)" date="1077933805" path="btn_delete_disabled.gif" size="298" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="edittable.css" attr="h" comment="Plugin Style Sheet" date="1077933805" path="edittable.css" size="298" user="TWikiContributor" version="1"}% +%META:FILEATTACHMENT{name="edittable.js" attr="h" comment="Javascript for table editing without page refresh" date="1077933805" path="edittable.js" size="298" user="TWikiContributor" version="1"}% Modified: twiki/trunk/EditTablePlugin/data/TWiki/VarEDITTABLE.txt =================================================================== --- twiki/trunk/EditTablePlugin/data/TWiki/VarEDITTABLE.txt 2010-05-16 06:53:01 UTC (rev 18699) +++ twiki/trunk/EditTablePlugin/data/TWiki/VarEDITTABLE.txt 2010-05-16 07:45:10 UTC (rev 18700) @@ -1,4 +1,4 @@ -%META:TOPICINFO{author="TWikiContributor" date="1191744279" format="1.1" version="$Rev$"}% +%META:TOPICINFO{author="TWikiContributor" date="1273994193" format="1.1" version="$Rev$"}% %META:TOPICPARENT{name="TWikiVariables"}% #VarEDITTABLE ---+++ EDITTABLE{ _attributes_ } -- edit TWiki tables using edit fields and other input fields @@ -8,13 +8,13 @@ * Supported attributes: | *Attribute* | *Comment* | *Default* | | =header= | Specify the header format of a new table like ="%VBAR%*Food*%VBAR%*Drink*%VBAR%"=. Useful to start a table with only a button | (no header) | - | =format= | The format of one column when editing the table. A cell can be a text input field, or any of these edit field types:%BR% %BB% Text input field (1 line):%BR% =%VBAR% text, <size>, <initial value> %VBAR%= %BR% %BB% Textarea input field:%BR% =%VBAR% textarea, <rows>x<columns>, <initial value> %VBAR%= %BR% %BB% Drop down box: %BR% =%VBAR% select, <size>, <option 1>, <option 2>, etc*<nop> %VBAR%= %BR% =*= only one item can be selected %BR% %BB% Radio buttons: %BR% =%VBAR% radio, <size*>, <option 1>, <option 2>, etc %VBAR%= %BR% =*= size indicates the number of buttons per line in edit mode %BR% %BB% Checkboxes: %BR% =%VBAR% checkbox, <size*>, <option 1>, <option 2>, etc %VBAR%= %BR% =*= size indicates the number of checkboxes per line in edit mode %BR% %BB% Fixed label: %BR% =%VBAR% label, 0, <label text> %VBAR%= %BR% %BB% Row number: %BR% =%VBAR% row, <offset> %VBAR%= %BR% %BB% Date: %BR% =%VBAR% date, <size>, <initial value>, <DHTML date format> %VBAR%= (see [[#DateField][Date Field Type]]) | ="text, 16"= %BR% for all cells | + | =format= | The format of one column when editing the table. A cell can be a text input field, or any of these edit field types: %BB% Text input field (1 line):%BR% =%VBAR% text, <size>, <initial value> %VBAR%= %BB% Textarea input field:%BR% =%VBAR% textarea, <rows>x<columns>, <initial value> %VBAR%= %BB% Drop down box: %BR% =%VBAR% select, <size>, <option 1>, <option 2>, etc*<nop> %VBAR%= %BR% =*= only one item can be selected %BB% Radio buttons: %BR% =%VBAR% radio, <size*>, <option 1>, <option 2>, etc %VBAR%= %BR% =*= size indicates the number of buttons per line in edit mode %BB% Checkboxes: %BR% =%VBAR% checkbox, <size*>, <option 1>, <option 2>, etc %VBAR%= %BR% =*= size indicates the number of checkboxes per line in edit mode %BB% Fixed label: %BR% =%VBAR% label, 0, <label text> %VBAR%= %BB% Row number: %BR% =%VBAR% row, <offset> %VBAR%= %BB% Date: %BR% =%VBAR% date, <size>, <initial value>, <DHTML date format*> %VBAR%= %BR% =*= see [[EditTablePlugin#DateField][Date Field Type]] | ="text, 16"= %BR% for all cells | | =changerows= | Rows can be added and removed if ="on"= <br /> Rows can be added but not removed if ="add"= <br /> Rows cannot be added or removed if ="off"= | =CHANGEROWS= %BR% plugin setting | | =quietsave= | Quiet Save button is shown if ="on"=, hidden if ="off"= | =QUIETSAVE= %BR% plugin setting | | =include= | Other topic defining the EDITTABLE parameters. The first %<nop>EDITTABLE% in the topic is used. This is useful if you have many topics with the same table format and you want to update the format in one place. | (none) | | =helptopic= | Topic name containing help text shown below the table when editing a table. The %<nop>STARTINCLUDE% and %<nop>STOPINCLUDE% variables can be used in the topic to specify what is shown. | (no help text) | | =headerislabel= | Table header cells are read-only (labels) if ="on"=; header cells can be edited if ="off"= or "0" | ="on"= | - | =editbutton= | Set edit button text, e.g. ="Edit this table"=; set button image with alt text, e.g. ="Edit table, %<nop>PUBURL%/%<nop>TWIKIWEB%/TWikiDocGraphics/edittopic.gif"=; hide edit button at the end of the table with ="hide"= (Note: Button is automatically hidden if an edit button is present in a cell) | =EDITBUTTON= %BR% plugin setting | + | =editbutton= | Set edit button text, e.g. ="Edit this table"=; set button image with alt text, e.g. ="Edit table, %<nop>PUBURL%/%<nop>SYSTEMWEB%/TWikiDocGraphics/edittopic.gif"=; hide edit button at the end of the table with ="hide"= (Note: Button is automatically hidden if an edit button is present in a cell) | =EDITBUTTON= %BR% plugin setting | | =buttonrow= | Set to =top= to put the edit buttons above the table. | =bottom= | | =javascriptinterface= | Use javascript to directly move and delete row without page refresh. Enable with ="on"=, disable with ="off"=. | =JAVASCRIPTINTERFACE= %BR% plugin setting | %ENDSECTION{"edittable_attributes"}% Modified: twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm =================================================================== --- twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm 2010-05-16 06:53:01 UTC (rev 18699) +++ twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin/Core.pm 2010-05-16 07:45:10 UTC (rev 18700) @@ -1,7 +1,7 @@ # Plugin for TWiki Enterprise Collaboration Platform, http://TWiki.org/ # # Copyright (C) 2008 Arthur Clemens, ar...@vi... -# Copyright (C) 2002-2009 Peter Thoeny, pe...@th... and +# Copyright (C) 2002-2010 Peter Thoeny, pe...@th... and # TWiki Contributors. # # This program is free software; you can redistribute it and/or @@ -95,12 +95,12 @@ # only do the one table that is being edited my $inRe = ' - % # start of variable - ( # group at index 1 - .*? # variable name - \{*.*?\}* # variable contents inside braces, if any - ) # - % # end of variable'; + % # start of variable + ( # group at index 1 + .*? # variable name + \{*.*?\}* # variable contents inside braces, if any + ) # + % # end of variable'; $tableText =~ s/$inRe/%$STUB_VARIABLE$1%/gox; $tableText =~ s/%$STUB_VARIABLE\BR%/ /go ; # replace escaped %BR% with newline @@ -942,8 +942,8 @@ $img = ''; if ( $value =~ s/(.+),\s*(.+)/$1/o ) { $img = $2; - $img =~ s|%ATTACHURL%|%PUBURL%/%TWIKIWEB%/EditTablePlugin|o; - $img =~ s|%WEB%|%TWIKIWEB%|o; + $img =~ s|%ATTACHURL%|%PUBURL%/%SYSTEMWEB%/EditTablePlugin|o; + $img =~ s|%WEB%|%SYSTEMWEB%|o; } } if ($img) { Modified: twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin.pm =================================================================== --- twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin.pm 2010-05-16 06:53:01 UTC (rev 18699) +++ twiki/trunk/EditTablePlugin/lib/TWiki/Plugins/EditTablePlugin.pm 2010-05-16 07:45:10 UTC (rev 18700) @@ -1,7 +1,7 @@ # Plugin for TWiki Enterprise Collaboration Platform, http://TWiki.org/ # # Copyright (C) 2008 Arthur Clemens, ar...@vi... -# Copyright (C) 2002-2009 Peter Thoeny, pe...@th... and TWiki +# Copyright (C) 2002-2010 Peter Thoeny, pe...@th... and TWiki # Contributors. # # This program is free software; you can redistribute it and/or @@ -28,21 +28,14 @@ %editMode %saveMode $ASSET_URL ); -# This should always be $Rev$ 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$'; +$RELEASE = '5.0'; -# 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 = '4.9.1'; - $encodeStart = '--EditTableEncodeStart--'; $encodeEnd = '--EditTableEncodeEnd--'; %editMode = ( 'NONE', 0, 'EDIT', 1 ); %saveMode = ( 'NONE', 0, 'SAVE', 1, 'SAVEQUIET', 2 ); -$ASSET_URL = '%PUBURL%/%TWIKIWEB%/EditTablePlugin'; +$ASSET_URL = '%PUBURL%/%SYSTEMWEB%/EditTablePlugin'; sub initPlugin { ( $topic, $web, $user ) = @_; @@ -143,7 +136,7 @@ my $header = <<'EOF'; <style type="text/css" media="all"> -@import url("%PUBURL%/%TWIKIWEB%/EditTablePlugin/edittable.css"); +@import url("%PUBURL%/%SYSTEMWEB%/EditTablePlugin/edittable.css"); </style> EOF TWiki::Func::addToHEAD( 'EDITTABLEPLUGIN', $header ); @@ -175,9 +168,9 @@ . $ASSET_URL . '" />'; $header .= <<'EOF'; <style type="text/css" media="all"> -@import url("%PUBURL%/%TWIKIWEB%/EditTablePlugin/edittable.css"); +@import url("%PUBURL%/%SYSTEMWEB%/EditTablePlugin/edittable.css"); </style> -<script type="text/javascript" src="%PUBURL%/%TWIKIWEB%/EditTablePlugin/edittable.js"></script> +<script type="text/javascript" src="%PUBURL%/%SYSTEMWEB%/EditTablePlugin/edittable.js"></script> EOF TWiki::Func::addToHEAD( 'EDITTABLEPLUGIN', $header ); Modified: twiki/trunk/EditTablePlugin/test/unit/EditTablePlugin/EditTablePluginTests.pm =================================================================== --- twiki/trunk/EditTablePlugin/test/unit/EditTablePlugin/EditTablePluginTests.pm 2010-05-16 06:53:01 UTC (rev 18699) +++ twiki/trunk/EditTablePlugin/test/unit/EditTablePlugin/EditTablePluginTests.pm 2010-05-16 07:45:10 UTC (rev 18700) @@ -306,24 +306,24 @@ <nop> <nop> <table cellspacing="0" id="table1" cellpadding="0" class="twikiTable" rules="cols" border="1"> - <tbody> - <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol"> <span class="et_rowlabel">0<input type="hidden" name="etcell1x1" value="0" /></span> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol"> <input class="twikiInputField editTableInput" type="text" name="etcell1x2" size="10" value="test1" /> </td> - </tr> - <tr class="twikiTableEven twikiTableRowdataBgSorted1 twikiTableRowdataBg1"> - <td bgcolor="#f2f3f6" valign="top" class="twikiTableCol0 twikiFirstCol"> <span class="et_rowlabel">1<input type="hidden" name="etcell2x1" value="1" /></span> </td> - <td bgcolor="#f2f3f6" valign="top" class="twikiTableCol1 twikiLastCol"> <input class="twikiInputField editTableInput" type="text" name="etcell2x2" size="10" value="test2" /> </td> - </tr> - <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol"> <span class="et_rowlabel">2<input type="hidden" name="etcell3x1" value="2" /></span> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol"> <input class="twikiInputField editTableInput" type="text" name="etcell3x2" size="10" value="test3" /> </td> - </tr> - <tr class="twikiTableEven twikiTableRowdataBgSorted1 twikiTableRowdataBg1"> - <td bgcolor="#f2f3f6" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <span class="et_rowlabel">3<input type="hidden" name="etcell4x1" value="3" /></span> </td> - <td bgcolor="#f2f3f6" valign="top" class="twikiTableCol1 twikiLastCol twikiLast"> <input class="twikiInputField editTableInput" type="text" name="etcell4x2" size="10" value="init" /> </td> - </tr> - </tbody></table> + <tbody> + <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol"> <span class="et_rowlabel">0<input type="hidden" name="etcell1x1" value="0" /></span> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol"> <input class="twikiInputField editTableInput" type="text" name="etcell1x2" size="10" value="test1" /> </td> + </tr> + <tr class="twikiTableEven twikiTableRowdataBgSorted1 twikiTableRowdataBg1"> + <td bgcolor="#f2f3f6" valign="top" class="twikiTableCol0 twikiFirstCol"> <span class="et_rowlabel">1<input type="hidden" name="etcell2x1" value="1" /></span> </td> + <td bgcolor="#f2f3f6" valign="top" class="twikiTableCol1 twikiLastCol"> <input class="twikiInputField editTableInput" type="text" name="etcell2x2" size="10" value="test2" /> </td> + </tr> + <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol"> <span class="et_rowlabel">2<input type="hidden" name="etcell3x1" value="2" /></span> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol"> <input class="twikiInputField editTableInput" type="text" name="etcell3x2" size="10" value="test3" /> </td> + </tr> + <tr class="twikiTableEven twikiTableRowdataBgSorted1 twikiTableRowdataBg1"> + <td bgcolor="#f2f3f6" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <span class="et_rowlabel">3<input type="hidden" name="etcell4x1" value="3" /></span> </td> + <td bgcolor="#f2f3f6" valign="top" class="twikiTableCol1 twikiLastCol twikiLast"> <input class="twikiInputField editTableInput" type="text" name="etcell4x2" size="10" value="init" /> </td> + </tr> + </tbody></table> <input type="hidden" name="etrows" value="4" /> <input type="hidden" name="etaddedrows" value="1" /> <input type="submit" name="etsave" id="etsave" value="Save table" class="twikiSubmit" /> @@ -353,7 +353,7 @@ $input ); $twiki = new TWiki( undef, $query ); - my $response = new Unit::Response; + my $response = new Unit::Response; $TWiki::Plugins::SESSION = $twiki; my ( $saveResult, $ecode ) = $this->capture( @@ -420,14 +420,14 @@ <input type="hidden" name="ettablenr" value="1" /> <nop> <table cellspacing="0" id="table1" cellpadding="0" class="twikiTable" rules="cols" border="1"> - <tbody> - <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <select class="twikiSelect" name="etcell1x1" size="1"> <option>a</option> <option>b</option> <option selected="selected">c</option> <option>d</option></select> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLast"> <select class="twikiSelect" name="etcell1x2" size="1"> <option>a</option> <option>b</option> <option selected="selected">c</option> <option>d</option></select> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol2 twikiLast"> <select class="twikiSelect" name="etcell1x3" size="1 "> <option>a </option> <option>b</option> <option selected="selected">c</option> <option>d</option></select> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol3 twikiLastCol twikiLast"> <select class="twikiSelect" name="etcell1x4" size="1 "> <option>a </option> <option>b </option> <option selected="selected">c </option> <option>d</option></select> </td> - </tr> - </tbody> + <tbody> + <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <select class="twikiSelect" name="etcell1x1" size="1"> <option>a</option> <option>b</option> <option selected="selected">c</option> <option>d</option></select> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLast"> <select class="twikiSelect" name="etcell1x2" size="1"> <option>a</option> <option>b</option> <option selected="selected">c</option> <option>d</option></select> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol2 twikiLast"> <select class="twikiSelect" name="etcell1x3" size="1 "> <option>a </option> <option>b</option> <option selected="selected">c</option> <option>d</option></select> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol3 twikiLastCol twikiLast"> <select class="twikiSelect" name="etcell1x4" size="1 "> <option>a </option> <option>b </option> <option selected="selected">c </option> <option>d</option></select> </td> + </tr> + </tbody> </table> <input type="hidden" name="etrows" value="1" /> <input type="submit" name="etsave" id="etsave" value="Save table" class="twikiSubmit" /> @@ -485,12 +485,12 @@ <input type="hidden" name="ettablenr" value="1" /> <nop> <table cellspacing="0" id="table1" cellpadding="0" class="twikiTable" rules="cols" border="1"> - <tbody> - <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <table class="editTableInnerTable"><tr><td valign="top"> <input type="radio" name="etcell1x1" value=":skull:" /> <img src="$pubUrlTWikiWeb/SmiliesPlugin/skull.gif" alt="dead!" title="dead!" border="0" /> <br /> <input type="radio" name="etcell1x1" value=":cool:" /> <img src="$pubUrlTWikiWeb/SmiliesPlugin/cool.gif" alt="cool!" title="cool!" border="0" /> </td></tr></table> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol twikiLast"> <table class="editTableInnerTable"><tr><td valign="top"> <input type="checkbox" name="etcell1x2x2" value=":skull:" checked="checked" /> <img src="$pubUrlTWikiWeb/SmiliesPlugin/skull.gif" alt="dead!" title="dead!" border="0" /> <br /> <input type="checkbox" name="etcell1x2x3" value=":cool:" checked="checked" /> <img src="$pubUrlTWikiWeb/SmiliesPlugin/cool.gif" alt="cool!" title="cool!" border="0" /> </td></tr></table><input type="hidden" name="etcell1x2" value="Chkbx: etcell1x2x2 etcell1x2x3" /> </td> - </tr> - </tbody> + <tbody> + <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <table class="editTableInnerTable"><tr><td valign="top"> <input type="radio" name="etcell1x1" value=":skull:" /> <img src="$pubUrlTWikiWeb/SmiliesPlugin/skull.gif" alt="dead!" title="dead!" border="0" /> <br /> <input type="radio" name="etcell1x1" value=":cool:" /> <img src="$pubUrlTWikiWeb/SmiliesPlugin/cool.gif" alt="cool!" title="cool!" border="0" /> </td></tr></table> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol twikiLast"> <table class="editTableInnerTable"><tr><td valign="top"> <input type="checkbox" name="etcell1x2x2" value=":skull:" checked="checked" /> <img src="$pubUrlTWikiWeb/SmiliesPlugin/skull.gif" alt="dead!" title="dead!" border="0" /> <br /> <input type="checkbox" name="etcell1x2x3" value=":cool:" checked="checked" /> <img src="$pubUrlTWikiWeb/SmiliesPlugin/cool.gif" alt="cool!" title="cool!" border="0" /> </td></tr></table><input type="hidden" name="etcell1x2" value="Chkbx: etcell1x2x2 etcell1x2x3" /> </td> + </tr> + </tbody> </table> <input type="hidden" name="etrows" value="1" /> <input type="submit" name="etsave" id="etsave" value="Save table" class="twikiSubmit" /> @@ -541,12 +541,12 @@ <input type="hidden" name="etedit" value="on" /> <nop> <table cellspacing="0" id="table1" cellpadding="0" class="twikiTable" rules="cols" border="1"> - <tbody> - <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <img src="%PUBURLPATH%/%TWIKIWEB%/TWikiDocGraphics/choice-yes.gif" alt="DONE" title="DONE" width="16" height="16" border="0" /> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol twikiLast"> <a href="$viewUrl" class="twikiCurrentTopicLink twikiLink">$topicName</a> </td> - </tr> - </tbody> + <tbody> + <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <img src="%PUBURLPATH%/%SYSTEMWEB%/TWikiDocGraphics/choice-yes.gif" alt="DONE" title="DONE" width="16" height="16" border="0" /> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol twikiLast"> <a href="$viewUrl" class="twikiCurrentTopicLink twikiLink">$topicName</a> </td> + </tr> + </tbody> </table> <input type="hidden" name="etrows" value="1" /> <input class="editTableEditImageButton" type="image" src="$pubUrlTWikiWeb/EditTablePlugin/edittable.gif" alt="Edit this table" /></form> @@ -554,7 +554,7 @@ END $expected =~ s/%PUBURLPATH%/$TWiki::cfg{PubUrlPath}/e; - $expected =~ s/%TWIKIWEB%/TWiki/g; + $expected =~ s/%SYSTEMWEB%/TWiki/g; $this->do_testHtmlOutput( $expected, $result, 1 ); } @@ -595,12 +595,12 @@ <input type="hidden" name="ettablenr" value="1" /> <nop> <table cellspacing="0" id="table1" cellpadding="0" class="twikiTable" rules="cols" border="1"> - <tbody> - <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <input class="twikiInputField editTableInput" type="text" name="etcell1x1" size="30" value="%Y%" /> </td> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol twikiLast"> <input class="twikiInputField editTableInput" type="text" name="etcell1x2" size="30" value="%TOPIC%" /> </td> - </tr> - </tbody> + <tbody> + <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLast"> <input class="twikiInputField editTableInput" type="text" name="etcell1x1" size="30" value="%Y%" /> </td> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol1 twikiLastCol twikiLast"> <input class="twikiInputField editTableInput" type="text" name="etcell1x2" size="30" value="%TOPIC%" /> </td> + </tr> + </tbody> </table> <input type="hidden" name="etrows" value="1" /> <input type="submit" name="etsave" id="etsave" value="Save table" class="twikiSubmit" /> @@ -657,7 +657,7 @@ $input ); $twiki = new TWiki( undef, $query ); - my $response = new Unit::Response; + my $response = new Unit::Response; $TWiki::Plugins::SESSION = $twiki; my ( $saveResult, $ecode ) = $this->capture( @@ -724,7 +724,7 @@ $input ); $twiki = new TWiki( undef, $query ); - my $response = new Unit::Response; + my $response = new Unit::Response; $TWiki::Plugins::SESSION = $twiki; my ( $saveResult, $ecode ) = $this->capture( @@ -790,7 +790,7 @@ TWiki::Func::saveTopic( $this->{test_web}, $this->{test_topic}, undef, $input ); $twiki = new TWiki( undef, $query ); - my $response = new Unit::Response; + my $response = new Unit::Response; $TWiki::Plugins::SESSION = $twiki; my ( $saveResult, $ecode ) = $this->capture( sub { @@ -849,7 +849,7 @@ TWiki::Func::saveTopic( $this->{test_web}, $this->{test_topic}, undef, $input ); $twiki = new TWiki( undef, $query ); - my $response = new Unit::Response; + my $response = new Unit::Response; $TWiki::Plugins::SESSION = $twiki; my ( $saveResult, $ecode ) = $this->capture( sub { @@ -910,7 +910,7 @@ TWiki::Func::saveTopic( $this->{test_web}, $this->{test_topic}, undef, $input ); $twiki = new TWiki( undef, $query ); - my $response = new Unit::Response; + my $response = new Unit::Response; $TWiki::Plugins::SESSION = $twiki; my ( $saveResult, $ecode ) = $this->capture( sub { @@ -960,11 +960,11 @@ <input type="hidden" name="etedit" value="on" /> <nop> <table cellspacing="0" id="table1" cellpadding="0" class="twikiTable" rules="cols" border="1"> - <tbody> - <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> - <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLastCol twikiLast"> blablabla <br /> there's still a bug <br /> lurking around <br /> <em>italic</em> <br /> <strong>bold</strong> </td> - </tr> - </tbody></table> + <tbody> + <tr class="twikiTableOdd twikiTableRowdataBgSorted0 twikiTableRowdataBg0"> + <td bgcolor="#ffffff" valign="top" class="twikiTableCol0 twikiFirstCol twikiLastCol twikiLast"> blablabla <br /> there's still a bug <br /> lurking around <br /> <em>italic</em> <br /> <strong>bold</strong> </td> + </tr> + </tbody></table> <input type="hidden" name="etrows" value="1" /> <input class="editTableEditImageButton" type="image" src="$pubUrlTWikiWeb/EditTablePlugin/edittable.gif" alt="Edit this table" /> </form> </div><!-- /editTable --> @@ -1004,7 +1004,7 @@ TWiki::Func::saveTopic( $this->{test_web}, $this->{test_topic}, undef, $input ); $twiki = new TWiki( undef, $query ); - my $response = new Unit::Response; + my $response = new Unit::Response; $TWiki::Plugins::SESSION = $twiki; my ( $saveResult, $ecode ) = $this->capture( sub { @@ -1058,7 +1058,7 @@ TWiki::Func::saveTopic( $this->{test_web}, $this->{test_topic}, undef, $input ); $twiki = new TWiki( undef, $query ); - my $response = new Unit::Response; + my $response = new Unit::Response; $TWiki::Plugins::SESSION = $twiki; my ( $saveResult, $ecode ) = $this->capture( sub { @@ -1130,7 +1130,7 @@ SOMETHING %EDITTABLE{buttonrow="top"}% INPUT - $query->path_info("/$webName/$topicName"); + $query->path_info("/$webName/$topicName"); my $twiki = new TWiki( undef, $query ); $TWiki::Plugins::SESSION = $twiki; @@ -1198,7 +1198,7 @@ $input ); $twiki = new TWiki( undef, $query ); - my $response = new Unit::Response; + my $response = new Unit::Response; $TWiki::Plugins::SESSION = $twiki; my ( $saveResult, $ecode ) = $this->capture( |