From 300e9470e3200eca4c66561e5445316386ab05ce Mon Sep 17 00:00:00 2001 From: TWikiContributor Date: Sat, 1 Apr 2006 05:55:44 +0000 Subject: [PATCH] buildrelease --- TWiki/AnApplicationWithWikiForm.mdwn | 2 +- TWiki/ChangeEmailAddress.mdwn | 52 +- TWiki/ChangePassword.mdwn | 60 +- TWiki/CommentPlugin.mdwn | 78 +- TWiki/EditTablePlugin.mdwn | 15 +- TWiki/EmptyPlugin.mdwn | 34 +- TWiki/FileAttachment.mdwn | 2 +- TWiki/FormattedSearch.mdwn | 6 +- TWiki/IncludeTopicsAndWebPages.mdwn | 4 +- TWiki/InstantEnhancements.mdwn | 2 +- TWiki/JSCalendarContrib.mdwn | 28 +- TWiki/MailerContrib.mdwn | 102 +- TWiki/ManagingWebs.mdwn | 4 +- TWiki/PatternSkin.mdwn | 12 +- TWiki/PatternSkinCss.mdwn | 66 +- TWiki/PatternSkinCssCookbook.mdwn | 16 +- TWiki/PatternSkinCssCookbookCenterPage.mdwn | 2 +- TWiki/PatternSkinCssCookbookCenterPageBorder.mdwn | 8 +- TWiki/PatternSkinCssCookbookEditTableStyle.mdwn | 3 +- TWiki/PatternSkinCssCookbookNoLeftBar.mdwn | 2 +- TWiki/PatternSkinCustomization.mdwn | 198 ++++ TWiki/ResetPassword.mdwn | 33 +- TWiki/SearchHelp.mdwn | 2 +- TWiki/SourceCode.mdwn | 19 +- TWiki/TWikiAccessControl.mdwn | 8 +- TWiki/TWikiCss.mdwn | 8 + TWiki/TWikiDocGraphics.mdwn | 1092 +++++++++++---------- TWiki/TWikiFormDotPm.mdwn | 10 +- TWiki/TWikiHistory.mdwn | 14 +- TWiki/TWikiMergeDotPm.mdwn | 57 +- TWiki/TWikiMetaData.mdwn | 6 +- TWiki/TWikiMetaDotPm.mdwn | 9 - TWiki/TWikiPlugins.mdwn | 4 +- TWiki/TWikiPreferences.mdwn | 4 +- TWiki/TWikiPrefsDotPm.mdwn | 2 +- TWiki/TWikiRegistration.mdwn | 5 +- TWiki/TWikiScripts.mdwn | 4 +- TWiki/TWikiSiteTools.mdwn | 2 +- TWiki/TWikiStoreDotPm.mdwn | 7 +- TWiki/TWikiSystemRequirements.mdwn | 4 + TWiki/TWikiTemplates.mdwn | 68 +- TWiki/TWikiUIManageDotPm.mdwn | 2 - TWiki/TWikiUIRegisterDotPm.mdwn | 6 +- TWiki/TWikiUpgradeGuide.mdwn | 12 +- TWiki/TWikiVariables.mdwn | 16 +- TWiki/TextFormattingFAQ.mdwn | 10 +- TWiki/TextFormattingRules.mdwn | 407 -------- TWiki/TipsContrib.mdwn | 4 +- TWiki/TwistyContrib.mdwn | 29 +- TWiki/WebAtomBase.mdwn | 2 +- TWiki/WebLeftBar.mdwn | 2 - TWiki/WebLeftBarPersonalTemplate.mdwn | 2 +- TWiki/WebLeftBarSearch.mdwn | 28 +- TWiki/WebRssBase.mdwn | 8 +- TWiki/WebSearch.mdwn | 6 +- TWiki/WebTopBar.mdwn | 18 +- TWiki/WebTopicCreator.mdwn | 31 +- TWiki/WebTopicNonWikiTemplate.mdwn | 6 +- TWiki/WelcomeGuest.mdwn | 120 +-- TWiki/WikiReferences.mdwn | 2 +- TWiki/WysiwygPlugin.mdwn | 479 ++++++++- 61 files changed, 1876 insertions(+), 1368 deletions(-) diff --git a/TWiki/AnApplicationWithWikiForm.mdwn b/TWiki/AnApplicationWithWikiForm.mdwn index b5b0c4d..8ef8a21 100644 --- a/TWiki/AnApplicationWithWikiForm.mdwn +++ b/TWiki/AnApplicationWithWikiForm.mdwn @@ -9,7 +9,7 @@ How can I create a simple [[TWiki Form|Main/TWikiForms]] based application? 3. Create a Template Topic and in Edit mode 4. In edit mode add the [[TWiki Form|Main/TWikiForms]] you defined to the Template Topic 5. Create a HTML Form with necessary fields -6. Define `SEARCH` function for listing items. See [[TWikiVariables#VarSEARCH]] +6. Define `SEARCH` function for listing items. See [[VarSEARCH]] For more information follow the links... diff --git a/TWiki/ChangeEmailAddress.mdwn b/TWiki/ChangeEmailAddress.mdwn index 1c8bc4d..ff1903f 100644 --- a/TWiki/ChangeEmailAddress.mdwn +++ b/TWiki/ChangeEmailAddress.mdwn @@ -1,7 +1,5 @@ # Change E-mail Address -[[TWikiUsers]] has a full list of user names. - This form is used to change your registered e-mail addresses. Your registered e-mails are used by TWiki for sending you e-mails, include notifications of password changes. The addresses you register via this form are kept secret and will **not** be published anywhere on this site. %X% **_Security Note_**: You really ought to register a valid e-mail address. If TWiki can't find a registered e-mail for you in the secret database, it will look in your user topic for a line like this: @@ -10,37 +8,45 @@ This form is used to change your registered e-mail addresses. Your registered e- If your user topic is not protected from changes by other people, and you don't register an e-mail address using this form, then your user account could be hijacked by someone else. -If your old e-mail addresses are all invalid (you can't receive mail there any more) and you have forgotten your password, please contact . +If your old e-mail addresses are all invalid (you can't receive mail there any more) and you have forgotten your password, please contact 0 for help. Registered e-mail addresses for currently logged in user (`admin`): +[[TWikiUsers]] has a list of other TWiki users. +
- - - - - - - - - - - - - - - - -
Your [[TWiki/LoginName]]: **
Password: **
New e-mails (space-separated list): **
   (Fields marked ** are required)
+
+
+ + + + + + + + + + + + + + + + + +
Your [[TWiki/LoginName]]: **
Password: **
New e-mails (space-separated list): **
     (Fields marked ** are required)
+
+
+ After submitting this form your e-mail will be changed, and you will be returned to this form. -If you have questions please contact the TWiki administrator . +If you have any questions, please contact 0. + +**_Related topics:_** [[ChangePassword]], [[ResetPassword]], [[UserToolsCategory]], [[AdminToolsCategory]]
Note to administrator: This form applies only if TWiki uses a {PasswordManager} that supports storing e-mails (e.g. TWiki::Users::HtPasswdUser). Otherwise replace this topic with a note describing how to change registered e-mail in your organization).
- -**_Related Topics:_** [[ChangePassword]], [[AdminToolsCategory]], [[UserToolsCategory]] diff --git a/TWiki/ChangePassword.mdwn b/TWiki/ChangePassword.mdwn index 6ab941a..905ea1e 100644 --- a/TWiki/ChangePassword.mdwn +++ b/TWiki/ChangePassword.mdwn @@ -1,42 +1,46 @@ # Change Password -**_Forgotten your password?_** Then use [[ResetPassword]] instead. +**_Forgotten your password?_** Use [[ResetPassword]] instead. -[[TWikiUsers]] has a full list of user names. +[[TWikiUsers]] has a list of other TWiki users.
- - - - - - - - - - - - - - - - - - - - - -
Your [[TWiki/LoginName]]: **
Old password: **
New password: **
Retype new password: **
     (Fields marked ** are required)
+
+
+ + + + + + + + + + + + + + + + + + + + + +
Your [[TWiki/LoginName]]: **
Current password: **
New password: **
Retype new password: **
     (Fields marked ** are required)
+
+
After submitting this form your password will be changed. -If you have questions please contact the TWiki administrator . +If you have any questions, please contact 0. + +**_Related topics:_** [[ResetPassword]], [[ChangeEmailAddress]], [[UserToolsCategory]], [[AdminToolsCategory]] - +
Note to administrator: This form applies only if TWiki uses a {PasswordManager} that supports changing passwords (e.g. TWiki::Users::HtPasswdUser). Otherwise replace this topic with a note describing how to change the password in your organization). See [[Main/TWikiUserAuthentication]] for more information. Note to administrator: This form applies only if TWiki uses a {PasswordManager} that supports changing passwords. Otherwise replace this topic with a note describing how to change the password in your organization. See [[Main/TWikiUserAuthentication]] for more information.
- -**_Related Topics:_** [[ChangeEmailAddress]], [[AdminToolsCategory]], [[UserToolsCategory]] diff --git a/TWiki/CommentPlugin.mdwn b/TWiki/CommentPlugin.mdwn index c7e54a5..6a66ce1 100644 --- a/TWiki/CommentPlugin.mdwn +++ b/TWiki/CommentPlugin.mdwn @@ -2,9 +2,7 @@ This plugin allows users to quickly post comments to a page without an edit/preview/save cycle. -_( Discussion in TWiki:Plugins/CommentPluginDev )_ - -**_Note: this version of the [[CommentPlugin]] will _not_ work with TWiki versions released prior to June 2005_** +**WARNING: TWiki-4 only. If you want to use this plugin with an earlier version of TWiki, please see [here](http://twiki.org/cgi-bin/view/Plugins/%TOPIC%?rev=1.57)**
@@ -30,7 +32,7 @@ There are several ways to put an image in a topic. - You are not restricted to use the TWikiDocGraphics topic - in a similar way you can show attached images by replacing `TWikiDocGraphics` with the topic name. - The TWiki:Plugins.SmiliesPlugin, using a different short hand than `%VARIABLES%`, may be worth checking out for extended use - To create an image with a link, write: `[[WebHome][%ICON{home}%]]` to get: [[Main/WebHome]] -- To get the full URL of the icon, use [[ICONURL|Main/TWikiVariables#VarICONURL]]: `%ICONURL{"toggleopen"}%` gets you: `http://www.dementia.org/twiki//view/Main/WebHome/toggleopen.gif` (if you paste that in a topic you will get: ![toggleopen.gif](http://www.dementia.org/twiki//view/Main/WebHome/toggleopen.gif)) +- To get the full URL of the icon, use [[ICONURL|Main/VarICONURL]]: `%ICONURL{"toggleopen"}%` gets you: `http://www.dementia.org/twiki//view/Main/WebHome/toggleopen.gif` (if you paste that in a topic you will get: ![toggleopen.gif](http://www.dementia.org/twiki//view/Main/WebHome/toggleopen.gif)) - **_Note:_** Most images have 16x16 pixels. For those images you can use the `%ICON{}%` syntax. Use an HTML img tag with `%ICONURL{}%` for image with other sizes. **_Related Topics:_** [[TWikiSkins]], [[DeveloperDocumentationCategory]], [[AdminDocumentationCategory]] @@ -43,172 +45,172 @@ There are several ways to put an image in a topic. - - - - + + + + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + +
 File NameDescriptionWrite... File NameDescriptionWrite...
Speech bubblebubble.gif Speech bubble %ICON{bubble}% Speech bubble bubble.gif Speech bubble %ICON{bubble}%
Days / Calendar Days / Calendar days.gif Days, Calendar %ICON{days}%
Downloaddownload.gif Download %ICON{download}% Download download.gif Download %ICON{download}%
Filter Filter filter.gif Filter %ICON{filter}%
Geargear.gif Gear %ICON{gear}% Gear gear.gif Gear %ICON{gear}%
Globe Globe globe.gif Globe %ICON{globe}%
Pointing handhand.gif Pointing hand %ICON{hand}% Pointing hand hand.gif Pointing hand %ICON{hand}%
Help Help help.gif Help %H%, %ICON{help}%
Informationinfo.gif Info %ICON{info}% Information info.gif Info %ICON{info}%
Hour glass (clock) Hour glass (clock) hourglass.gif Hour glass (clock) %ICON{hourglass}%
Read moremore.gif Read more %ICON{more}% Read more more.gif Read more %ICON{more}%
Read more Read more more-small.gif Read more, 13x13 <img src="%ICONURL{more-small}%" width="13" height="13" alt="Read more" border="0" />
Movemove.gif Move %ICON{move}% Move move.gif Move %ICON{move}%
Note Note note.gif Note %ICON{note}%
Parkedparked.gif Parked %ICON{parked}% Parked parked.gif Parked %ICON{parked}%
Pencil / Refactor / Edit Pencil / Refactor / Edit pencil.gif Pencil / Refactor / Edit %P%, %ICON{pencil}%
Request for commentsrfc.gif Request for comments %ICON{rfc}% Request for comments rfc.gif Request for comments %ICON{rfc}%
Sort Sort sort.gif Sort %ICON{sort}%
Gold star, favoritesstargold.gif Gold star, favorites %ICON{stargold}% Gold star, favorites stargold.gif Gold star, favorites %ICON{stargold}%
Red star, highlight Red star, highlight starred.gif Red star, highlight %S%, %ICON{starred}%
Stopstop.gif Stop %ICON{stop}% Stop stop.gif Stop %ICON{stop}%
Target Target target.gif Target %ICON{target}%
Tip, ideatip.gif Tip, idea %T%, %ICON{tip}% Tip, idea tip.gif Tip, idea %T%, %ICON{tip}%
Warning, important Warning, important warning.gif Warning, important %W%, %ICON{warning}%
Watchwatch.gif Watch %ICON{watch}% Watch watch.gif Watch %ICON{watch}%
Work in progress, under construction Work in progress, under construction wip.gif Work in progress, under construction %ICON{wip}%
Wrench, toolswrench.gif Wrench, tools %ICON{wrench}% Wrench, tools wrench.gif Wrench, tools %ICON{wrench}%
@@ -216,210 +218,198 @@ There are several ways to put an image in a topic. - - - - + + + + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - - - - - - - - -
 File NameDescriptionWrite... File NameDescriptionWrite...
View topicviewtopic.gif View topic %ICON{viewtopic}% View topic viewtopic.gif View topic %ICON{viewtopic}%
Print topic Print topic printtopic.gif Print topic %ICON{printtopic}%
Refresh topicrefreshtopic.gif Refresh topic %ICON{refreshtopic}% Refresh topic refreshtopic.gif Refresh topic %ICON{refreshtopic}%
New topic New topic newtopic.gif New topic %ICON{newtopic}%
Edit topicedittopic.gif Edit topic %ICON{edittopic}% Edit topic edittopic.gif Edit topic %ICON{edittopic}%
Save Save save.gif Save %ICON{save}%
Attach fileattachfile.gif Attach file %ICON{attachfile}% Attach file attachfile.gif Attach file %ICON{attachfile}%
Download Download download.gif Download %ICON{download}%
Trashtrash.gif Trash %ICON{trash}% Trash trash.gif Trash %ICON{trash}%
Search topic Search topic searchtopic.gif Search topic %ICON{searchtopic}%
Searchsearch-small.gif Small search button, 13x13 <img src="%ICONURL{search-small}%" width="13" height="13" alt="Search" border="0" /> Search search-small.gif Small search button, 13x13 <img src="%ICONURL{search-small}%" width="13" height="13" alt="Search" border="0" />
Topic back-links Topic back-links topicbacklinks.gif Topic back-links %ICON{topicbacklinks}%
Topic differencetopicdiffs.gif Topic difference %ICON{topicdiffs}% Topic difference topicdiffs.gif Topic difference %ICON{topicdiffs}%
Statistics Statistics statistics.gif Statistics %ICON{statistics}%
Indexindex.gif Index %ICON{index}% Index index.gif Index %ICON{index}%
Index list Index list indexlist.gif Index list %ICON{indexlist}%
Cache topiccachetopic.gif Cache topic %ICON{cachetopic}% Cache topic cachetopic.gif Cache topic %ICON{cachetopic}%
Folder Folder folder.gif Folder %ICON{folder}%
Webweb-bg.gif Web background, used in [[TWiki/WebLeftBarWebsList]]%ICON{web-bg}%
Webweb-bg-small.gif Web background, 13x13 <img src="%ICONURL{web-bg-small}%" width="13" height="13" alt="Web" border="0" />
### person Person, group group, lock access icons - - - - + + + + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + @@ -430,64 +420,64 @@ There are several ways to put an image in a topic.
 File NameDescriptionWrite... File NameDescriptionWrite...
Personperson.gif Person %ICON{person}% Person person.gif Person %ICON{person}%
Persons Persons persons.gif Persons %ICON{persons}%
Groupgroup.gif Group %ICON{group}% Group group.gif Group %ICON{group}%
Building Building building.gif Building %ICON{building}%
Buildingsbuildings.gif Buildings %ICON{buildings}% Buildings buildings.gif Buildings %ICON{buildings}%
Log out Log out logout.gif Log out %ICON{logout}%
Keykey.gif Key %ICON{key}% Key key.gif Key %ICON{key}%
Lock Lock lock.gif Lock %ICON{lock}%
Locked topiclocktopic.gif Locked topic %ICON{locktopic}% Locked topic locktopic.gif Locked topic %ICON{locktopic}%
Locked topic, gray Locked topic, gray locktopicgray.gif Locked topic, gray %ICON{locktopicgray}%
Locked folderlockfolder.gif Locked folder %ICON{lockfolder}% Locked folder lockfolder.gif Locked folder %ICON{lockfolder}%
Locked folder, gray Locked folder, gray lockfoldergray.gif Locked folder, gray %ICON{lockfoldergray}%
- - - - + + + + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + +
 File NameDescriptionWrite... File NameDescriptionWrite...
Changeschanges.gif Changes %ICON{changes}% Changes changes.gif Changes %ICON{changes}%
Changes Changes changes-small.gif Changes (small), 13x13 <img src="%ICONURL{changes-small}%" width="13" height="13" alt="Changes" border="0" />
Recent changesrecentchanges.gif Recent changes %ICON{recentchanges}% Recent changes recentchanges.gif Recent changes %ICON{recentchanges}%
Mail Mail mail.gif Mail %ICON{mail}%
Notifynotify.gif Notify %ICON{notify}% Notify notify.gif Notify %ICON{notify}%
RSS feed RSS feed rss-feed.gif RSS feed, 36x14 <img src="%ICONURL{rss-feed}%" width="36" height="14" alt="RSS feed" border="0" />
RSS feedrss-small.gif RSS feed %ICON{rss-small}% RSS feed rss-small.gif RSS feed %ICON{rss-small}%
XML feed XML feed xml-feed.gif XML feed, 36x14 <img src="%ICONURL{xml-feed}%" width="36" height="13" alt="XML feed" border="0" />
XML feedxml-small.gif XML feed %ICON{xml-small}% XML feed xml-small.gif XML feed %ICON{xml-small}%
@@ -495,196 +485,196 @@ There are several ways to put an image in a topic. - - - - + + + + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + +
 File NameDescriptionWrite... File NameDescriptionWrite...
NEWnew.gif NEW, 30x16 %N%, <img src="%ICONURL{new}%" width="30" height="16" alt="New" border="0" /> NEW new.gif NEW, 30x16 %N%, <img src="%ICONURL{new}%" width="30" height="16" alt="New" border="0" />
TODO TODO todo.gif TODO, 37x16 <img src="%ICONURL{todo}%" width="37" height="16" alt="TODO" border="0" />
UPDATEDupdated.gif UPDATED, 55x16 %U%, <img src="%ICONURL{updated}%" width="55" height="16" alt="UPDATED" border="0" /> UPDATED updated.gif UPDATED, 55x16 %U%, <img src="%ICONURL{updated}%" width="55" height="16" alt="UPDATED" border="0" />
DONE DONE done.gif DONE, 37x16 <img src="%ICONURL{done}%" width="37" height="16" alt="Done" border="0" />
CLOSEDclosed.gif CLOSED, 48x16 <img src="%ICONURL{closed}%" width="48" height="16" alt="Closed" border="0" /> CLOSED closed.gif CLOSED, 48x16 <img src="%ICONURL{closed}%" width="48" height="16" alt="Closed" border="0" />
Minus Minus minus.gif Minus %ICON{minus}%
Plusplus.gif Plus %ICON{plus}% Plus plus.gif Plus %ICON{plus}%
Cancel Cancel choice-cancel.gif Cancel %ICON{choice-cancel}%
Nochoice-no.gif No %ICON{choice-no}% No choice-no.gif No %ICON{choice-no}%
Yes / Done Yes / Done choice-yes.gif Yes / Done %Y%, %ICON{choice-yes}%
Unchecked checkboxunchecked.gif Unchecked checkbox %ICON{unchecked}% Unchecked checkbox unchecked.gif Unchecked checkbox %ICON{unchecked}%
Checked checkbox Checked checkbox checked.gif Checked checkbox %ICON{checked}%
Flagflag.gif Flag %ICON{flag}% Flag flag.gif Flag %ICON{flag}%
Flag Flag flag-gray.gif Gray flag %ICON{flag-gray}%
Flagflag-gray-small.gif Small gray flag, 13x13 <img src="%ICONURL{flag-gray-small}%" width="13" height="13" alt="Flag" border="0" /> Flag flag-gray-small.gif Small gray flag, 13x13 <img src="%ICONURL{flag-gray-small}%" width="13" height="13" alt="Flag" border="0" />
Aqua led Aqua led led-aqua.gif Aqua led %ICON{led-aqua}%
Blue ledled-blue.gif Blue led %ICON{led-blue}% Blue led led-blue.gif Blue led %ICON{led-blue}%
Gray led Gray led led-gray.gif Gray led %ICON{led-gray}%
Green ledled-green.gif Green led %ICON{led-green}% Green led led-green.gif Green led %ICON{led-green}%
Orange led Orange led led-orange.gif Orange led %ICON{led-orange}%
Purple ledled-purple.gif Purple led %ICON{led-purple}% Purple led led-purple.gif Purple led %ICON{led-purple}%
Red led Red led led-red.gif Red led %ICON{led-red}%
Yellow ledled-yellow.gif Yellow led %ICON{led-yellow}% Yellow led led-yellow.gif Yellow led %ICON{led-yellow}%
Aqua led Aqua led led-box-aqua.gif Aqua led %ICON{led-box-aqua}%
Blue ledled-box-blue.gif Blue led %ICON{led-box-blue}% Blue led led-box-blue.gif Blue led %ICON{led-box-blue}%
Gray led Gray led led-box-gray.gif Gray led %ICON{led-box-gray}%
Green ledled-box-green.gif Green led %ICON{led-box-green}% Green led led-box-green.gif Green led %ICON{led-box-green}%
Orange led Orange led led-box-orange.gif Orange led %ICON{led-box-orange}%
Purple ledled-box-purple.gif Purple led %ICON{led-box-purple}% Purple led led-box-purple.gif Purple led %ICON{led-box-purple}%
Red led Red led led-box-red.gif Red led %ICON{led-box-red}%
Yellow ledled-box-yellow.gif Yellow led %ICON{led-box-yellow}% Yellow led led-box-yellow.gif Yellow led %ICON{led-box-yellow}%
@@ -692,315 +682,362 @@ There are several ways to put an image in a topic. - - - - + + + + + + + + + + - - - - + + + + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + + +
 File NameDescriptionWrite... File NameDescriptionWrite...
Home home.gif Home %ICON{home}%
Homehome.gif Home %ICON{home}% External site external.gif External site %ICON{external}%
Meet here (arrows to red dot)arrowdot.gif Meet here (arrows to red dot) %ICON{arrowdot}% Meet here (arrows to red dot) arrowdot.gif Meet here (arrows to red dot) %ICON{arrowdot}%
Left Left left.gif Left %ICON{left}%
Rightright.gif Right %ICON{right}% Right right.gif Right %ICON{right}%
Up Up up.gif Up %ICON{up}%
Downdown.gif Down %ICON{down}% Down down.gif Down %ICON{down}%
Arrow blue left Arrow blue left arrowbleft.gif Arrow blue left %ICON{arrowbleft}%
Arrow blue rightarrowbright.gif Arrow blue right %ICON{arrowbright}% Arrow blue right arrowbright.gif Arrow blue right %ICON{arrowbright}%
Arrow blue up Arrow blue up arrowbup.gif Arrow blue up %ICON{arrowbup}%
Arrow blue downarrowbdown.gif Arrow blue down %ICON{arrowbdown}% Arrow blue down arrowbdown.gif Arrow blue down %ICON{arrowbdown}%
Arrow left Arrow left arrowleft.gif Arrow left %ICON{arrowleft}%
Arrow rightarrowright.gif Arrow right %M%, %ICON{arrowright}% Arrow right arrowright.gif Arrow right %M%, %ICON{arrowright}%
Arrow up Arrow up arrowup.gif Arrow up %ICON{arrowup}%
Arrow downarrowdown.gif Arrow down %ICON{arrowdown}% Arrow down arrowdown.gif Arrow down %ICON{arrowdown}%
Go to start Go to start go_start.gif Go to start %ICON{go_start}%
Go fast backgo_fb.gif Go fast back %ICON{go_fb}% Go fast back go_fb.gif Go fast back %ICON{go_fb}%
Go back Go back go_back.gif Go back %ICON{go_back}%
Go forwardgo_forward.gif Go forward %ICON{go_forward}% Go forward go_forward.gif Go forward %ICON{go_forward}%
Go fast forward Go fast forward go_ff.gif Go fast forward %ICON{go_ff}%
Go to endgo_end.gif Go to end %ICON{go_end}% Go to end go_end.gif Go to end %ICON{go_end}%
+ +### toggleclose Interface icons + + + + + + + + + + + + + + + + + + + - + - + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + + + + + + + + + + + + +
Monospace monospace.gif Monospace %ICON{monospace}%
Proportional proportional.gif Proportional %ICON{proportional}%
Open toggle, Twisty open toggle toggleopen.gif Open toggle, Twisty open toggle %ICON{toggleopen}%
Close toggle, Twisty close toggle Close toggle, Twisty close toggle toggleclose.gif Close toggle, Twisty close toggle %ICON{toggleclose}%
Close toggle, Twisty close toggle Open toggle, Twisty open toggle toggleopen-small.gif Open toggle, Twisty open toggle %ICON{toggleopen-small}%
Close toggle, Twisty close toggle toggleclose-small.gif Close toggle, Twisty close toggle %ICON{toggleclose-small}%
Open toggle, Twisty open toggletoggleopen.gif Open toggle, Twisty open toggle %ICON{toggleopen}% Open toggle, Twisty open toggle toggleopen-mini.gif Open toggle, Twisty open toggle <img src="%ICONURL{toggleopen-mini}%" width="7" height="9" alt="Open" border="0" />
Open toggle, Twisty open toggletoggleopen-small.gif Open toggle, Twisty open toggle %ICON{toggleopen-small}% Close toggle, Twisty close toggle toggleclose-mini.gif Close toggle, Twisty close toggle <img src="%ICONURL{toggleclose-mini}%" width="7" height="9" alt="Close" border="0" />
Open toggle, Twisty open toggletoggleopenleft.gif Open toggle, Twisty open toggle %ICON{toggleopenleft}% Open toggle, Twisty open toggle toggleopenleft.gif Open toggle, Twisty open toggle %ICON{toggleopenleft}%
Open toggle, Twisty open toggle Open toggle, Twisty open toggle toggleopenleft-small.gif Open toggle, Twisty open toggle %ICON{toggleopenleft-small}%
Web web-bg.gif Web background, used in [[TWiki/WebLeftBarWebsList]]%ICON{web-bg}%
Web web-bg-small.gif Web background, 13x13 <img src="%ICONURL{web-bg-small}%" width="13" height="13" alt="Web" border="0" />
### line_ur Block graphics - - - - + + + + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + +
 File NameDescriptionWrite... File NameDescriptionWrite...
line_ld.gif Line graph left-down %ICON{line_ld}% line_ld.gif Line graph left-down %ICON{line_ld}%
line_lr.gif Line graph left-right %ICON{line_lr}%
line_lrd.gif Line graph left-right-down %ICON{line_lrd}% line_lrd.gif Line graph left-right-down %ICON{line_lrd}%
line_rd.gif Line graph right-down %ICON{line_rd}%
line_ud.gif Line graph up-down %ICON{line_ud}% line_ud.gif Line graph up-down %ICON{line_ud}%
line_udl.gif Line graph up-down-left %ICON{line_udl}%
line_udlr.gif Line graph up-down-left-right %ICON{line_udlr}% line_udlr.gif Line graph up-down-left-right %ICON{line_udlr}%
line_udr.gif Line graph up-down-right %ICON{line_udr}%
line_ul.gif Line graph up-left %ICON{line_ul}% line_ul.gif Line graph up-left %ICON{line_ul}%
line_ulr.gif Line graph up-left-right %ICON{line_ulr}%
line_ur.gif Line graph up-right %ICON{line_ur}% line_ur.gif Line graph up-right %ICON{line_ur}%
dot_ld.gif Dot graph left-down %ICON{dot_ld}%
dot_lr.gif Dot graph left-right %ICON{dot_lr}% dot_lr.gif Dot graph left-right %ICON{dot_lr}%
dot_lrd.gif Dot graph left-right-down %ICON{dot_lrd}%
dot_rd.gif Dot graph right-down %ICON{dot_rd}% dot_rd.gif Dot graph right-down %ICON{dot_rd}%
dot_ud.gif Dot graph up-down %ICON{dot_ud}%
dot_udl.gif Dot graph up-down-left %ICON{dot_udl}% dot_udl.gif Dot graph up-down-left %ICON{dot_udl}%
dot_udlr.gif Dot graph up-down-left-right %ICON{dot_udlr}%
dot_udr.gif Dot graph up-down-right %ICON{dot_udr}% dot_udr.gif Dot graph up-down-right %ICON{dot_udr}%
dot_ul.gif Dot graph up-left %ICON{dot_ul}%
dot_ulr.gif Dot graph up-left-right %ICON{dot_ulr}% dot_ulr.gif Dot graph up-left-right %ICON{dot_ulr}%
dot_ur.gif Dot graph up-right %ICON{dot_ur}%
empty.gif Empty transparent 16x16 spacer %ICON{empty}% empty.gif Empty transparent 16x16 spacer %ICON{empty}%
@@ -1010,249 +1047,266 @@ Filetype icons are used by the attachment table and are seldom used in topics. W - - - - + + + + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - + - - - - + + + + - +
 File NameNameWrite... File NameNameWrite...
asas.gif ActionScript %ICON{as}% as as.gif ActionScript %ICON{as}%
bat bat bat.gif MS-DOS batch file %ICON{bat}%
bmpbmp.gif Bitmap %ICON{bmp}% bmp bmp.gif Bitmap %ICON{bmp}%
c c c.gif C source code file %ICON{c}%
dlldll.gif Dynamic Linked Library; Microsoft application file %ICON{dll}% dll dll.gif Dynamic Linked Library; Microsoft application file %ICON{dll}%
doc doc doc.gif Microsoft Word file %ICON{doc}%
elseelse.gif Unknown file format %ICON{else}% else else.gif Unknown file format %ICON{else}%
eml eml eml.gif Microsoft Outlook e-mail file %ICON{eml}%
exeexe.gif Microsoft Executable file %ICON{exe}% exe exe.gif Microsoft Executable file %ICON{exe}%
fla fla fla.gif Macromedia Flash Movie %ICON{fla}%
fonfon.gif Windows bitmapped font file %ICON{fon}% fon fon.gif Windows bitmapped font file %ICON{fon}%
gif gif gif.gif GIF %ICON{gif}%
hh.gif Header file %ICON{h}% h h.gif Header file %ICON{h}%
hlp hlp hlp.gif Standard help file %ICON{hlp}%
htmlhtml.gif HTML %ICON{html}% html html.gif HTML %ICON{html}%
java java java.gif Java source code file %ICON{java}%
jpgjpg.gif JPEG %ICON{jpg}% jpg jpg.gif JPEG %ICON{jpg}%
js js js.gif JavaScript %ICON{js}%
mdbmdb.gif Microsoft Access database File %ICON{mdb}% mdb mdb.gif Microsoft Access database File %ICON{mdb}%
mov mov mov.gif Quicktime movie %ICON{mov}%
mp3mp3.gif MP3 %ICON{mp3}% mp3 mp3.gif MP3 %ICON{mp3}%
pdf pdf pdf.gif PDF %ICON{pdf}%
plpl.gif Perl source code file %ICON{pl}% pl pl.gif Perl source code file %ICON{pl}%
png png png.gif PNG %ICON{png}%
pptppt.gif PowerPoint %ICON{ppt}% ppt ppt.gif PowerPoint %ICON{ppt}%
ps ps ps.gif Postscript %ICON{ps}%
pypy.gif Python source code file %ICON{py}% py py.gif Python source code file %ICON{py}%
ram ram ram.gif RealAudio %ICON{ram}%
regreg.gif Registry file %ICON{reg}% reg reg.gif Registry file %ICON{reg}%
sh sh sh.gif Unix shell script %ICON{sh}%
sniffsniff.gif sniff %ICON{sniff}% sniff sniff.gif sniff %ICON{sniff}%
swf swf swf.gif SWF (Shockwave Flash) %ICON{swf}%
ttfttf.gif True Type font %ICON{ttf}% ttf ttf.gif True Type font %ICON{ttf}%
txt txt txt.gif Text %ICON{txt}%
wavwav.gif Waveform sound file %ICON{wav}% wav wav.gif Waveform sound file %ICON{wav}%
wri wri wri.gif Windows Write %ICON{wri}%
xlsxls.gif Microsoft Excel Spreadsheet %ICON{xls}% xls xls.gif Microsoft Excel Spreadsheet %ICON{xls}%
xml xml xml.gif XML %ICON{xml}%
xslxsl.gif XSL (XML style sheet) %ICON{xsl}% xsl xsl.gif XSL (XML style sheet) %ICON{xsl}%
zip zip zip.gif Compressed Zip archive %ICON{zip}%
+ +### twiki TWiki icons + + + + + + + + + + + + + + +
 File NameDescriptionWrite...
TWiki twiki.gif TWiki logo %ICON{twiki}%
diff --git a/TWiki/TWikiFormDotPm.mdwn b/TWiki/TWikiFormDotPm.mdwn index a17f4cc..ca51f9a 100644 --- a/TWiki/TWikiFormDotPm.mdwn +++ b/TWiki/TWikiFormDotPm.mdwn @@ -10,7 +10,7 @@ Object representing a single form definition.
  • ObjectMethod renderFieldForEdit ($fieldDef,$web,$topic,$value) -> $html
  • ObjectMethod renderHidden ($meta,$useDefaults) -> $html
  • ObjectMethod cgiName ($field) -> $string
  • -
  • ObjectMethod getFieldValuesFromQuery ($query,$metaObject,$handleMandatory) -> $metaObject
  • +
  • ObjectMethod getFieldValuesFromQuery ($query,$metaObject,$initialiseMissing) -> ($seen,\@missing)
  • ObjectMethod isTextMergeable ($name) -> $boolean
  • ObjectMethod getField ($name) -> \%row
  • StaticMethod renderForDisplay ($templates,$meta)
  • @@ -56,15 +56,17 @@ Render form fields found in the meta as hidden inputs, so they pass through edit Generate the 'name' of the CGI parameter used to represent a field. -## [[ObjectMethod]] \*getFieldValuesFromQuery `($query,$metaObject,$handleMandatory) -> $metaObject` +## [[ObjectMethod]] \*getFieldValuesFromQuery `($query,$metaObject,$initialiseMissing) -> ($seen,\@missing)` Extract new values for form fields from a query. - `$query` - the query - `$metaObject` - the meta object that is storing the form values -- `$handleMandatory` - if set, will throw an [[OopsException]] if any mandatory fields are absent from the query. +- `$initialiseMissing` - if true, will cause fields that are in the form but have no value in the query or in the meta to be initialised to ''. -For each field, if there is a value in the query, use it. Otherwise if there is already entry for the field in the meta, keep it. Otherwise, if $handleMandatory, initialise the field to '' and set it in the meta. +For each field, if there is a value in the query, use it. Otherwise if there is already entry for the field in the meta, keep it. + +Returns the number of fields which had values provided by the query, and a references to an array of the names of mandatory fields that were missing from the query. ## [[ObjectMethod]] **isTextMergeable** `($name) -> $boolean` diff --git a/TWiki/TWikiHistory.mdwn b/TWiki/TWikiHistory.mdwn index 19d3046..613c9c5 100644 --- a/TWiki/TWikiHistory.mdwn +++ b/TWiki/TWikiHistory.mdwn @@ -37,7 +37,7 @@ Many, many people worked on TWiki-4.0.0. The credits in the table below only list the people who worked on individual enhancements. If you find an omission please fix it at TWiki:TWiki.%TOPIC%. There were many other contributors; for a full list, visit [[TWikiContributor]]. -Most of the redesign, refactoring and new documentation work in Dakar release was done by [Crawford Currie](http://c-dot.co.uk). [Michael Sparks](http://kamaelia.org/Michael.html) provided ideas and proof of concept for several improvements. Other people who gave _large_ amounts of their time and patience to less sexy aspects of the work, such as testing, infrastructure and documentation, are [[AntonAylward]], [[KennethLavrsen]], [[LynnwoodBrown]], [[MichaelDaum]], [Peter Thoeny](http://www.structuredwikis.com/), [Sven Dowideit](http://www.home.org.au), [[WillNorris]]. +Most of the redesign, refactoring and new documentation work in Dakar release was done by [Crawford Currie](http://c-dot.co.uk). [Michael Sparks](http://kamaelia.org/Michael.html) provided ideas and proof of concept for several improvements. Other people who gave _large_ amounts of their time and patience to less sexy aspects of the work, such as testing, infrastructure and documentation, are [[AntonAylward]], [[KennethLavrsen]], [[LynnwoodBrown]], [[MichaelDaum]], [Peter Thoeny](http://www.structuredwikis.com/), [[SteffenPoulsen]], [Sven Dowideit](http://www.home.org.au), [[WillNorris]]. @@ -91,12 +91,16 @@ Most of the redesign, refactoring and new documentation work in Dakar release wa - - + + - - + + + + + + diff --git a/TWiki/TWikiMergeDotPm.mdwn b/TWiki/TWikiMergeDotPm.mdwn index f1abc26..7359b7c 100644 --- a/TWiki/TWikiMergeDotPm.mdwn +++ b/TWiki/TWikiMergeDotPm.mdwn @@ -5,14 +5,23 @@ Support for merging strings
    -## [[StaticMethod]] **insDelMerge** `($a,$b,$sep,$session,$info)` +## [[StaticMethod]] **merge2** `($arev,$a,$brev,$b,$sep,$session,$info)` + +- `$arev` - rev for $a (string) +- `$a` - first ('original') string +- `$brev` - rev for $b (string) +- `$b` - second ('new') string +- `$sep` = separator, string RE e.g. '.\*?\\n' for lines +- `$session` - TWiki object +- `$info` - data block passed to plugins merge handler. Conventionally this will identify the source of the text being merged (the source form field, or undef for the body text) Perform a merge of two versions of the same text, using HTML tags to mark conflicts. @@ -22,10 +31,50 @@ Where conflicts exist, they are marked using HTML <del> and <ins> ta Non-conflicting content (insertions from either set) are not marked. -The plugins mergeHandler is called for each merge. +The plugins `mergeHandler` is called for each merge. + +Call it like this: + + $newText = TWiki::Merge::merge2( + $oldrev, $old, $newrev, $new, '.*?\n', $session, $info ); ## [[StaticMethod]] **simpleMerge** `($a,$b,$sep) -> \@arr` -Perform a merge of two versions of the same text, returning and array of strings representing the blocks in the merged context where each string starts with one of "+", "-" or " " depending on whether it is an insertion, a deletion, or just text. Insertions and deletions alway happen in pairs, as text taken in from either version that does not replace text in the other version will simply be accepted. +Perform a merge of two versions of the same text, returning an array of strings representing the blocks in the merged context where each string starts with one of "+", "-" or " " depending on whether it is an insertion, a deletion, or just text. Insertions and deletions alway happen in pairs, as text taken in from either version that does not replace text in the other version will simply be accepted. The granularity of the merge depends on the setting of $sep. For example, if it is `"\\n"`, a line-by-line merge will be done. $sep characters are retained in the outout. + +## [[StaticMethod]] **merge3** `($arev,$a,$brev,$b,$crev,$c,$sep,` + +$session, $info ) + +- `$arev` - rev for common ancestor (id e.g. ver no) +- `$a` - common ancestor +- `$brev` - rev no for first derivative string (id) +- `$b` - first derivative string +- `$crev` - rev no for second derivative string (id) +- `$c` - second derivative string +- `$sep` = separator, string RE e.g. '.\*?\\n' for lines +- `$session` - TWiki object +- `$info` - data block passed to plugins merge handler. Conventionally this will identify the source of the text being merged (the source form field, or undef for the body text) + +Perform a merge of two versions (b and c) of the same text, using HTML <div> tags to mark conflicts. a is the common ancestor. + +The granularity of the merge depends on the setting of $sep. For example, if it is `".*?\\n"`, a line-by-line merge will be done. + +Where conflicts exist, they are labeled using the provided revision numbers. + +The plugins `mergeHandler` is called for each merge. + +Here's a little picture of a 3-way merge: + +a <- ancestor / b c <- revisions \\ / d <- merged result, returned. + +call it like this: + + my ( $ancestorMeta, $ancestorText ) = + $store->readTopic( undef, $webName, $topic, $originalrev ); + $newText = TWiki::Merge::merge3( + $ancestorText, $prevText, $newText, + $originalrev, $rev, "new", + '.*?\n' ); diff --git a/TWiki/TWikiMetaData.mdwn b/TWiki/TWikiMetaData.mdwn index eb394a2..ba79b8e 100644 --- a/TWiki/TWikiMetaData.mdwn +++ b/TWiki/TWikiMetaData.mdwn @@ -45,9 +45,9 @@ _Additional topic data, program-generated or from [[TWikiForms]], is stored in ` > **Example of Format** > > %META:TOPICINFO{version="1.6" date="976762663" author="LastEditorWikiName" format="1.0"}% -> text of the topic +> text of the topic > %META:TOPICMOVED{from="Codev.OldName" to="Codev.NewName" -> by="TopicMoverWikiName" date="976762680"}% +> by="TopicMoverWikiName" date="976762680"}% > %META:TOPICPARENT{name="NavigationByTopicContext"}% > %META:FILEATTACHMENT{name="Sample.txt" version="1.3" ... }% > %META:FILEATTACHMENT{name="Smile.gif" version="1.1" ... }% @@ -260,7 +260,7 @@ When viewing a topic the **Raw Text** link can be clicked to show t Meta Data is rendered with the %META% variable. This is mostly used in the `view`, `preview` and `edit` scripts. -You can render form fields in topic text by using the FORMFIELD variable. Example:%BR% `%FORMFIELD{"TopicClassification"}%` %BR% For details, see [[TWikiVariables#VarFORMFIELD]]. +You can render form fields in topic text by using the FORMFIELD variable. Example:%BR% `%FORMFIELD{"TopicClassification"}%` %BR% For details, see [[VarFORMFIELD]]. Current support covers: diff --git a/TWiki/TWikiMetaDotPm.mdwn b/TWiki/TWikiMetaDotPm.mdwn index 665a85e..7436da1 100644 --- a/TWiki/TWikiMetaDotPm.mdwn +++ b/TWiki/TWikiMetaDotPm.mdwn @@ -29,7 +29,6 @@ Meta-data objects are created by the Store engine when topics are read. They are
  • ObjectMethod remove ($type,$key)
  • ObjectMethod copyFrom ($otherMeta,$type,$nameFilter)
  • ObjectMethod count ($type) -> $integer
  • -
  • ObjectMethod addTOPICINFO ($rev,$time,$user)
  • ObjectMethod getRevisionInfo ($fromrev) -> ($date,$author,$rev,$comment)
  • ObjectMethod merge ($otherMeta,$formDef)
  • ObjectMethod stringify ($types) -> $string
  • @@ -113,14 +112,6 @@ SMELL: That spec absolutely _STINKS_ !! SMELL: this is a shallow copy Return the number of entries of the given type that are in this meta set -## [[ObjectMethod]] **addTOPICINFO** `($rev,$time,$user)` - -- `$rev` - the revision number -- `$time` - the time stamp -- `$user` - the user object - -Add TOPICINFO type data to the object, as specified by the parameters. - ## [[ObjectMethod]] **getRevisionInfo** `($fromrev) -> ($date,$author,$rev,$comment)` Try and get revision info from the meta information, or, if it is not present, kick down to the Store module for the same information. diff --git a/TWiki/TWikiPlugins.mdwn b/TWiki/TWikiPlugins.mdwn index 50e4d1a..46e6c98 100644 --- a/TWiki/TWikiPlugins.mdwn +++ b/TWiki/TWikiPlugins.mdwn @@ -86,7 +86,7 @@ Each Plugin has a standard release topic, located in the TWiki:Plugins web at TW The recommended approach to testing new Plugins before making them public is to create a second local TWiki installation, and test the Plugin there. You can allow selected users access to the test area. Once you are satisifed that it won't compromise your main installation, you can install it there as well. -[[InstalledPlugins]] shows which Plugins are: 1) installed, 2) loading properly, and 3) what TWiki:Codev.PluginHandlers they invoke. Any failures are shown in the Errors section. The [[%FAILEDPLUGINS%|Main/TWikiVariables#VarFAILEDPLUGINS]] variable can be used to debug failures. You may also want to check your webserver error log and the various TWiki log files. +[[InstalledPlugins]] shows which Plugins are: 1) installed, 2) loading properly, and 3) what TWiki:Codev.PluginHandlers they invoke. Any failures are shown in the Errors section. The [[%FAILEDPLUGINS%|Main/VarFAILEDPLUGINS]] variable can be used to debug failures. You may also want to check your webserver error log and the various TWiki log files. ### Some Notes on Plugin Performance @@ -273,7 +273,7 @@ To eliminate the incompatibility problems bound to arise from active open Plugin - The Plugin initialization code does not register a Plugin that returns FALSE (or that has no `initPlugin` handler). - `$TWiki::Plugins::VERSION` in the `TWiki::Plugins` module contains the TWiki Plugin API version, currently **1\.11**. - - You can also use the [[%PLUGINVERSION{}%|Main/TWikiVariables#VarPLUGINVERSION]] variable to query the Plugin API version or the version of installed Plugins. + - You can also use the [[%PLUGINVERSION{}%|Main/VarPLUGINVERSION]] variable to query the Plugin API version or the version of installed Plugins. ### Security diff --git a/TWiki/TWikiPreferences.mdwn b/TWiki/TWikiPreferences.mdwn index fa9797a..c0d6389 100644 --- a/TWiki/TWikiPreferences.mdwn +++ b/TWiki/TWikiPreferences.mdwn @@ -97,7 +97,7 @@

      -
    • Exclude web from a web="all" search: (Set to on for hidden webs; is overwritten by web preferences)
        +
      • Exclude web from a web="all" search: (Set to on for hidden webs; is overwritten by web preferences) Note it is much better to use [[Main/TWikiAccessControls]] in individual webs to control who can and can't view the contents of a web. NOSEARCHALL is retained for compatibility, but you should avoid using it.
        • Set NOSEARCHALL =
      • @@ -400,7 +400,7 @@ ### Legacy support - Support for legacy "EDITTOPIC", used to be hard-coded, now replaced by TMPL:P conditional instantiation - - Set EDITURL = + - Set EDITURL = - Set EDITTOPIC = [Edit](%EDITURL% Edit Topic - deprecated usage - please see release notes) ## Plugins Settings diff --git a/TWiki/TWikiPrefsDotPm.mdwn b/TWiki/TWikiPrefsDotPm.mdwn index e266238..5500b1d 100644 --- a/TWiki/TWikiPrefsDotPm.mdwn +++ b/TWiki/TWikiPrefsDotPm.mdwn @@ -80,7 +80,7 @@ Intended for use in protections mechanisms, where the order doesn't match the pr ## getTextPreferencesValue( $key, $text, $web, $topic ) -> $value -Get a preference value from the settings in the text. The parsed values are cached against the web, topic. +Get a preference value from the settings in the text. The values are **not** cached. ## [[ObjectMethod]] \*getWebPreferencesValue `($key,$web) -> $value` diff --git a/TWiki/TWikiRegistration.mdwn b/TWiki/TWikiRegistration.mdwn index d2eb739..8394afc 100644 --- a/TWiki/TWikiRegistration.mdwn +++ b/TWiki/TWikiRegistration.mdwn @@ -2,7 +2,7 @@ To edit pages on this [[TWikiSite]], you must have a registered user name and password. -- %H% **Note:** Registered users can [[ChangePasswords]] and [[ResetPasswords]]. +%H% **Note:** Registered users can [[change|TWiki/ChangePassword]] and [[reset|TWiki/ResetPassword]] their passwords. To register as a new user, simply fill out this form: @@ -64,6 +64,7 @@ To register as a new user, simply fill out this form: + @@ -199,7 +200,7 @@ To register as a new user, simply fill out this form:
    - +
    [[TWiki:Main/AndreUlrich]]
    Portuguese translation [[TWiki:Main/AntonioTerceiro]], [[TWiki:Main/CarlinhosCecconi]] Italian translation [[TWiki:Main/MassimoMancini]]
    Spanish translation [[TWiki:Main/WillNorris]], [[TWiki:Main/MiguelABayona]] Portuguese translation [[TWiki:Main/AntonioTerceiro]], [[TWiki:Main/CarlinhosCecconi]]
    Spanish translation [[TWiki:Main/WillNorris]], [[TWiki:Main/MiguelABayona]]
    New features for users Fields marked ** are required
       
    diff --git a/TWiki/TWikiScripts.mdwn b/TWiki/TWikiScripts.mdwn index 98173b5..add0ffa 100644 --- a/TWiki/TWikiScripts.mdwn +++ b/TWiki/TWikiScripts.mdwn @@ -499,7 +499,7 @@ Renders the differences between version of a TWiki topic type - history, diff, last} history diff, version to version, last version to previous + {history, diff, last} history diff, version to version, last version to previous diff @@ -794,7 +794,7 @@ CGI gateway to the `%SEARCH%` functionality driven by the following CGI paramete web="Name"
    web="Main, Know"
    web="all" - Comma-separated list of webs to search. The special word all means all webs that doe not have the NOSEARCHALL variable set to on in their [[Main/WebPreferences]]. You can specifically exclude webs from an all search using a minus sign - for example, web="all,-Secretweb". + Comma-separated list of webs to search. See [[Main/TWikiVariables#VarSEARCH]] for more details. Current web diff --git a/TWiki/TWikiSiteTools.mdwn b/TWiki/TWikiSiteTools.mdwn index 613c0f6..985f0c1 100644 --- a/TWiki/TWikiSiteTools.mdwn +++ b/TWiki/TWikiSiteTools.mdwn @@ -104,7 +104,7 @@ TWiki generates monthly log files which are used by the statistics script - The file name is `log.txt` - Example path name: `twiki/logs/log201006.txt` - Each access gets logged as: %BR% `|
    @@ -38,6 +40,12 @@ To use a variable type its name. For example, - Variables are expanded relative to the topic they are _used_ in, not the topic they are _defined_ in - Type `%ALLVARIABLES%` to get a full listing of all variables defined for a particular topic +## Variable Names + +Variable names must start with a letter. The following characters can be letters, numbers and the underscore '\_'. You can use both upper-case and lower-case letters and you can mix the characteres. E.g. `%MYVAR%`, `%MyVar%`, `%My2ndVar%`, and `%My_Var%` are all valid variable names. Variables are case sensitive. `%MyVAR%` and `%MYVAR%` are not the same variable. + +By convention all settings, predefined variables and variables used by plugins are always UPPER-CASE. + ## Preferences Variables @@ -68,8 +76,8 @@ Spaces between the = sign and the value will be ignored. You can split a value o > **Example:** > -> * Set VARIABLENAME = value starts here -> and continues here +> * Set VARIABLENAME = value starts here +> and continues here Whatever you include in your Variable will be expanded on display, exactly as if it had been entered directly. @@ -132,4 +140,8 @@ Most predefined variables return values that were either set in the configuratio This version of TWiki - TWiki-4.1.2, Sat, 03 Mar 2007, build 13046 - predefines the following variables: +# TWiki Installation Error + +Incorrect format of searchformat template (missing sections? There should be 4 %SPLIT% tags) + **_Related Topics:_** [[UserDocumentationCategory]] diff --git a/TWiki/TextFormattingFAQ.mdwn b/TWiki/TextFormattingFAQ.mdwn index c768aa1..ce2f3fa 100644 --- a/TWiki/TextFormattingFAQ.mdwn +++ b/TWiki/TextFormattingFAQ.mdwn @@ -77,9 +77,9 @@ TWiki interprets text as HTML, so you can use the `preformatted` HTML option to This text will keep its format as it is: - Unit Price Qty Cost + Unit Price Qty Cost ------- ------ --- ------ - aaa 12.00 3 36.00 + aaa 12.00 3 36.00 The `pre` tag is standard HTML; `verbatim` is a special TWiki tag that forces text to fixed font mode, and also prevents other tags and TWiki shortcuts from being expanded. @@ -120,11 +120,11 @@ This is a manual process using HTML commands. - + - + - +
    Head A Head B Head A Head B
    Cell A2 Cell B2 Cell A2 Cell B2
    Cell A3 Cell B3 Cell A3 Cell B3
    diff --git a/TWiki/TextFormattingRules.mdwn b/TWiki/TextFormattingRules.mdwn index a3ad3e6..d18613f 100644 --- a/TWiki/TextFormattingRules.mdwn +++ b/TWiki/TextFormattingRules.mdwn @@ -27,392 +27,8 @@ Working in TWiki is as easy as typing in text. You don't need to know HTML, thou ## TWiki Editing Shorthand - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Formatting Command: You write: You get:
    Paragraphs: %BR% Blank lines will create new paragraphs.
    -1st paragraph
    -
    -2nd paragraph
    -
    1st paragraph

    2nd paragraph

    -
    Headings: %BR% Three or more dashes at the beginning of a line, followed by plus signs and the heading text. One plus creates a top level heading, two pluses a second level heading, etc. The maximum heading depth is 6.

    You can create a table of contents with the [[Main/TWikiVariables#VarTOC]] variable. If you want to exclude a heading from the TOC, put !! after the ---+.

    -

    %X% Empty headings are allowed, but won't appear in the table of contents.

    -
    ----++ Sushi
    ----+++ Maguro
    ----+++!! Not in TOC
    -
    -

    Sushi

    -

    Maguro

    -

    Not in TOC

    -
    Bold Text: %BR% Words get shown in bold by enclosing them in * asterisks.
    -*Bold*
    -
    Bold
    Italic Text: %BR% Words get shown in italic by enclosing them in _ underscores.
    -_Italic_
    -
    Italic
    Bold Italic: %BR% Words get shown in bold italic by enclosing them in __ double-underscores.
    -__Bold italic__
    -
    Bold italic
    Fixed Font: %BR% Words get shown in fixed font by enclosing them in = equal signs.
    -=Fixed font=
    -
    Fixed font

    -

    -
    Bold Fixed Font: %BR% Words get shown in bold fixed font by enclosing them in double equal signs.
    -==Bold fixed==
    -
    Bold fixed
    %T% You can follow the closing bold, italic, or other (* _ __ = ==) indicator with normal punctuation, such as commas and full stops.

    %X% Make sure there is no space between the text and the indicators.

    -
    -_This works_,
    -_this does not _
    -
    This works,%BR% _this does not _
    Verbatim (Literal) Text: %BR% Surround code excerpts and other formatted text with <verbatim> and </verbatim> tags.%BR% %T% verbatim tags disable HTML code. Use <pre> and </pre> tags instead if you want the HTML code within the tags to be interpreted.%BR% %X% NOTE: Preferences variables (* Set NAME = value) are set within verbatim tags.
    -<verbatim>
    -class CatAnimal {
    -  void purr() {
    -    <code here>
    -  }
    -}
    -</verbatim>
    -
    -class CatAnimal {
    -  void purr() {
    -    <code here>
    -  }
    -}
    -
    Separator (Horizontal Rule): %BR% Three or more three dashes at the beginning of a line..
    --------
    -
    -
    -
    Bulleted List: %BR% Multiple of three spaces, an asterisk, and another space.%BR% %H% For all the list types, you can break a list item over several lines by indenting lines after the first one by at least 3 spaces.
    -   * level 1
    -      * level 2
    -   * back on 1
    -   * A bullet
    -     broken over
    -     three lines
    -   * last bullet
    -
    -
      -
    • level 1
        -
      • level 2
      • -
      -
    • -
    • back on 1
    • -
    • A bullet broken over three lines
    • -
    • last bullet
    • -
    -
    Numbered List: %BR% Multiple of three spaces, a type character, a dot, and another space. Several types are available besides a number: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    TypeGenerated StyleSample Sequence
    1. Arabic numerals 1, 2, 3, 4...
    A. Uppercase letters A, B, C, D...
    a. Lowercase letters a, b, c, d...
    I. Uppercase Roman Numerals I, II, III, IV...
    i. Lowercase Roman Numerals i, ii, iii, iv...
    -
    -   1. Sushi
    -   1. Dim Sum
    -   1. Fondue
    -
    -   A. Sushi
    -   A. Dim Sum
    -   A. Fondue
    -
    -   i. Sushi
    -   i. Dim Sum
    -   i. Fondue
    -
    -
      -
    1. Sushi
    2. -
    3. Dim Sum
    4. -
    5. Fondue
    6. -
    -

    -

    -
      -
    1. Sushi
    2. -
    3. Dim Sum
    4. -
    5. Fondue
    6. -
    -

    -

    -
      -
    1. Sushi
    2. -
    3. Dim Sum
    4. -
    5. Fondue
    6. -
    -
    Definition List: %BR% Three spaces, a dollar sign, the term, a colon, a space, followed by the definition.
    -   $ Sushi: Japan
    -   $ Dim Sum: S.F.
    -
    -
    -
    Sushi
    -
    Japan
    -
    Dim Sum
    -
    S.F.
    -
    -
    Table: %BR% Each row of the table is a line containing of one or more cells. Each cell starts and ends with a vertical bar '|'. Any spaces at the beginning of a line are ignored.
      -
    • | *bold* | header cell with text in asterisks
    • -
    • |   center-aligned   | cell with at least two, and equal number of spaces on either side
    • -
    • |      right-aligned | cell with more spaces on the left
    • -
    • | 2 colspan || and multi-span columns with multiple |'s right next to each other
    • -
    • |^| cell with caret indicating follow-up row of multi-span rows
    • -
    • You can split rows over multiple lines by putting a backslash '\' at the end of each line
    • -
    • Contents of table cells wrap automatically as determined by the browser
    • -
    %T% The [[TWiki/TablePlugin]] provides the |^| multiple-span row functionality and additional rendering features
    -| *L* | *C* | *R* |
    -| A2 |  B2  |  C2 |
    -| A3 |  B3  |  C3 |
    -| multi span |||
    -| A5-7 |  5  |  5 |
    -|^| six | six |
    -|^| seven | seven |
    -| split\
    -  | over\
    -  | 3 lines |
    -| A9 |  B9  |  C9 |
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    LCR
    A2 B2 C2
    A3 B3 C3
    multi span
    A5-7 5 5
    six six
    seven seven
    split over 3 lines
    A9 B9 C9
    -
    WikiWord Links: %BR% CapitalizedWordsStuckTogether (or [[Main/WikiWords]]) will produce a link automatically if preceded by whitespace or parenthesis. %BR% %T% If you want to link to a topic in a different web write Otherweb.TopicName. %BR% %H% The link label excludes the name of the web, e.g. only the topic name is shown. As an exception, the name of the web is shown for the WebHome topic.

    It's generally a good idea to use the [[Main/TWikiVariables]] %TWIKIWEB% and %MAINWEB% instead of TWiki and Main.

    -
    -WebStatistics
    -
    -Sandbox.WebNotify
    -
    -Sandbox.WebHome
    -
    [[Main/WebStatistics]]

    [[Sandbox/WebNotify]]

    -

    [[Sandbox/WebHome]]

    -
    Anchors: %BR% You can define a reference inside a TWiki topic (called an anchor name) and link to that. To define an anchor write #AnchorName at the beginning of a line. The anchor name must be a [[Main/WikiWord]]. To link to an anchor name use the [[MyTopic#MyAnchor]] syntax. You can omit the topic name if you want to link within the same topic.
    -[[WikiWord#NotThere]]
    -
    -[[#MyAnchor][Jump]]
    -
    -#MyAnchor To here
    -
    [[Main/WikiWord#NotThere]]

    [[Main/WebHome#MyAnchor]]

    -

    To here

    -
    Forced Links: %BR% You can create a forced internal link by enclosing words in double square brackets. %BR% Text within the brackets may contain optional spaces; the topic name is formed by capitalizing the initial letter and by removing the spaces; for example, [[text formatting FAQ]] links to topic [[Main/TextFormattingFAQ]]. You can also refer to a different web and use anchors. %BR% %T% To "escape" double square brackets that would otherwise make a link, prefix the leading left square bracket with an exclamation point.
    -[[wiki syntax]]
    -
    -[[Main.TWiki users]]
    -
    -escaped:
    -![[wiki syntax]]
    -
    [[Main/WikiSyntax]]

    [[Main/TWikiUsers]]

    -

    escaped: [[wiki syntax]]

    -
    Specific Links: %BR% You can create a link where you specify the link text and the URL separately using nested square brackets [[reference][text]]. Internal link references (e.g. [[Main/WikiSyntax]]) and URLs (e.g. http://TWiki.org/) are both supported. The rules described under Forced Links apply for internal link references. %BR% %T% Anchor names can be added as well, to create a link to a specific place in a topic.
    -[[WikiSyntax][wiki syntax]]
    -
    -[[http://gnu.org][GNU]]
    -
    [[Main/WikiSyntax]]

    GNU

    -
    Prevent a Link: %BR% Prevent a [[Main/WikiWord]] from being linked by prepending it with an exclamation point.
    -!SunOS
    -
    SunOS
    Disable Links: %BR% You can disable automatic linking of [[Main/WikiWords]] by surrounding text with <noautolink> and </noautolink> tags.%BR% %H% It is possible to turn off all auto-linking with a NOAUTOLINK preferences setting.
    - <noautolink>
    - RedHat &
    - SuSE
    - </noautolink>
    -
    RedHat & SuSE
    Mailto Links: %BR% E-mail addresses are linked automatically. To create e-mail links that have more descriptive link text, specify subject lines or message bodies, or omit the e-mail address, you can write [[mailto:user@domain][descriptive text]].
    -a@b.com
    -
    -[[mailto:a@b.com]\
    -[Mail]]
    -
    -[[mailto:?subject=\
    -Hi][Hi]]
    -
    a@b.com

    Mail

    -

    Hi

    -
    - ## Using HTML -You can use just about any HTML tag without a problem. You can add HTML if there is no TWiki equivalent, for example, write `deleted text` to get deleted text. - -%X% There are a few usability and technical considerations to keep in mind: - -- On collaboration pages, it's better **not** to use HTML, but to use [[TWiki shorthand|Main/WebHome#TWikiShorthand]] instead - this keeps the text uncluttered and easy to edit. -- If you use HTML use [XHTML 1.0 Transitional](http://www.w3.org/TR/xhtml1/) syntax. -- %X% Script tags may be filtered out, at the discretion of your TWiki administrator. - -Recommendations when pasting HTML from other sources: - -- Copy only text between `` and `` tags. -- Remove all empty lines. TWiki inserts `

    ` paragraph tags on empty lines, which causes problems if done between HTML tags that do not allow paragraph tags, like for example between table tags. -- Remove leading spaces. TWiki might interpret some text as lists. -- Do not span a tag over more than one line. TWiki requires that the opening and closing angle brackets - **<...>** - of an HTML tag are on the same line, or the tag will be broken. -- In your HTML editing program, save without hard line breaks on text wrap. - -%T% TWiki converts shorthand notation to HTML for display. To copy a fully marked-up page, simply view the source in your browser and save the contents. If you need to save HTML frequently, you may want to check out TWiki:Plugins/PublishAddOn. - ### Script tags You can use HTML `