Skip to content

Commit

Permalink
Item9415: Reverted all the work from Paul today
Browse files Browse the repository at this point in the history
I have several reasons
TipsContrib with dataforms is feature creep. It works fine as it is. There is nothing to fix. And the change breaks compatibility. 
We need a feature proposal if you want such changes and a release which is not on feature freeze. So please leave it as it is.
The TablePlugin got an update which for now is the only update that prevents 1.0.9 users from upgrading to this once we release 1.1
Many will not want to upgrade to 1.1 for a long time but may want to upgrade essential buggy core plugins.
I personlly run 1.0.9 at Motorola with the latest trunk version of TablePlugin because I needed some of the sorting bug fixes.
It is totally silly to lose compatibility just because of some coloring of very simple examples of the TABLE macro.
These colours add very little - if any - value in practical. Much better to maintain compatibility.
There are some other updates in the checkins that I do not know what is but I am not going to clean up that.
I just revert.
I am the release manager and it is my role to get this 1.1 stable and released now. I need to be hard. But fair. Any of you hooligans that feature creep will get the same treatment.


git-svn-id: http://svn.foswiki.org/trunk@8471 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
KennethLavrsen authored and KennethLavrsen committed Aug 12, 2010
1 parent 829c381 commit e211241
Show file tree
Hide file tree
Showing 83 changed files with 487 additions and 535 deletions.
1 change: 0 additions & 1 deletion CommentPlugin/lib/Foswiki/Plugins/CommentPlugin/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ data/System/CommentPluginTemplate.txt 0644 Standard templates
data/Sandbox/CommentPluginExamples.txt 0644 Examples of standard templates
data/Sandbox/CommentPluginExampleComments.txt 0644 Examples of target comment
data/Sandbox/CommentPluginTemplateExample.txt 0644 Example of comment template topic
data/System/TipTopic1ForCommentPlugin.txt 0644 TipsContrib tip
templates/comments.tmpl 0444 Master comment templates
lib/Foswiki/Plugins/CommentPlugin.pm 0444 Plugin Perl module
lib/Foswiki/Plugins/CommentPlugin/Comment.pm 0444 Plugin Perl module
Expand Down
19 changes: 0 additions & 19 deletions EditTablePlugin/data/System/TipTopic1ForEditTablePlugin.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
data/System/EditTablePlugin.txt 0644
data/System/VarEDITTABLE.txt 0644
data/System/TipTopic1ForEditTablePlugin.txt 0644
lib/Foswiki/Plugins/EditTablePlugin.pm 0444
lib/Foswiki/Plugins/EditTablePlugin/Core.pm 0444
lib/Foswiki/Plugins/EditTablePlugin/Data.pm 0444
Expand Down
10 changes: 0 additions & 10 deletions InterwikiPlugin/data/System/TipTopic1ForInterwikiPlugin.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
lib/Foswiki/Plugins/InterwikiPlugin.pm 0444
data/System/InterwikiPlugin.txt 0644
data/System/InterWikis.txt 0644
data/System/TipTopic1ForInterwikiPlugin.txt 0644
8 changes: 0 additions & 8 deletions MailerContrib/data/System/TipTopic1ForMailerContrib.txt

This file was deleted.

1 change: 0 additions & 1 deletion MailerContrib/lib/Foswiki/Contrib/MailerContrib/MANIFEST
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ lib/Foswiki/Contrib/MailerContrib.pm 0444
lib/Foswiki/Plugins/MailerContribPlugin.pm 0444
data/System/MailerContrib.txt 0644
data/System/MailerContribPlugin.txt 0644
data/System/TipTopic1ForMailerContrib.txt 0644
tools/mailnotify 0555
templates/mailnotify.tmpl 0444
templates/newsletter.tmpl 0444
Expand Down
2 changes: 1 addition & 1 deletion PatternSkin/data/System/WebTopBarExample.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
</form>
* <form name="quickSearchForm" action="%SCRIPTURLPATH{view}%/%BASEWEB%/WebSearch"><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="%URLPARAM{search}%" size="18" /><input type="hidden" name="scope" value="all" /><input type="hidden" name="web" value="%BASEWEB%" /><noscript>&nbsp;<input type="submit" size="5" class="foswikiButton" name="submit" value="%MAKETEXT{"Search"}%" />&nbsp;</noscript>
</form>
%IF{"context i18n_enabled" then=' * $percentINCLUDE{\"%SYSTEMWEB%.LanguageSelector\"}$percent'}%
%IF{"context i18n_enabled" then=' * %INCLUDE{%SYSTEMWEB%.LanguageSelector}%'}%
</noautolink></td></tr></table>
12 changes: 0 additions & 12 deletions RenderListPlugin/data/System/TipTopic1ForRenderListPlugin.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
data/System/RenderListPlugin.txt 0644
data/System/TipTopic1ForRenderListPlugin.txt 0644
data/System/VarRENDERLIST.txt 0644
lib/Foswiki/Plugins/RenderListPlugin.pm 0444
pub/System/RenderListPlugin/doc.gif 0644
Expand Down
12 changes: 0 additions & 12 deletions SlideShowPlugin/data/System/TipTopic1ForSlideShowPlugin.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
data/System/SlideShowPlugin.txt 0644
data/System/TipTopic1ForSlideShowPlugin.txt 0644
data/System/VarSLIDESHOWEND.txt 0644
data/System/VarSLIDESHOWSTART.txt 0644
lib/Foswiki/Plugins/SlideShowPlugin.pm 0444
Expand Down
10 changes: 0 additions & 10 deletions SmiliesPlugin/data/System/TipTopic1ForSmiliesPlugin.txt

This file was deleted.

1 change: 0 additions & 1 deletion SmiliesPlugin/lib/Foswiki/Plugins/SmiliesPlugin/MANIFEST
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
data/System/SmiliesPlugin.txt 0644
data/System/TipTopic1ForSmiliesPlugin.txt 0644
lib/Foswiki/Plugins/SmiliesPlugin.pm 0444
pub/System/SmiliesPlugin/biggrin.gif 0644
pub/System/SmiliesPlugin/confused.gif 0644
Expand Down
26 changes: 0 additions & 26 deletions SpreadSheetPlugin/data/System/TipTopic1ForSpreadSheetPlugin.txt

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
data/System/SpreadSheetPlugin.txt 0644
data/System/TipTopic1ForSpreadSheetPlugin.txt 0644
data/System/VarCALC.txt 0644
lib/Foswiki/Plugins/SpreadSheetPlugin.pm 0444
lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm 0444
43 changes: 21 additions & 22 deletions TablePlugin/data/System/TablePlugin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ Attributes are defined as a =TABLEATTRIBUTES= [[%SYSTEMWEB%.PreferenceSettings][
Table attributes can be set in different ways. In top down order:
1 As default preference in [[%SCRIPTURL{"configure"}%/#TablePlugin$Extensions][Configure]].
1 As preference in a topic: =TABLEPLUGIN_TABLEATTRIBUTES=: =Set TABLEPLUGIN_TABLEATTRIBUTES = tableborder="0" cellpadding="1" ...=
1 As parameters to the =TABLE= macro: <pre class="tml">%<nop>TABLE{ tableborder="0" cellpadding="4" cellspacing="3" cellborder="0" }%</pre>
1 As parameters to the =TABLE= macro: =%<nop>TABLE{ tableborder="0" cellpadding="4" cellspacing="3" cellborder="0" }%=

The preference =TABLEPLUGIN_TABLEATTRIBUTES = ...= competely overrides previous preferences (for example in <nop>%MAINWEB%.SitePreferences or Configure):
%JQREQUIRE{"chili"}%<pre class="tml">
<pre>
* <nop>Set TABLEPLUGIN_TABLEATTRIBUTES = cellpadding="0" <span class="foswikiGrayText">&lt;&lt;&lt; this will remove previously set preferences and leave only 1 attribute</span>
</pre>
If you pass =%<nop>TABLE{...}%= parameters, you partially override previously set preferences:
<pre class="tml">
<pre>
* %<nop>TABLE{datacolor="#f00"}% <span class="foswikiGrayText">&lt;&lt;&lt; this will only change the data color attribute</span>
</pre>

Expand All @@ -38,7 +38,7 @@ The setting =disableallsort= is normally not used as a TABLE or TABLEATTRIBUTES

---+++ Use of %<nop>TABLE{...}%

Line before table: <pre class="tml">%<nop>TABLE{ sort="on" tableborder="0" cellpadding="4" cellspacing="3" cellborder="0" headerbg="#D5CCB1" headercolor="#666" databg="#FAF0D4, #F3DFA8" headerrows="2" footerrows="1" }%</pre>
Line before table: =%<nop>TABLE{ sort="on" tableborder="0" cellpadding="4" cellspacing="3" cellborder="0" headerbg="#D5CCB1" headercolor="#666" databg="#FAF0D4, #F3DFA8" headerrows="2" footerrows="1" }%=

%TABLE{ sort="on" tableborder="0" cellpadding="4" cellspacing="3" cellborder="0" headerbg="#D5CCB1" headercolor="#666" databg="#FAF0D4, #F3DFA8" headerrows="2" footerrows="1" }%
| *Table with two Header Rows and Footer Row* ||||||
Expand Down Expand Up @@ -96,35 +96,35 @@ sort row. To sort by the first _footer_ row, set =headerrows="0"=.

Table cells with a single caret indicate follow-up rows of multi-row spans. For example,

<verbatim class="tml">
| One One | One Two | One Three |
| ^ | Two Two | Two Three |
| Three One | ^ | Three Three |
<verbatim>
| One One | One Two | One Three |
| ^ | Two Two | Two Three |
| Three One | ^ | Three Three |
</verbatim>

Results in:
| One One | One Two | One Three |
| ^ | Two Two | Two Three |
| Three One | ^ | Three Three |
| One One | One Two | One Three |
| ^ | Two Two | Two Three |
| Three One | ^ | Three Three |

---+++ Col spans
Col spans can be achieved by writing table cell separators without contents or spacing:
<verbatim class="tml">
<verbatim>
%TABLE{tablerules="cols"}%
| *Mammals* ||
| *Mammals* ||
| Monotremes | Echidna, Platypus |
| Marsupials | Kangaroo, Koala |
| Placentals ||
| Fish (to write) ||
| Marsupials | Kangaroo, Koala |
| Placentals ||
| Fish (to write) ||
</verbatim>

Results in:
%TABLE{tablerules="cols"}%
| *Mammals* ||
| *Mammals* ||
| Monotremes | Echidna, Platypus |
| Marsupials | Kangaroo, Koala |
| Placentals ||
| Fish (to write) ||
| Marsupials | Kangaroo, Koala |
| Placentals ||
| Fish (to write) ||

---++ <nop>%TOPIC% Global Settings

Expand Down Expand Up @@ -178,8 +178,7 @@ Sort icons in the header are read from System.DocumentGraphics.
| Version: | %$VERSION% |
| Release: | %$RELEASE% |
| Change History: | <!-- specify latest version first -->&nbsp; |
| 11 Aug 2010 | 1.126: Paul Harvey: Foswikitask:Item9415 - added TML syntax highlighting to documentation |
| 09 Aug 2010 | 1.125: Crawford Currie: Item8303: fixed sorting with multiple headers |
| 9 Aug 2010 | 1.125: Crawford Currie: Item8303: fixed sorting with multiple headers |
| 31 Jul 2010 | 1.124: Arthur Clemens: Added attribute =inlinemarkup= to optionally add HTML markup for better copy/pasting. |
| 05 Apr 2010 | 1.123: New default colors. |
| 13 Mar 2010 | 1.122: Arthur Clemens: Fixed sorting of columns with mixed data types: numbers, dates, strings, empty cells. |
Expand Down
1 change: 0 additions & 1 deletion TablePlugin/lib/Foswiki/Plugins/TablePlugin/MANIFEST
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
data/System/TablePlugin.txt 0644
data/System/TipTopic1ForTablePlugin.txt 0644
data/System/VarTABLE.txt 0644
lib/Foswiki/Plugins/TablePlugin.pm 0444
lib/Foswiki/Plugins/TablePlugin/Core.pm 0444
Expand Down
4 changes: 2 additions & 2 deletions TestFixturePlugin/data/System/TestFixturePlugin.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ A test pass will generate an appropriate plain text message in the browser. A te
---+ Syntax

In your testcase topic, enter the golden HTML surrounded by structured HTML comments:
%JQREQUIRE{"chili"}%<verbatim class="tml">
<verbatim>
<!-- expected -->
...your golden HTML...
<!-- /expected -->
Expand All @@ -36,7 +36,7 @@ The golden HTML should be what you expect to be rendered in the final output.
Anything else you put into an =expected= tag will be output if there are any test failures, so you can add random text to help identify which =expected= block failed - for example <code>&lt;!-- expected TESTEYESIGHT --&gt;</code>

You specify your actual test markup in the same way:
<verbatim class="tml">
<verbatim>
<!-- actual -->
<!-- /actual -->
</verbatim>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Frequently Asked Questions of the TinyMCEPlugin integration.

---++ Q: The editor takes over the standard edit screen. That's OK, but how do I get access to the old (textarea) editor?
A: Foswiki has a 'Edit Wiki Text' link on most screens that gives you access to the plain text editor, so this question is moot. In addition to this there are three ways to temporarily disable !TinyMCE:
1 Add =;nowysiwyg=1= to the end of the edit URL to disable it for a single edit,
1 Add=;nowysiwyg=1= to the end of the edit URL to disable it for a single edit,
2 =Set NOWYSIWYG = 1= in a web, topic, or personal preferences page to disable the editor for a web, topic or user,
3 =Set WYSIWYG_EXCLUDE= as described in WysiwygPlugin to disable the editor subject to certain content (e.g. Foswiki macros, pure Code.HTML etc) being in the page. This can also be set on a web, topic, or personal basis.

Expand Down
11 changes: 5 additions & 6 deletions TipsContrib/data/System/TipTopic001.txt
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
%META:TOPICINFO{author="ProjectContributor" date="1107568372" format="1.1" version="$Rev$"}%
%META:TOPICINFO{author="ProjectContributor" date="1107568372" format="1.0" version="$Rev$"}%
%META:TOPICPARENT{name="TipsOfTheDay"}%
The go box (also called jump box) allows you to jump from page to page and search for documents. If you do not know the entire name of the topic you are looking for, a partial name in the GoBox will perform a literal search.
---+ The Go Box as a browser

%META:FORM{name="TipOfTheDayForm"}%
%META:FIELD{name="TopicClassification" attributes="" title="TopicClassification" value="TipOfTheDay"}%
%META:FIELD{name="TopicSummary" attributes="" title="Topic Summary" value="The Go Box as a browser"}%
%META:FIELD{name="RelatedTopics" attributes="" title="Related Topics" value="PatternSkin, GoBox"}%
The go box (also called jump box) is not only a tool to allow you to jump from page to page, you can use the Go Box to search for documents. If you do not know the entire name of the Foswiki topic you are looking, partially putting in the topic name in the GoBox will result in a literal search in the Foswiki topics.

[[TipsOfTheDay][See More Tips...]]
11 changes: 5 additions & 6 deletions TipsContrib/data/System/TipTopic002.txt
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
%META:TOPICINFO{author="ProjectContributor" date="1107568431" format="1.1" version="$Rev$"}%
%META:TOPICINFO{author="ProjectContributor" date="1107568431" format="1.0" version="$Rev$"}%
%META:TOPICPARENT{name="TipsOfTheDay"}%
Each Foswiki web has a WebChanges topic that lists recent activity from all editors of the web. This can be useful when looking for a colleague's recently contributed content, for example. Recent changes may also be viewed with your favourite news feed reader using the WebRss or WebAtom topics. Additionally, WebNotify may be used to subscribe to changes via E-mail.
---+ <nop>WebChanges to see recent activity

%META:FORM{name="TipOfTheDayForm"}%
%META:FIELD{name="TopicClassification" attributes="" title="TopicClassification" value="TipOfTheDay"}%
%META:FIELD{name="TopicSummary" attributes="" title="Topic Summary" value="WebChanges to see recent activity"}%
%META:FIELD{name="RelatedTopics" attributes="" title="Related Topics" value="WebChanges, WebRss, WebAtom, WebNotify"}%
Each Foswiki web has a WebChanges topic that lists recent activity from all editors of the web. This page can be useful when looking for recently contributed content of a colleague.

[[TipsOfTheDay][See More Tips...]]
11 changes: 5 additions & 6 deletions TipsContrib/data/System/TipTopic003.txt
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
%META:TOPICINFO{author="ProjectContributor" date="1107568683" format="1.1" version="$Rev$"}%
%META:TOPICINFO{author="ProjectContributor" date="1107568683" format="1.0" version="$Rev$"}%
%META:TOPICPARENT{name="TipsOfTheDay"}%
At the bottom of each page among the action links (assuming use of the default PatternSkin), there is a *View wiki text* link which shows how a topic looks in its raw WikiSyntax form. This allows you to view and copy raw text without having to edit.
---+ Raw Text link

%META:FORM{name="TipOfTheDayForm"}%
%META:FIELD{name="TopicClassification" attributes="" title="TopicClassification" value="TipOfTheDay"}%
%META:FIELD{name="TopicSummary" attributes="" title="Topic Summary" value="View wiki text link"}%
%META:FIELD{name="RelatedTopics" attributes="" title="Related Topics" value="WikiSyntax, TextFormattingRules, TipTopic004"}%
At the bottom of the page next to *Edit* and *Attach*, there is a *Raw Text* link that allows one to easily see how the Foswiki topic looks in its raw form. This allows you to see and copy raw text without the need to edit and lock a topic.

[[TipsOfTheDay][See More Tips...]]
Loading

0 comments on commit e211241

Please sign in to comment.