Skip to content
Permalink
Browse files

Item14288: Merge master

  • Loading branch information...
MichaelDaum committed Dec 6, 2017
2 parents 827d0db + 35fcb1d commit 1175d88384675fd1fe60519609d5639b048177f9
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1491353723" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1512490670" format="1.1" version="1"}%
%META:TOPICPARENT{name="Plugins"}%
---+!! Edit Table Plugin

@@ -100,15 +100,15 @@ If this plugin is installed you will see an *[ Edit table ]* butt
<td bgcolor="#ffffff" valign="top" class="foswikiTableCol0 foswikiFirstCol"> <span class="et_rowlabel">1<input type="hidden" name="etcell2x1" value="1" /></span> </td>
<td bgcolor="#ffffff" valign="top" class="foswikiTableCol1"> <input class="foswikiInputField editTableInput" type="text" name="etcell2x2" size="20" value="hello table" /> </td>
<td bgcolor="#ffffff" valign="top" class="foswikiTableCol2"> <select class="foswikiSelect" 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="foswikiTableCol3"> <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="foswikiTableCol3"> <input type="radio" name="etcell2x4" value=":-)" checked="checked" /> <img src="%PUBURLPATH%/%SYSTEMWEB%/SmiliesPlugin/smile.gif" alt="smile" title="smile" border="0" /> <input type="radio" name="etcell2x4" value=":-I" /> <img src="%PUBURLPATH%/%SYSTEMWEB%/SmiliesPlugin/indifferent.gif" alt="indifferent" title="indifferent" border="0" /> <input type="radio" name="etcell2x4" value=":-(" /> <img src="%PUBURLPATH%/%SYSTEMWEB%/SmiliesPlugin/frown.gif" alt="frown" title="frown" border="0" /> </td>
<td bgcolor="#ffffff" valign="top" class="foswikiTableCol4 foswikiLastCol"> 26 Jun 2002 12:30<input type="hidden" name="etcell2x5" value="26 Jun 2002 12:30" /> </td>
</tr>
<tr class="foswikiTableEven foswikiTableRowdataBgSorted1 foswikiTableRowdataBg1">
<td bgcolor="#edf4f9" valign="top" class="foswikiTableCol0 foswikiFirstCol foswikiLast"> <span class="et_rowlabel">2<input type="hidden" name="etcell3x1" value="2" /></span> </td>
<td bgcolor="#edf4f9" valign="top" class="foswikiTableCol1 foswikiLast"> <input class="foswikiInputField editTableInput" type="text" name="etcell3x2" size="20" value="" /> </td>

<td bgcolor="#edf4f9" valign="top" class="foswikiTableCol2 foswikiLast"> <select class="foswikiSelect" 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="foswikiTableCol3 foswikiLast"> <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="foswikiTableCol3 foswikiLast"> <input type="radio" name="etcell3x4" value=":-)" /> <img src="%PUBURLPATH%/%SYSTEMWEB%/SmiliesPlugin/smile.gif" alt="smile" title="smile" border="0" /> <input type="radio" name="etcell3x4" value=":-I" /> <img src="%PUBURLPATH%/%SYSTEMWEB%/SmiliesPlugin/indifferent.gif" alt="indifferent" title="indifferent" border="0" /> <input type="radio" name="etcell3x4" value=":-(" checked="checked" /> <img src="%PUBURLPATH%/%SYSTEMWEB%/SmiliesPlugin/frown.gif" alt="frown" title="frown" border="0" /> </td>
<td bgcolor="#edf4f9" valign="top" class="foswikiTableCol4 foswikiLastCol foswikiLast"> 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" />
@@ -268,15 +268,15 @@ Test if the Plugin is correctly installed:
| Plugin Home: | http://foswiki.org/Extensions/%TOPIC% |
| Support: | http://foswiki.org/Support/%TOPIC% |

%META:FILEATTACHMENT{name="EditTablePluginCalendarExample.gif" attr="h" comment="" date="1491353723" size="7823" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell1.gif" attr="h" date="1491353723" size="2017" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell2.gif" attr="h" date="1491353723" size="3199" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="img.gif" attr="h" date="1491353723" size="145" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menuarrow.gif" attr="h" date="1491353723" size="68" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_move.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete_disabled.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.css" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.js" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="move_done_bg_anim.gif" attr="h" date="1491353723" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="EditTablePluginCalendarExample.gif" attr="h" comment="" date="1512490670" size="7823" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell1.gif" attr="h" date="1512490670" size="2017" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="ScreenshotEditCell2.gif" attr="h" date="1512490670" size="3199" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="img.gif" attr="h" date="1512490670" size="145" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="menuarrow.gif" attr="h" date="1512490670" size="68" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.gif" attr="h" date="1512490670" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_move.gif" attr="h" date="1512490670" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete.gif" attr="h" date="1512490670" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="btn_delete_disabled.gif" attr="h" date="1512490670" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.css" attr="h" date="1512490670" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="edittable.js" attr="h" date="1512490670" size="298" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="move_done_bg_anim.gif" attr="h" date="1512490670" size="298" user="ProjectContributor" version="1"}%
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" comment="" date="1454519814" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" comment="" date="1512490670" format="1.1" version="1"}%
---+!! !FamFamFamContrib
<!--
One line description, required for extensions repository catalog.
@@ -53,7 +53,7 @@ eg
<img src="%ATTACHURLPATH%/silk-companion-II.png" alt="silk-companion-II.png" />

---+++ preview FamFamFamSilkGeoSilkIcons
<img src="%PUBURL%/%SYSTEMWEB%/FamFamFamSilkGeoSilkIcons/geosilk.png" />
<img src="%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkGeoSilkIcons/geosilk.png" />

---+++ Foswiki Extra Icons FamFamFamFoswikiExtras
%INCLUDE{%SYSTEMWEB%.FamFamFamFoswikiExtras}%
@@ -111,9 +111,9 @@ __Related Topics:__ [[%SYSTEMWEB%.Contribs][Contribs]], %SYSTEMWEB%.DeveloperDoc
%META:FIELD{name="Support" title="Support" value="http://foswiki.org/Support/%25$ROOTMODULE%25"}%
%META:FIELD{name="Version" title="Version" value="%25$VERSION%25"}%
%META:FIELD{name="Repository" title="Repository" value="https://github.com/foswiki/distro"}%
%META:FILEATTACHMENT{name="SilkCompanion1Thumb.png" attr="h" comment="" date="1454519814" size="169896" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="silk-companion-II.png" attr="h" comment="" date="1454519814" size="24969" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="mini-preview.jpg" attr="h" comment="" date="1454519814" size="13799" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="mint-preview.jpg" attr="h" comment="" date="1454519814" size="3242" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="flags-preview.jpg" attr="h" comment="" date="1454519814" size="14996" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="silk-preview.jpg" attr="h" comment="" date="1454519814" size="22024" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="SilkCompanion1Thumb.png" attr="h" comment="" date="1512490670" size="169896" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="silk-companion-II.png" attr="h" comment="" date="1512490670" size="24969" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="mini-preview.jpg" attr="h" comment="" date="1512490670" size="13799" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="mint-preview.jpg" attr="h" comment="" date="1512490670" size="3242" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="flags-preview.jpg" attr="h" comment="" date="1512490670" size="14996" user="ProjectContributor" version="1"}%
%META:FILEATTACHMENT{name="silk-preview.jpg" attr="h" comment="" date="1512490670" size="22024" user="ProjectContributor" version="1"}%
@@ -1,7 +1,7 @@
%TMPL:DEF{spi:subscribe}%<a href="#" class="subscribe_link" data-topic="$topic" data-subscriber="$subscriber" data-remove="$remove" data-validation-key="?$nonce" rel="nofollow" title='%MAKETEXT{"Subscribe to this topic"}%' >
<img alt='%MAKETEXT{"Subscribe to this topic (s)"}%' src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' /></a>%TMPL:END%
<img alt='%MAKETEXT{"Subscribe to this topic (s)"}%' src='%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' /></a>%TMPL:END%
%{----------------------------------------
Link for an "unsubscribe" request. Note that REST parameters are encoded in
data-subscribe
}%%TMPL:DEF{spi:unsubscribe}%<a href='#' class='subscribe_link' data-topic='$topic' data-subscriber='$subscriber' data-remove='$remove' data-validation-key='?$nonce' rel='nofollow' title='%MAKETEXT{"Unsubscribe from this topic"}%'>
<img alt='%MAKETEXT{"Unsubscribe from this topic (s)"}%' src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' /></a>%TMPL:END%
<img alt='%MAKETEXT{"Unsubscribe from this topic (s)"}%' src='%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' /></a>%TMPL:END%
@@ -1,44 +1,44 @@
%TMPL:INCLUDE{"view"}%
%TMPL:DEF{"top:toolbarbutton_edit"}%<span>
<a class='foswikiRequiresChangePermission' href='%SCRIPTURLPATH{"edit"}%/%WEB%/%TOPIC%?t=%GMTIME{"$epoch"}%' title='%MAKETEXT{"Edit this topic text (e)"}%'>
<img alt='%MAKETEXT{"Edit this topic text (e)"}%' src='%PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/pencil.png' width='16' height='16' />
<img alt='%MAKETEXT{"Edit this topic text (e)"}%' src='%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/pencil.png' width='16' height='16' />
</a></span>%TMPL:END%

%TMPL:DEF{"top:toolbarbutton_attach"}%<span>
<a class='foswikiRequiresChangePermission' href='%SCRIPTURLPATH{"attach"}%/%WEB%/%TOPIC%' title='%MAKETEXT{"Attach an image or document to this topic; manage existing attachments (a)"}%'>
<img alt='%MAKETEXT{"Attach an image or document to this topic; manage existing attachments (a)"}%' src='%PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/attach.png' width='16' height='16' />
<img alt='%MAKETEXT{"Attach an image or document to this topic; manage existing attachments (a)"}%' src='%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/attach.png' width='16' height='16' />
</a></span>%TMPL:END%

%TMPL:DEF{"top:toolbarbutton_subscribe"}%<span>
%SUBSCRIBE{render="icon" format="<a href='#' class='subscribe_link' data-topic='$topic' data-subscriber='$subscriber' data-remove='$remove' data-validation-key='?$nonce' rel='nofollow' title='%MAKETEXT{"Subscribe to this topic (s)"}%'>
<img alt='%MAKETEXT{"Subscribe to this topic (s)"}%' src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' />
<img alt='%MAKETEXT{"Subscribe to this topic (s)"}%' src='%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' />
</a>" formatunsubscribe="<a href='#' class='subscribe_link' data-topic='$topic' data-subscriber='$subscriber' data-remove='$remove' data-validation-key='?$nonce' rel='nofollow' title='%MAKETEXT{"Unsubscribe from this topic (s)"}%'>
<img alt='%MAKETEXT{"Unsubscribe from this topic (s)"}%' src='%PUBURL%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' />
<img alt='%MAKETEXT{"Unsubscribe from this topic (s)"}%' src='%PUBURLPATH%/%SYSTEMWEB%/DocumentGraphics/notify.png' width='16' height='16' />
</a>"}%</span>%TMPL:END%

%TMPL:DEF{"top:toolbarbutton_rdiff"}%<span>
<a href='%SCRIPTURLPATH{"rdiff"}%/%WEB%/%TOPIC%?type=history' title='%MAKETEXT{"View sequential topic history"}%'>
<img alt='%MAKETEXT{"View sequential topic history"}%' src='%PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/page_white_stack.png' width='16' height='16' />
<img alt='%MAKETEXT{"View sequential topic history"}%' src='%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/page_white_stack.png' width='16' height='16' />
</a></span>%TMPL:END%

%TMPL:DEF{"top:toolbarbutton_raw"}%<span>
<a href='%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?raw=on&rev=%REVINFO{"$rev"}%' title='%MAKETEXT{"View without formatting (v)"}%'>
<img alt='%MAKETEXT{"View without formatting (v)"}%' src='%PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/text_align_left.png' width='16' height='16' />
<img alt='%MAKETEXT{"View without formatting (v)"}%' src='%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/text_align_left.png' width='16' height='16' />
</a></span>%TMPL:END%

%TMPL:DEF{"top:toolbarbutton_create"}%<span>
<a class='foswikiRequiresChangePermission' href='%SCRIPTURLPATH{"view"}%/%WEB%/WebCreateNewTopic?topicparent=%TOPIC%' title='%MAKETEXT{"Create new topic"}%'>
<img alt='%MAKETEXT{"Create new topic"}%' src='%PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/page_white_add.png' width='16' height='16' />
<img alt='%MAKETEXT{"Create new topic"}%' src='%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/page_white_add.png' width='16' height='16' />
</a></span>%TMPL:END%

%TMPL:DEF{"top:toolbarbutton_print"}%<span>
<a href='%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%?cover=print;%QUERYSTRING%' title='%MAKETEXT{"Printable version of this topic (p)"}%'>
<img alt='%MAKETEXT{"Printable version of this topic (p)"}%' src='%PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/printer.png' width='16' height='16' />
<img alt='%MAKETEXT{"Printable version of this topic (p)"}%' src='%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/printer.png' width='16' height='16' />
</a></span>%TMPL:END%

%TMPL:DEF{"top:toolbarbutton_more"}%<span>
<a href='%SCRIPTURLPATH{"oops"}%/%WEB%/%TOPIC%?template=more&maxrev=%REVINFO{"$rev"}%&currrev=%REVINFO{"$rev"}%' title='%MAKETEXT{"More: delete or rename this topic; set parent topic; view and compare revisions (m)"}%'>
<img alt='%MAKETEXT{"More: delete or rename this topic; set parent topic; view and compare revisions (m)"}%' src='%PUBURL%/%SYSTEMWEB%/FamFamFamSilkIcons/wrench.png' width='16' height='16' />
<img alt='%MAKETEXT{"More: delete or rename this topic; set parent topic; view and compare revisions (m)"}%' src='%PUBURLPATH%/%SYSTEMWEB%/FamFamFamSilkIcons/wrench.png' width='16' height='16' />
</a></span>%TMPL:END%

%TMPL:DEF{"top:toolbarbuttons_inner"}% %TMPL:P{

0 comments on commit 1175d88

Please sign in to comment.
You can’t perform that action at this time.