From 6d1289622f713dd3653ee472dd10fd7a46359171 Mon Sep 17 00:00:00 2001 From: TWikiContributor Date: Mon, 30 Mar 2009 09:18:27 +0000 Subject: [PATCH] buildrelease --- Main/TWikiAdminUser.mdwn | 2 +- TWiki/BehaviourContrib.mdwn | 2 +- TWiki/CommentPlugin.mdwn | 2 +- TWiki/EmptyPlugin.mdwn | 2 +- TWiki/FormattedSearch.mdwn | 46 +- TWiki/HeadlinesPlugin.mdwn | 348 +++++ TWiki/IncludeTopicsAndWebPages.mdwn | 26 + TWiki/InterwikiPlugin.mdwn | 10 +- TWiki/JSCalendarContrib.mdwn | 2 +- TWiki/NewUserTemplate.mdwn | 9 +- TWiki/PreferencesPlugin.mdwn | 2 +- TWiki/SearchHelp.mdwn | 4 +- TWiki/SourceCode.mdwn | 4 +- TWiki/SpreadSheetPlugin.mdwn | 119 +- TWiki/TWikiAccessControl.mdwn | 16 + TWiki/TWikiDocGraphics.mdwn | 96 +- TWiki/TWikiHistory.mdwn | 89 +- TWiki/TWikiInstallationGuide.mdwn | 34 +- TWiki/TWikiNetSkin.mdwn | 125 ++ TWiki/TWikiNetSkinColorSettings.mdwn | 1604 ++++++++++++++++++++++ TWiki/TWikiNetSkinPlugin.mdwn | 91 ++ TWiki/TWikiNetSkinWebCreateNewTopicTemplate.mdwn | 3 + TWiki/TWikiPreferences.mdwn | 6 +- TWiki/TWikiPreferencesForm.mdwn | 2 +- TWiki/TWikiReleaseNotes04x01.mdwn | 4 +- TWiki/TWikiReleaseNotes04x02.mdwn | 223 +-- TWiki/TWikiReleaseNotes04x03.mdwn | 291 ++++ TWiki/TWikiSystemRequirements.mdwn | 10 +- TWiki/TWikiTemplates.mdwn | 59 +- TWiki/TinyMCEPlugin.mdwn | 2 +- TWiki/TwistyContrib.mdwn | 2 +- TWiki/VarENCODE.mdwn | 11 +- TWiki/VarENDSECTION.mdwn | 4 +- TWiki/VarINCLUDE.mdwn | 1 + TWiki/VarSEARCH.mdwn | 2 +- TWiki/VarSTARTSECTION.mdwn | 14 +- TWiki/VarURLPARAM.mdwn | 20 +- TWiki/WebChanges.mdwn | 2 +- TWiki/WebHome.mdwn | 4 +- TWiki/WysiwygPlugin.mdwn | 2 +- Trash/TrashAttachment.mdwn | 1 + Trash/WebAtom.mdwn | 1 + Trash/WebChanges.mdwn | 0 Trash/WebHome.mdwn | 21 + Trash/WebIndex.mdwn | 0 Trash/WebLeftBar.mdwn | 6 + Trash/WebNotify.mdwn | 5 + Trash/WebPreferences.mdwn | 26 + Trash/WebRss.mdwn | 1 + Trash/WebSearch.mdwn | 0 Trash/WebSearchAdvanced.mdwn | 1 + Trash/WebStatistics.mdwn | 32 + Trash/WebTopicList.mdwn | 0 _default/WebAtom.mdwn | 1 + _default/WebChanges.mdwn | 0 _default/WebCreateNewTopic.mdwn | 1 + _default/WebHome.mdwn | 21 + _default/WebIndex.mdwn | 0 _default/WebLeftBar.mdwn | 11 + _default/WebNotify.mdwn | 5 + _default/WebPreferences.mdwn | 63 + _default/WebRss.mdwn | 1 + _default/WebSearch.mdwn | 0 _default/WebSearchAdvanced.mdwn | 1 + _default/WebStatistics.mdwn | 32 + _default/WebTopicList.mdwn | 0 _empty/WebPreferences.mdwn | 0 67 files changed, 3211 insertions(+), 314 deletions(-) create mode 100644 TWiki/HeadlinesPlugin.mdwn create mode 100644 TWiki/TWikiNetSkin.mdwn create mode 100644 TWiki/TWikiNetSkinColorSettings.mdwn create mode 100644 TWiki/TWikiNetSkinPlugin.mdwn create mode 100644 TWiki/TWikiNetSkinWebCreateNewTopicTemplate.mdwn create mode 100644 TWiki/TWikiReleaseNotes04x03.mdwn create mode 100644 Trash/TrashAttachment.mdwn create mode 100644 Trash/WebAtom.mdwn create mode 100644 Trash/WebChanges.mdwn create mode 100644 Trash/WebHome.mdwn create mode 100644 Trash/WebIndex.mdwn create mode 100644 Trash/WebLeftBar.mdwn create mode 100644 Trash/WebNotify.mdwn create mode 100644 Trash/WebPreferences.mdwn create mode 100644 Trash/WebRss.mdwn create mode 100644 Trash/WebSearch.mdwn create mode 100644 Trash/WebSearchAdvanced.mdwn create mode 100644 Trash/WebStatistics.mdwn create mode 100644 Trash/WebTopicList.mdwn create mode 100644 _default/WebAtom.mdwn create mode 100644 _default/WebChanges.mdwn create mode 100644 _default/WebCreateNewTopic.mdwn create mode 100644 _default/WebHome.mdwn create mode 100644 _default/WebIndex.mdwn create mode 100644 _default/WebLeftBar.mdwn create mode 100644 _default/WebNotify.mdwn create mode 100644 _default/WebPreferences.mdwn create mode 100644 _default/WebRss.mdwn create mode 100644 _default/WebSearch.mdwn create mode 100644 _default/WebSearchAdvanced.mdwn create mode 100644 _default/WebStatistics.mdwn create mode 100644 _default/WebTopicList.mdwn create mode 100644 _empty/WebPreferences.mdwn diff --git a/Main/TWikiAdminUser.mdwn b/Main/TWikiAdminUser.mdwn index d8a27fe..015e239 100644 --- a/Main/TWikiAdminUser.mdwn +++ b/Main/TWikiAdminUser.mdwn @@ -19,6 +19,6 @@ This means it is no longer necessary to add yourself to the [[TWikiAdminGroup]], - a configure password (otherwise the Admin login is automatically disabled.) - If your TWiki is configured to use ApacheLoginManager, you will need to log in as a valid user first. -**_Related topics:_** [[TWikiUsers]], [[TWikiAdminGroup]], [[TWikiGroups]], %SYSTEMWEB%.TWikiAccessControl +**_Related topics:_** [[TWikiUsers]], [[TWikiAdminGroup]], [[TWikiGroups]], [[TWikiAccessControl]] ---- diff --git a/TWiki/BehaviourContrib.mdwn b/TWiki/BehaviourContrib.mdwn index f244206..0e40bb0 100644 --- a/TWiki/BehaviourContrib.mdwn +++ b/TWiki/BehaviourContrib.mdwn @@ -242,7 +242,7 @@ If we have a 'normal' link to TWiki Web hometopic: [[TWiki Web Home|TWiki/WebHom > > > Version: -> 15675 (06 Dec 2008) +> 15675 (30 Mar 2009) > > > Dependencies: diff --git a/TWiki/CommentPlugin.mdwn b/TWiki/CommentPlugin.mdwn index d82b4f5..7dd1fe4 100644 --- a/TWiki/CommentPlugin.mdwn +++ b/TWiki/CommentPlugin.mdwn @@ -401,7 +401,7 @@ Another great TWiki extension from the [![](http://www.dementia.org/twiki//view/ Plugin Version: - 03 Aug 2008 17302 (06 Dec 2008) + 03 Aug 2008 17791 (30 Mar 2009) Change History: diff --git a/TWiki/EmptyPlugin.mdwn b/TWiki/EmptyPlugin.mdwn index 0fb3eab..07fe02c 100644 --- a/TWiki/EmptyPlugin.mdwn +++ b/TWiki/EmptyPlugin.mdwn @@ -46,7 +46,7 @@ Plugin settings are stored as preferences variables. To reference a plugin setti Plugin Version: - 15942 (06 Dec 2008) + 15942 (30 Mar 2009) Change History: diff --git a/TWiki/FormattedSearch.mdwn b/TWiki/FormattedSearch.mdwn index ac996af..7eb1297 100644 --- a/TWiki/FormattedSearch.mdwn +++ b/TWiki/FormattedSearch.mdwn @@ -9,7 +9,8 @@ The default output format of a [[%SEARCH{...}%|Main/VarSEARCH]] is
  • TWiki Formatted Search @@ -60,4 +61,29 @@ The result would be - I like apples better than oranges. +### 5. Alert Box using Parameterized Include + +Create a topic called AlertBox with the following content: + + ----- + %STARTINCLUDE% +
    + + + + + + + + + +
    %TITLE%
      %MESSAGE%
    +
    + %STOPINCLUDE% + ----- + +Now you can write `%INCLUDE{ "AlertBox" TITLE="Alert" MESSAGE="This a test message" }%` to get this: + +The `TITLE=""` and `MESSAGE=""` parameters are passed into the include. Using this approach, you can create a library of boxes in the %USERSWEB% web, such as %USERSWEB%.NoteBox, %USERSWEB%.InfoBox. + **_Related Topics:_** [[VarINCLUDE]], [[UserDocumentationCategory]] diff --git a/TWiki/InterwikiPlugin.mdwn b/TWiki/InterwikiPlugin.mdwn index 281143f..3ff8d67 100644 --- a/TWiki/InterwikiPlugin.mdwn +++ b/TWiki/InterwikiPlugin.mdwn @@ -91,7 +91,7 @@ Plugin settings are stored as Preferences variables. To reference a plugin setti Copyright: - © 2001-2007, Andrea Sterbini, Peter Thoeny (TWIKI.NET), [[TWiki/TWikiContributor]] + © 2001-2009, Andrea Sterbini, Peter Thoeny (TWIKI.NET), [[TWiki/TWikiContributor]] License: @@ -99,13 +99,17 @@ Plugin settings are stored as Preferences variables. To reference a plugin setti Plugin Version: - 03 Aug 2008 17387 (06 Dec 2008) + 28 Feb 2009 17852 (30 Mar 2009) Change History:   + 28 Feb 2009: + 17851 - TWikibug:Item5025 - Added = and & to page regex, allowing links such as Site:ID=1234&sel=56 + + 03 Aug 2008: TWiki 4.2.1 release version @@ -217,4 +221,4 @@ Plugin settings are stored as Preferences variables. To reference a plugin setti **_Related Topics:_** [[TWikiPlugins]], [[DeveloperDocumentationCategory]], [[AdminDocumentationCategory]], [[TWikiPreferences]], [[InterWikis]] --- TWiki:Main.PeterThoeny - 25 Nov 2007 +-- TWiki:Main.PeterThoeny - 28 Feb 2009 diff --git a/TWiki/JSCalendarContrib.mdwn b/TWiki/JSCalendarContrib.mdwn index 6327059..cbd88cc 100644 --- a/TWiki/JSCalendarContrib.mdwn +++ b/TWiki/JSCalendarContrib.mdwn @@ -176,7 +176,7 @@ Another great TWiki extension from the [![](http://www.dementia.org/twiki//view/ Version: - 17492 (06 Dec 2008) of the Mishoo calendar + 17492 (30 Mar 2009) of the Mishoo calendar Copyright ©: diff --git a/TWiki/NewUserTemplate.mdwn b/TWiki/NewUserTemplate.mdwn index ab65712..83f1b2b 100644 --- a/TWiki/NewUserTemplate.mdwn +++ b/TWiki/NewUserTemplate.mdwn @@ -8,7 +8,7 @@ - [[WelcomeGuest]] - starting points on TWiki - [[TWikiUsersGuide]] - complete TWiki documentation, Quick Start to Reference - [[Sandbox|Sandbox/WebHome]] - try out TWiki on your own -- Sandbox.%TOPIC%Sandbox - just for me +- [[%TOPIC%Sandbox|Sandbox/TOPICSandbox]] - just for me - - @@ -44,11 +44,6 @@ Notes to TWiki Administrator: Anything inside this "templateonly" section will not be copied to the home topic of the new user. It is a resource for the administrator to tailor the users home topic. -On public TWiki's on the Internet user topics are often subject to spam so you may want to limit editing to the user himself. You can do this by moving these two lines to the Personal Preferences section above. Remove the small # in front of the "Set". - -- Write protect your home page: (set it to your [[WikiName]]) - - #Set ALLOWTOPICCHANGE = Main.admin - The default topic text above is for English speaking users. If you have a multilingual wiki community you can replace the "My Links", "Personal Preferences" and "Related Topics" sections above with the localized text below. Text enclosed in %MAKETEXT will be shown in the language selected by the user. Please note that the %MAKETEXT can be quite intimidating to new users. Consider translating above text to your own language if your community uses a non-English language. (Remove all text from `%STARTSECTION{type="templateonly"}%` to `%ENDSECTION{type="templateonly"}%` when you are done) Text for multilingual wiki community, copy from here to %ENDSECTION\{type="templateonly"\}% @@ -59,7 +54,7 @@ Text for multilingual wiki community, copy from here to %ENDSECTION\{type="templ - [[WelcomeGuest]] - starting points on TWiki - [[TWikiUsersGuide]] - complete TWiki documentation, Quick Start to Reference - [[Sandbox|Sandbox/WebHome]] - try out TWiki on your own -- Sandbox.%TOPIC%Sandbox - just for me +- [[%TOPIC%Sandbox|Sandbox/TOPICSandbox]] - just for me - - diff --git a/TWiki/PreferencesPlugin.mdwn b/TWiki/PreferencesPlugin.mdwn index 6694abe..b9ae4d3 100644 --- a/TWiki/PreferencesPlugin.mdwn +++ b/TWiki/PreferencesPlugin.mdwn @@ -69,7 +69,7 @@ Like many other TWiki extensions, this module is shipped with a fully automatic Plugin Version: - 15487 (06 Dec 2008) + 17889 (30 Mar 2009) Change History: diff --git a/TWiki/SearchHelp.mdwn b/TWiki/SearchHelp.mdwn index d97f95f..5682284 100644 --- a/TWiki/SearchHelp.mdwn +++ b/TWiki/SearchHelp.mdwn @@ -41,8 +41,8 @@ You can embed a nicely [[formatted search|Main/FormattedSearch]] in a topic by u [[TWikiPreferences]] defines these search preferences: -- `SEARCHDEFAULTTTYPE`: Default search type for search forms which calls the `search` script - - Currently `%SEARCHDEFAULTTTYPE%` +- `SEARCHDEFAULTTYPE`: Default search type for search forms which calls the `search` script + - Currently `%SEARCHDEFAULTTYPE%` - `SEARCHVARDEFAULTTYPE`: Default search type for `%SEARCH{}` variable - Currenty `%SEARCHVARDEFAULTTYPE%` - `SEARCHSTOPWORDS`: List of stop words (common words and characters to exclude from a keyword search) diff --git a/TWiki/SourceCode.mdwn b/TWiki/SourceCode.mdwn index 2c13687..1358236 100644 --- a/TWiki/SourceCode.mdwn +++ b/TWiki/SourceCode.mdwn @@ -607,7 +607,7 @@ Plugins may throw TWiki::OopsException. For example: This module implements all the search functionality. - This package has smell factor of *14* + This package has smell factor of *13* ---++ [[TWikiStoreDotPm][TWiki::Store]] @@ -986,4 +986,4 @@ Plugins may throw TWiki::OopsException. For example: This package doesn't smell - There were a total of *200* smells + There were a total of *199* smells diff --git a/TWiki/SpreadSheetPlugin.mdwn b/TWiki/SpreadSheetPlugin.mdwn index 42a8d25..ac858b3 100644 --- a/TWiki/SpreadSheetPlugin.mdwn +++ b/TWiki/SpreadSheetPlugin.mdwn @@ -1,6 +1,6 @@ # TWiki Spreadsheet Plugin -This Plugin adds spreadsheet capabilities to %WIKITOOLNAME% topics. Formulae like **%CALC\{"$INT(7/3)"\}%** are evaluated at page view time. They can be placed in table cells and outside of tables. In other words, this Plugin provides general formula evaluation capability, not just classic spreadsheet functions. +This plugin adds spreadsheet capabilities to TWiki topics. Formulae like **%CALC\{"$INT(7/3)"\}%** are evaluated at page view time. They can be placed in table cells and outside of tables. In other words, this plugin provides general formula evaluation capability, not just classic spreadsheet functions. @@ -48,7 +48,7 @@ This Plugin adds spreadsheet capabilities to %WIKITOOLNAME% topics. Formulae lik - +
    The formula next to "Total" is %CALC{"$SUM( $ABOVE() )"}%.
    (you see the formula instead of the sum in case the Plugin is not installed or not enabled.)     		The formula next to "Total" is %CALC{"$SUM( $ABOVE() )"}%.
    (you see the formula instead of the sum in case the plugin is not installed or not enabled.)
    @@ -66,6 +66,7 @@ This Plugin adds spreadsheet capabilities to %WIKITOOLNAME% topics. Formulae lik
  • COUNTITEMS( list ) -- count individual items in a list
  • COUNTSTR( list, str ) -- count the number of cells in a list equal to a given string
  • DEF( list ) -- find first non-empty list item or cell
    • +
  • EMPTY( text ) -- test for empty text
  • EVAL( formula ) -- evaluate a simple mathematical formula
  • EVEN( num ) -- test for even number
  • EXACT( text1, text2 ) -- compare two text strings
    • @@ -79,8 +80,10 @@ This Plugin adds spreadsheet capabilities to %WIKITOOLNAME% topics. Formulae lik
  • FORMATTIMEDIFF( unit, precision, time ) -- convert elapsed time to a string
  • GET( name ) -- get the value of a previously set variable
  • IF( condition, value if true, value if 0 ) -- return a value based on a condition
    • +
  • INSERTSTRING( text, start, new ) -- insert a string into a text string
  • INT( formula ) -- evaluate formula and round down to nearest integer
  • LEFT( ) -- address range of cells to the left of the current cell
    • +
  • LEFTSTRING( text, num ) -- extract characters at the beginning of a text string
  • LENGTH( text ) -- length of text in bytes
  • LIST( range ) -- convert content of a cell range into a list
  • LISTIF( condition, list ) -- remove elements from a list that do not meet a condition
    • @@ -115,6 +118,7 @@ This Plugin adds spreadsheet capabilities to %WIKITOOLNAME% topics. Formulae lik
  • REPEAT( text, num ) -- repeat text a number of times
  • REPLACE( text, start, num, new ) -- replace part of a text string
  • RIGHT( ) -- address range of cells to the right of the current cell
    • +
  • RIGHTSTRING( text, num ) -- extract characters at the end of a text string
  • ROUND( formula, digits ) -- round a number
  • ROW( offset ) -- current row number
  • SEARCH( string, text, start ) -- search a string within a text
    • @@ -124,6 +128,7 @@ This Plugin adds spreadsheet capabilities to %WIKITOOLNAME% topics. Formulae lik
  • SIGN( num ) -- sign of a number
  • SQRT( num ) -- square root of a number
  • SUBSTITUTE( text, old, new, instance, option ) -- substitute text
    • +
  • SUBSTRING( text, start, num ) -- extract a substring out of a text string
  • SUM( list ) -- sum of a list or range of cells
  • SUMDAYS( list ) -- sum the days in a list or range of cells
  • SUMPRODUCT( list, list ) -- scalar product on ranges of cells
    • @@ -153,7 +158,7 @@ This Plugin adds spreadsheet capabilities to %WIKITOOLNAME% topics. Formulae lik ## Syntax Rules -The action of this Plugin is triggered by the **%CALC\{"..."\}%** variable, which gets rendered according to the built-in function(s) found between the quotes. +The action of this plugin is triggered by the **%CALC\{"..."\}%** variable, which gets rendered according to the built-in function(s) found between the quotes. - Built-in function are of format **$FUNCNAME(parameter)** - Functions may be nested, e.g. **%CALC\{"$SUM( R2:C$COLUMN(0)..R$ROW(-1):C$COLUMN(0) )"\}%** @@ -178,6 +183,7 @@ The action of this Plugin is triggered by the **%CALC\{"..."\}%** v - Lists can refer to values and/or table cell ranges, e.g. **%CALC\{"$SUM( 3, 5, $T(R1:C7), R1:C11..R1:C15 )"\}%** - Formulae can only reference cells in the current or preceeding row of the current table; they may not reference cells below the current table row - Formulae can also be placed outside of tables; they can reference cells in the preceeding table +- Formulae can be placed in a [[FormattedSearch]], but the CALC needs to be escaped. Learn how to [[use a CALC in a formatted search|Main/WebHome#CalcInFormattedSearch]] ## Built-in Functions @@ -271,6 +277,17 @@ Conventions for Syntax: - Example: **%CALC\{"$DEF(R1:C1..R1:C3)"\}%** - Related: [[$COUNTSTR()|Main/WebHome#FuncCOUNTSTR]], [[$LISTIF()|Main/WebHome#FuncLISTIF]], [[$LIST()|Main/WebHome#FuncLIST]] + + +### EMPTY( text ) -- test for empty text + +- Returns **1** if `text` is empty, or **** if not +- Syntax: **$EMPTY( _text_ )** +- Example: **%CALC\{"$EMPTY(foo)"\}%** returns **** +- Example: **%CALC\{"$EMPTY()"\}%** returns **1** +- Example: **%CALC\{"$EMPTY($TRIM( ))"\}%** returns **1** +- Related: [[$EXACT()|Main/WebHome#FuncEXACT]], [[$IF()|Main/WebHome#FuncIF]], [[$TRIM()|Main/WebHome#FuncTRIM]] + ### EVAL( formula ) -- evaluate a simple mathematical formula @@ -297,7 +314,7 @@ Conventions for Syntax: - Syntax: **$EXACT( text1, _text2_ )** - Example: **%CALC\{"$EXACT(foo, Foo)"\}%** returns **** - Example: **%CALC\{"$EXACT(foo, $LOWER(Foo))"\}%** returns **1** -- Related: [[$IF()|Main/WebHome#FuncIF]], [[$TRIM()|Main/WebHome#FuncTRIM]] +- Related: [[$EMPTY()|Main/WebHome#FuncEMPTY]], [[$IF()|Main/WebHome#FuncIF]], [[$TRIM()|Main/WebHome#FuncTRIM]] @@ -318,6 +335,7 @@ Conventions for Syntax: - Syntax: **$EXISTS( topic )** - Example: **%CALC\{"$EXISTS(WebHome)"\}%** returns **1** - Example: **%CALC\{"$EXISTS(ThisDoesNotExist)"\}%** returns **** +- Related: [[$EXACT()|Main/WebHome#FuncEXACT]], [[$IF()|Main/WebHome#FuncIF]], [[$TRIM()|Main/WebHome#FuncTRIM]] @@ -337,7 +355,7 @@ Conventions for Syntax: - Example: **%CALC\{"$FIND(f, fluffy)"\}%** returns **1** - Example: **%CALC\{"$FIND(f, fluffy, 2)"\}%** returns **4** - Example: **%CALC\{"$FIND(@, fluffy, 1)"\}%** returns **** -- Related: [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$SEARCH()|Main/WebHome#FuncSEARCH]] +- Related: [[$INSERTSTRING()|Main/WebHome#FuncINSERTSTRING]], [[$LEFTSTRING()|Main/WebHome#FuncLEFTSTRING]], [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$RIGHTSTRING()|Main/WebHome#FuncRIGHTSTRING]], [[$SUBSTRING()|Main/WebHome#FuncSUBSTRING]], [[$SEARCH()|Main/WebHome#FuncSEARCH]] @@ -414,7 +432,17 @@ Conventions for Syntax: - Example: **%CALC\{"$IF($T(R1:C5) > 1000, Over Budget, OK)"\}%** returns **Over Budget** if value in R1:C5 is over 1000, **OK** if not - Example: **%CALC\{"$IF($EXACT($T(R1:C2),), empty, $T(R1:C2))"\}%** returns the content of R1:C2 or **empty** if empty - Example: **%CALC\{"$SET(val, $IF($T(R1:C2) == 0, zero, $T(R1:C2)))"\}%** sets a variable conditionally -- Related: [[$AND()|Main/WebHome#FuncAND]], [[$EXACT()|Main/WebHome#FuncEXACT]], [[$LISTIF()|Main/WebHome#FuncLISTIF]], [[$NOT()|Main/WebHome#FuncNOT]], [[$OR()|Main/WebHome#FuncOR]] +- Related: [[$AND()|Main/WebHome#FuncAND]], [[$EMPTY()|Main/WebHome#FuncEMPTY]], [[$EXACT()|Main/WebHome#FuncEXACT]], [[$LISTIF()|Main/WebHome#FuncLISTIF]], [[$NOT()|Main/WebHome#FuncNOT]], [[$OR()|Main/WebHome#FuncOR]] + + + +### INSERTSTRING( text, start, new ) -- insert a string into a text string + +- Insert `new` string into text string `text` to the right of `start` position. Position starts at 1; use a negative `start` to count from the end of the text +- Syntax: **$INSERTSTRING( text, start, new )** +- Example: **%CALC\{"$INSERTSTRING(abcdefg, 2, XYZ)"\}%** returns **abXYZcdefg** +- Example: **%CALC\{"$INSERTSTRING(abcdefg, -2, XYZ)"\}%** returns **abcdeXYZfg** +- Related: [[$FIND()|Main/WebHome#FuncFIND]], [[$LEFTSTRING()|Main/WebHome#FuncLEFTSTRING]], [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$RIGHTSTRING()|Main/WebHome#FuncRIGHTSTRING]], [[$SEARCH()|Main/WebHome#FuncSEARCH]], [[$SUBSTITUTE()|Main/WebHome#FuncSUBSTITUTE]], [[$SUBSTRING()|Main/WebHome#FuncSUBSTRING]], [[$TRANSLATE()|Main/WebHome#FuncTRANSLATE]] @@ -436,6 +464,16 @@ Conventions for Syntax: - Example: **%CALC\{"$SUM($LEFT())"\}%** returns the sum of cells to the left of the current cell - Related: [[$ABOVE()|Main/WebHome#FuncABOVE]], [[$RIGHT()|Main/WebHome#FuncRIGHT]] + + +### LEFTSTRING( text, num ) -- extract characters at the beginning of a text string + +- Retrieve the `num` of characters from the left end of `text`; the leftmost character is returned if `num` is missing +- Syntax: **$LEFTSTRING( text, _num_ )** +- Example: **%CALC\{"$LEFTSTRING(abcdefg)"\}%** returns **a** +- Example: **%CALC\{"$LEFTSTRING(abcdefg, 5)"\}%** returns **abcde** +- Related: [[$FIND()|Main/WebHome#FuncFIND]], [[$INSERTSTRING()|Main/WebHome#FuncINSERTSTRING]], [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$RIGHTSTRING()|Main/WebHome#FuncRIGHTSTRING]], [[$SEARCH()|Main/WebHome#FuncSEARCH]], [[$SUBSTITUTE()|Main/WebHome#FuncSUBSTITUTE]], [[$SUBSTRING()|Main/WebHome#FuncSUBSTRING]], [[$TRANSLATE()|Main/WebHome#FuncTRANSLATE]] + ### LENGTH( text ) -- length of text in bytes @@ -462,7 +500,7 @@ Conventions for Syntax: - Example: **%CALC\{"$LISTIF($item > 12, 14, 7, 25)"\}%** returns **14, 25** - Example: **%CALC\{"$LISTIF($NOT($EXACT($item,)), A, B, , E)"\}%** returns non-empty elements **A, B, E** - Example: **%CALC\{"$LISTIF($index > 2, A, B, C, D)"\}%** returns **C, D** -- Related: [[$IF()|Main/WebHome#FuncIF]], [[$LIST()|Main/WebHome#FuncLIST]], [[$LISTITEM()|Main/WebHome#FuncLISTITEM]], [[$LISTMAP()|Main/WebHome#FuncLISTMAP]], [[$LISTREVERSE()|Main/WebHome#FuncLISTREVERSE]], [[$LISTSIZE()|Main/WebHome#FuncLISTSIZE]], [[$LISTSORT()|Main/WebHome#FuncLISTSORT]], [[$LISTUNIQUE()|Main/WebHome#FuncLISTUNIQUE]], [[$SUM()|Main/WebHome#FuncSUM]] +- Related: [[$EMPTY()|Main/WebHome#FuncEMPTY]], [[$EXACT()|Main/WebHome#FuncEXACT]], [[$IF()|Main/WebHome#FuncIF]], [[$LIST()|Main/WebHome#FuncLIST]], [[$LISTITEM()|Main/WebHome#FuncLISTITEM]], [[$LISTMAP()|Main/WebHome#FuncLISTMAP]], [[$LISTREVERSE()|Main/WebHome#FuncLISTREVERSE]], [[$LISTSIZE()|Main/WebHome#FuncLISTSIZE]], [[$LISTSORT()|Main/WebHome#FuncLISTSORT]], [[$LISTUNIQUE()|Main/WebHome#FuncLISTUNIQUE]], [[$SUM()|Main/WebHome#FuncSUM]] @@ -622,7 +660,7 @@ Conventions for Syntax: ### NOP( text ) -- no-operation -- Useful to change the order of Plugin execution. For example, it allows preprossing to be done before `%SEARCH{}%` is evaluated. The percent character '%' can be escaped with `$per` +- Useful to change the order of plugin execution. For example, it allows preprossing to be done before `%SEARCH{}%` is evaluated. The percent character '%' can be escaped with `$per` - Syntax: **$NOP( text )** @@ -632,7 +670,7 @@ Conventions for Syntax: - Returns 0 if **num** is not zero, 1 if zero - Syntax: **$NOT( num )** - Example: **%CALC\{"$NOT(0)"\}%** returns **1** -- Related: [[$AND()|Main/WebHome#FuncAND]], [[$IF()|Main/WebHome#FuncIF]], [[$OR()|Main/WebHome#FuncOR]] +- Related: [[$AND()|Main/WebHome#FuncAND]], [[$EMPTY()|Main/WebHome#FuncEMPTY]], [[$IF()|Main/WebHome#FuncIF]], [[$OR()|Main/WebHome#FuncOR]] @@ -688,7 +726,7 @@ Conventions for Syntax: ### PROPERSPACE( text ) -- properly space out WikiWords -- Properly spaces out %SYSTEMWEB%.WikiWords preceeded by white space, parenthesis, or **]\[**. Words listed in the DONTSPACE %SYSTEMWEB%.TWikiPreferences variable or DONTSPACE Plugins setting are excluded +- Properly spaces out %SYSTEMWEB%.WikiWords preceeded by white space, parenthesis, or **]\[**. Words listed in the DONTSPACE %SYSTEMWEB%.TWikiPreferences variable or DONTSPACE plugins setting are excluded - Syntax: **$PROPERSPACE( text )** - Example: Assuming DONTSPACE contains MacDonald: **%CALC\{"$PROPERSPACE(Old MacDonald had a ServerFarm, EeEyeEeEyeOh)"\}%** returns **Old MacDonald had a Server Farm, Ee Eye Ee Eye Oh** - Related: [[$LOWER()|Main/WebHome#FuncLOWER]], [[$PROPER()|Main/WebHome#FuncPROPER]], [[$TRIM()|Main/WebHome#FuncTRIM]], [[$UPPER()|Main/WebHome#FuncUPPER]] @@ -714,8 +752,8 @@ Conventions for Syntax: - Replace `num` number of characters of text string `text`, starting at `start`, with new text `new`. Starting position is 1; use a negative `start` to count from the end of the text - Syntax: **$REPLACE( text, start, num, new )** -- Example: **%CALC\{"$REPLACE(abcdefghijk,6,5,\*)"\}%** returns **abcde\*k** -- Related: [[$FIND()|Main/WebHome#FuncFIND]], [[$SEARCH()|Main/WebHome#FuncSEARCH]], [[$SUBSTITUTE()|Main/WebHome#FuncSUBSTITUTE]], [[$TRANSLATE()|Main/WebHome#FuncTRANSLATE]] +- Example: **%CALC\{"$REPLACE(abcdefghijk, 6, 5, \*)"\}%** returns **abcde\*k** +- Related: [[$FIND()|Main/WebHome#FuncFIND]], [[$INSERTSTRING()|Main/WebHome#FuncINSERTSTRING]], [[$LEFTSTRING()|Main/WebHome#FuncLEFTSTRING]], [[$RIGHTSTRING()|Main/WebHome#FuncRIGHTSTRING]], [[$SEARCH()|Main/WebHome#FuncSEARCH]], [[$SUBSTITUTE()|Main/WebHome#FuncSUBSTITUTE]], [[$SUBSTRING()|Main/WebHome#FuncSUBSTRING]], [[$TRANSLATE()|Main/WebHome#FuncTRANSLATE]] @@ -725,6 +763,16 @@ Conventions for Syntax: - Example: **%CALC\{"$SUM($RIGHT())"\}%** returns the sum of cells to the right of the current cell - Related: [[$ABOVE()|Main/WebHome#FuncABOVE]], [[$LEFT()|Main/WebHome#FuncLEFT]] + + +### RIGHTSTRING( text, num ) -- extract characters at the end of a text string + +- Retrieve the `num` of characters from the right end of `text`; the rightmost character is returned if `num` is missing +- Syntax: **$RIGHTSTRING( text, _num_ )** +- Example: **%CALC\{"$RIGHTSTRING(abcdefg)"\}%** returns **g** +- Example: **%CALC\{"$RIGHTSTRING(abcdefg, 5)"\}%** returns **cdefg** +- Related: [[$FIND()|Main/WebHome#FuncFIND]], [[$INSERTSTRING()|Main/WebHome#FuncINSERTSTRING]], [[$LEFTSTRING()|Main/WebHome#FuncLEFTSTRING]], [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$SEARCH()|Main/WebHome#FuncSEARCH]], [[$SUBSTITUTE()|Main/WebHome#FuncSUBSTITUTE]], [[$SUBSTRING()|Main/WebHome#FuncSUBSTRING]], [[$TRANSLATE()|Main/WebHome#FuncTRANSLATE]] + ### ROUND( formula, digits ) -- round a number @@ -755,7 +803,7 @@ Conventions for Syntax: - Example: **%CALC\{"$SEARCH([uy], fluffy)"\}%** returns **3** - Example: **%CALC\{"$SEARCH([uy], fluffy, 3)"\}%** returns **6** - Example: **%CALC\{"$SEARCH([abc], fluffy,)"\}%** returns **** -- Related: [[$FIND()|Main/WebHome#FuncFIND]], [[$REPLACE()|Main/WebHome#FuncREPLACE]] +- Related: [[$FIND()|Main/WebHome#FuncFIND]], [[$INSERTSTRING()|Main/WebHome#FuncINSERTSTRING]], [[$LEFTSTRING()|Main/WebHome#FuncLEFTSTRING]], [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$RIGHTSTRING()|Main/WebHome#FuncRIGHTSTRING]], [[$SUBSTRING()|Main/WebHome#FuncSUBSTRING]] @@ -807,10 +855,19 @@ Conventions for Syntax: - Substitutes `new` text for `old` text in a `text` string. `instance` specifies which occurance of `old` you want to replace. If you specify `instance`, only that instance is replaced. Otherwise, every occurance is changed to the new text. A literal search is performed by default; a %SYSTEMWEB%.RegularExpression search if the `option` is set to **r** - Syntax: **$SUBSTITUTE( text, old, _new_, _instance_, _option_ )** - Example: **%CALC\{"$SUBSTITUTE(Good morning, morning, day)"\}%** returns **Good day** -- Example: **%CALC\{"$SUBSTITUTE(Q2-2002,2,3)"\}%** returns **Q3-3003** -- Example: **%CALC\{"$SUBSTITUTE(Q2-2002,2,3,3)"\}%** returns **Q2-2003** -- Example: **%CALC\{"$SUBSTITUTE(abc123def,[0-9],9,,r)"\}%** returns **abc999def** -- Related: [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$TRANSLATE()|Main/WebHome#FuncTRANSLATE]] +- Example: **%CALC\{"$SUBSTITUTE(Q2-2002, 2, 3)"\}%** returns **Q3-3003** +- Example: **%CALC\{"$SUBSTITUTE(Q2-2002,2, 3, 3)"\}%** returns **Q2-2003** +- Example: **%CALC\{"$SUBSTITUTE(abc123def, [0-9], 9, , r)"\}%** returns **abc999def** +- Related: [[$INSERTSTRING()|Main/WebHome#FuncINSERTSTRING]], [[$LEFTSTRING()|Main/WebHome#FuncLEFTSTRING]], [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$RIGHTSTRING()|Main/WebHome#FuncRIGHTSTRING]], [[$SUBSTRING()|Main/WebHome#FuncSUBSTRING]], [[$TRANSLATE()|Main/WebHome#FuncTRANSLATE]] + + + +### SUBSTRING( text, start, num ) -- extract a substring out of a text string + +- Extract `num` number of characters of text string `text`, starting at `start`. Starting position is 1; use a negative `start` to count from the end of the text +- Syntax: **$SUBSTRING( text, start, num )** +- Example: **%CALC\{"$SUBSTRING(abcdefghijk, 3, 5)"\}%** returns **cdefg** +- Related: [[$FIND()|Main/WebHome#FuncFIND]], [[$INSERTSTRING()|Main/WebHome#FuncINSERTSTRING]], [[$LEFTSTRING()|Main/WebHome#FuncLEFTSTRING]], [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$RIGHTSTRING()|Main/WebHome#FuncRIGHTSTRING]], [[$SEARCH()|Main/WebHome#FuncSEARCH]], [[$SUBSTITUTE()|Main/WebHome#FuncSUBSTITUTE]], [[$TRANSLATE()|Main/WebHome#FuncTRANSLATE]] @@ -853,7 +910,7 @@ Conventions for Syntax: - Syntax: **$TRANSLATE( text, from, to )** - Example: **%CALC\{"$TRANSLATE(boom,bm,cl)"\}%** returns **cool** - Example: **%CALC\{"$TRANSLATE(one, two,$comma,;)"\}%** returns **one; two** -- Related: [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$SUBSTITUTE()|Main/WebHome#FuncSUBSTITUTE]] +- Related: [[$INSERTSTRING()|Main/WebHome#FuncINSERTSTRING]], [[$LEFTSTRING()|Main/WebHome#FuncLEFTSTRING]], [[$REPLACE()|Main/WebHome#FuncREPLACE]], [[$RIGHTSTRING()|Main/WebHome#FuncRIGHTSTRING]], [[$SUBSTRING()|Main/WebHome#FuncSUBSTRING]], [[$SUBSTITUTE()|Main/WebHome#FuncSUBSTITUTE]] @@ -898,7 +955,7 @@ Conventions for Syntax: - Removes all spaces from text except for single spaces between words - Syntax: **$TRIM( text )** - Example: **%CALC\{"$TRIM( eat  spaces  )"\}%** returns **eat spaces** -- Related: [[$EXACT()|Main/WebHome#FuncEXACT]], [[$PROPERSPACE()|Main/WebHome#FuncPROPERSPACE]] +- Related: [[$EMPTY()|Main/WebHome#FuncEMPTY]], [[$EXACT()|Main/WebHome#FuncEXACT]], [[$PROPERSPACE()|Main/WebHome#FuncPROPERSPACE]] @@ -930,6 +987,8 @@ Conventions for Syntax: ## FAQ + + ### Can I use CALC in a formatted search? Specifically, how can I output some conditional text in a %SYSTEMWEB%.FormattedSearch? @@ -1003,7 +1062,7 @@ The last row is defined as: | %CALC{"$COUNTITEMS( R2:C$COLUMN()..R$ROW(-1):C$COLUMN() )"}% \ | Total: %CALC{"$SUM( R2:C$COLUMN()..R$ROW(-1):C$COLUMN() )"}% | -Above table is created manually. Another Plugin could build the table dynamically, e.g. by pulling data out of a bug tracking system. The Spreadsheet Plugin can be used to display table data statistics. +Above table is created manually. Another plugin could build the table dynamically, e.g. by pulling data out of a bug tracking system. The Spreadsheet plugin can be used to display table data statistics. ## Plugin Settings @@ -1044,7 +1103,7 @@ Plugin settings are stored as preferences variables. To reference a plugin setti Plugin Perl module -- TWiki 4 and up: Visit `configure` in your TWiki installation, and enable the Plugin in the \{Plugins\} section. +- TWiki 4 and up: Visit `configure` in your TWiki installation, and enable the plugin in the \{Plugins\} section. - Test if the "Total" in the first table in this topic is correct. ## Plugin Info @@ -1056,7 +1115,7 @@ Plugin settings are stored as preferences variables. To reference a plugin setti Copyright: - © 2001-2007, Peter Thoeny, TWIKI.NET + © 2001-2009, Peter Thoeny, TWIKI.NET License: @@ -1064,13 +1123,25 @@ Plugin settings are stored as preferences variables. To reference a plugin setti Plugin Version: - 13 Oct 2007 (15270) + 26 Mar 2009 (17910) Change History:   + 26 Mar 2009: + Added $INSERTSTRING() + + + 25 Mar 2009: + Added $EMPTY(), $LEFTSTRING(), $RIGHTSTRING(), $SUBSTRING() + + + 24 Mar 2009: + Fixed bug in $REPLACE() if to-be-replaced string is "0"; fixed bug in $SUBSTITUTE() if replace string is empty; improved docs + + 13 Oct 2007: Added $FORMATTIMEDIFF() @@ -1262,4 +1333,4 @@ Plugin settings are stored as preferences variables. To reference a plugin setti **_Related Topics:_** %SYSTEMWEB%.TWikiPreferences, %SYSTEMWEB%.TWikiPlugins, %SYSTEMWEB%.VarCALC --- TWiki:Main/PeterThoeny - 13 Oct 2007 +-- TWiki:Main/PeterThoeny - 26 Mar 2009 diff --git a/TWiki/TWikiAccessControl.mdwn b/TWiki/TWikiAccessControl.mdwn index 9eac3e6..829062e 100644 --- a/TWiki/TWikiAccessControl.mdwn +++ b/TWiki/TWikiAccessControl.mdwn @@ -67,10 +67,14 @@ As a **collaboration guideline**: **Access control:** Restrict access to content based on users and groups once a user is identified. + + ## Users and Groups Access control is based on the familiar concept of Users and Groups. Users are defined by their [[WikiNames]]. They can then be organized in unlimited combinations by inclusion in one or more user Groups. For convenience, Groups can also be included in other Groups. + + ### Managing Users A user can create an account in [[TWikiRegistration]]. The following actions are performed: @@ -115,6 +119,8 @@ You can create new administrators simply by adding them to the %USERSWEB%.TWikiA A member of the Super Admin Group has unrestricted access throughout the TWiki, so only trusted staff should be added to this group. + + ## Restricting Access You can define who is allowed to read or write to a web or a topic. Note that some plugins may not respect access permissions. @@ -125,6 +131,8 @@ You can define who is allowed to read or write to a web or a topic. Note that so Note that there is an important distinction between CHANGE access and RENAME access. A user can CHANGE a topic, but thanks to version control their changes cannot be lost (the history of the topic before the change is recorded). However if a topic or web is renamed, that history may be lost. Typically a site will only give RENAME access to administrators and content owners. + + ### Controlling access to a Web You can define restrictions on who is allowed to view a %WIKITOOLNAME% web. You can restrict access to certain webs to selected Users and Groups, by: @@ -150,6 +158,8 @@ Creation and renaming of sub-webs is controlled by the WEBCHANGE setting on the **_Note:_** For Web level access rights Setting any of these settings to an empty value has the same effect as not setting them at all. Please note that the documentation of TWiki 4.0 and earlier versions of TWiki 4.1 did not reflect the actual implementation, e.g. an empty ALLOWWEBVIEW does _not_ prevent anyone from viewing the web, and an an empty DENYWEBVIEW does _not_ allow all to view the web. + + ### Controlling access to a Topic - You can define these settings in any topic, preferable towards the end of the topic: @@ -176,6 +186,8 @@ The same rules apply to ALLOWTOPICCHANGE/DENYTOPICCHANGE and APPLYTOPICRENAME/DE See "How TWiki evaluates ALLOW/DENY settings" below for more on how ALLOW and DENY interacts. + + ### Controlling access to Attachments Attachments are referred to directly, and are not normally indirected via TWiki scripts. This means that the above instructions for access control will _not_ apply to attachments. It is possible that someone may inadvertently publicise a URL that they expected to be access-controlled. @@ -205,6 +217,8 @@ Top level webs are a special case, because they don't have a parent web with a [ Note that you do **not** require `ROOTCHANGE` access to rename an existing top-level web. You just need `WEBCHANGE` in the web itself. + + ### How TWiki evaluates ALLOW/DENY settings When deciding whether to grant access, TWiki evaluates the following rules in order (read from the top of the list; if the logic arrives at **PERMITTED** or **DENIED** that applies immediately and no more rules are applied). You need to read the rules bearing in mind that VIEW, CHANGE and RENAME access may be granted/denied separately. @@ -234,6 +248,8 @@ Examples: Topic A includes topic B - If the included topic B has ALLOWTOPICCHANGE set to block editing for a user, it does not prevent editing the including topic A. - If the included topic B has ALLOWTOPICVIEW set to block view for a user, the user can still view topic A but he cannot see the included topic B. He will see a message _No permission to view B_ + + ## Access Control quick recipes ### Obfuscating Webs diff --git a/TWiki/TWikiDocGraphics.mdwn b/TWiki/TWikiDocGraphics.mdwn index 5c55f29..17a498c 100644 --- a/TWiki/TWikiDocGraphics.mdwn +++ b/TWiki/TWikiDocGraphics.mdwn @@ -47,10 +47,22 @@ Other usage: [[see below|Main/TOPIC#Usage_extended]]. Write... - Book - book.gif - Book - %ICON{book}% + Airplane + airplane.gif + Airplane + %ICON{airplane}% + + + Award + award.gif + Award + %ICON{award}% + + + Bed + bed.gif + Bed + %ICON{bed}% Blank @@ -65,12 +77,24 @@ Other usage: [[see below|Main/TOPIC#Usage_extended]]. %ICON{blank-bg}% + Book + book.gif + Book + %ICON{book}% + + Speech bubble bubble.gif Speech bubble %ICON{bubble}% + Bug + bug.gif + Bug + %ICON{bug}% + + Days / Calendar days.gif Days, Calendar @@ -95,6 +119,12 @@ Other usage: [[see below|Main/TOPIC#Usage_extended]]. %ICON{filter}% + Food + food.gif + Food + %ICON{food}% + + Gear gear.gif Gear @@ -107,10 +137,10 @@ Other usage: [[see below|Main/TOPIC#Usage_extended]]. %ICON{globe}% - Map - map.gif - Map - %ICON{map}% + Graduation + graduation.gif + Graduation + %ICON{graduation}% Pointing hand @@ -119,22 +149,40 @@ Other usage: [[see below|Main/TOPIC#Usage_extended]]. %ICON{hand}% + Heart + heart.gif + Heart + %ICON{heart}% + + Help help.gif Help %H%, %ICON{help}% + Hour glass (clock) + hourglass.gif + Hour glass (clock) + %ICON{hourglass}% + + Information info.gif Info %ICON{info}% - Hour glass (clock) - hourglass.gif - Hour glass (clock) - %ICON{hourglass}% + Luggage + luggage.gif + Luggage + %ICON{luggage}% + + + Map + map.gif + Map + %ICON{map}% Megaphone @@ -739,6 +787,30 @@ Other usage: [[see below|Main/TOPIC#Usage_extended]]. <img src="%ICONURL{closed}%" width="48" height="16" alt="Closed" border="0" /> + Processing + processing.gif + Processing + %ICON{processing}% + + + Processing-bg + processing-bg.gif + Processing, transparent background + %ICON{processing-bg}% + + + Processing-32 + processing-32.gif + Processing, 32x32 + <img src="%ICONURL{processing-32}%" width="32" height="32" alt="Processing" border="0" /> + + + Processing-32-bg + processing-32-bg.gif + Processing, 32x32, transparent + <img src="%ICONURL{processing-32-bg}%" width="32" height="32" alt="Processing" border="0" /> + + Minus minus.gif Minus diff --git a/TWiki/TWikiHistory.mdwn b/TWiki/TWikiHistory.mdwn index fe54044..23d10a8 100644 --- a/TWiki/TWikiHistory.mdwn +++ b/TWiki/TWikiHistory.mdwn @@ -3,9 +3,10 @@
    - + + +## TWiki Release 4.3 (Georgetown) released 2009-03-30 + +**_New Features and Enhancements of TWiki Release 4.3_** + +- **Security Enhancements** + - Reduced risk of XSS ([cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting)) + - S/MIME support to sign administrative e-mails + +- **Usability Enhancements** + - Replace question mark links with red-links to point to non-existing topics + +- **Enterprise Collaboration Enhancements** + - Pre-installed [[HeadlinesPlugin]] to show headline newsfeeds in TWiki topics + - Pre-installed [[TWikiNetSkin]], [[TWikiNetSkinPlugin]] for corporate look and feel + +- **Search Enhancements** + - Add footer parameter to Formatted Search + - Add number of topics to Formatted Search -## TWiki Release 4.2.4 (Georgeown) released 00:35:32 06 December 2008 +- **Miscellaneous Feature Enhancements** + - Control over variable expansion at topic creation time + - 17 new [[TWikiDocGraphics]] images + - Include URL supports list of domains to exclude from proxy + - Adding Korean language + +- **Plugin Enhancements** + - [[SpreadSheetPlugin]]: 5 new functions + +- **Bug Fixes** + - More than 30 bug fixes since 4.2.4 + + **_Hall of Fame of TWiki Release 4.3_** + +Many people have been involved in creating TWiki 4.3. Special thanks go to the most active contributors in the following areas: + +- **Sponsor and facilitator:** TWiki:Main.PeterThoeny +- **Testing and bug fixing:** TWiki:Main.SopanShewale, TWiki:Main.PeterThoeny, TWiki:Main.FengZhaolin, TWiki:Main.TimotheLitt, TWiki:Main.SteveMilner +- **Spec and code:** TWiki:Main.PeterThoeny, TWiki:Main.SopanShewale, TWiki:Main.TimotheLitt +- **Documentation:** TWiki:Main.PeterThoeny, TWiki:Main.SopanShewale, TWiki:Main.TimotheLitt, TWiki:Main.StephenHallett, TWiki:Main.JefferyMartin, TWiki:Main.ThomasErskine +- **Release package builds:** TWiki:Main.SopanShewale +- **Usability:** TWiki:Main.PeterThoeny +- **Translations:** Coordinated by TWiki:Main.SteffenPoulsen + - Bulgarian: TWiki:Main.KrassimirBerov + - Chinese (simplified and traditional): TWiki:Main.CheDong + - Czech: TWiki:Main.IvanKuncl + - Danish: TWiki:Main.SteffenPoulsen + - Dutch: TWiki:Main.WoutMertens + - Finnish: TWiki:Main.HeikkiToivonen + - French: TWiki:Main.BenVoui + - German: TWiki:Main.MartinRaabe + - Italian: TWiki:Main.MassimoMancini + - Japanese: TWiki:Main.KenYuminaga + - Korean: TWiki:Main.JustinKim + - Polish: TWiki:Main.ZbigniewKulesza + - Portuguese: TWiki:Main.CarlinhosCecconi + - Russian: TWiki:Main.AndreyTkachenko, TWiki:Main.SergejZnamenskij, TWiki:Main.SergeyJSinx, TWiki:Main.AlexTananaev + - Spanish: TWiki:Main.SebastianKlus, TWiki:Main.MiguelABayona + - Swedish: TWiki:Main.ErikAman + - Ukrainian: TWiki:Main.SerhijDubyk +- **Marketing:** TWiki:Main.PeterThoeny, TWiki:Main.WillThomas, TWiki:Main.VickiBrown +- **Public relations:** TWiki:Main.PeterThoeny, TWiki:Main.WillThomas +- **Meetups:** TWiki:Main.PeterThoeny +- **TWiki.org wiki champions:** TWiki:Main.SopanShewale, TWiki:Main.PeterThoeny, TWiki:Main.FengZhaolin, TWiki:Main.AndrewRJones, TWiki:Main.DanielRohde +- **Customer support:** TWiki:Main.PeterThoeny, TWiki:Main.SeanCMorgan, TWiki:Main.EnriqueCadalso, TWiki:Main.ScottFreeman, TWiki:Main.SopanShewale +- **System administration:** TWiki:Main.ChrisLahti, TWiki:Main.PeterThoeny, TWiki:Main.SopanShewale + +If you find an omission please fix it at TWiki:TWiki.TWikiHistory. For the full list of contributors see [[TWikiContributor]]. + +See more details on the TWiki 4.3 release at [[TWikiReleaseNotes04x03]]. + + -Patch release following the 4.2.0 released 22 Jan 2008 +## TWiki Release 4.2 (Freetown), 2008-01-22 **_New Features and Enhancements of TWiki Release 4.2_** @@ -69,7 +140,7 @@ Patch release following the 4.2.0 released 22 Jan 2008 Many people have been involved in creating TWiki 4.2. Special thanks go to the most active contributors in the following areas: - Release management led by TWiki:Main.KennethLavrsen, ably assisted by TWiki:Main.SvenDowideit -- Design and development driven by TWiki:Main.CrawfordCurrie, TWiki:Main.ArthurClemens, TWiki:Main.KennethLavrsen and TWiki:Main.SvenDowideit +- Design and development driven by TWiki:Main.CrawfordCurrie, TWiki:Main.ArthurClemens, [[KennethLavrsen]] and TWiki:Main.SvenDowideit - Testing driven by TWiki:Main.KennethLavrsen Many thanks also to the contributors in the following areas: @@ -109,7 +180,7 @@ See more details on the TWiki 4.2 release at [[TWikiReleaseNotes04x02]]. -## TWiki Release 4.1 (Edinburgh), 16 Jan 2007 +## TWiki Release 4.1 (Edinburgh), 2007-01-16 **_New Features and Enhancements of TWiki Release 4.1_** @@ -208,7 +279,7 @@ See more details on the TWiki 4.1 release at [[TWikiReleaseNotes04x01]]. -## TWiki Release 4.0.0 (Dakar), 01 Feb 2006 +## TWiki Release 4.0 (Dakar), 2006-02-01 **_Major New Features_** diff --git a/TWiki/TWikiInstallationGuide.mdwn b/TWiki/TWikiInstallationGuide.mdwn index 0480f7e..a4f8e7d 100644 --- a/TWiki/TWikiInstallationGuide.mdwn +++ b/TWiki/TWikiInstallationGuide.mdwn @@ -17,6 +17,7 @@ Both this document and the TWikiUpgradeGuide are also available in the root of t
  • Define the Administrator User(s)
  • Set TWiki Preferences
  • Enable Email Notification
    • +
  • Enable Signed Email Notification
  • Enable WebStatistics
  • Automate removal of expired sessions and lease files
  • Enable Localisation
    • @@ -82,7 +83,7 @@ If you need help, ask a question in the TWiki:Support web or on TWiki:Codev.TWik - Some systems require a special extension on perl scripts (e.g. `.cgi` or `.pl`). This is normally only needed under Windows and only where perl scripts are only recognized by file extension. Linux and Unix users should normally never need to do this. If necessary, rename all files in `twiki/bin` (i.e. rename `view` to `view.pl` etc). If you do this, make sure you set the `ScriptSuffix` option in `configure` (Step 6). 5. **Create the file LocalLib.cfg** located as `twiki/bin/LocalLib.cfg` - There is a template for this file in `twiki/bin/LocalLib.cfg.txt`. Simply copy [[LocalLib]].cfg.txt to [[LocalLib]].cfg. Make sure the ownership and access rights of the copy are the same as [[LocalLib]].cfg.txt - - The file `twiki/bin/LocalLib.cfg` must contain a setting for `$twikiLibPath`, which must point to the absolute file path of your `twiki/lib` e.g. `/var/www/twiki/lib`.
    + - The file `twiki/bin/LocalLib.cfg` must contain a setting for `$twikiLibPath`, which must point to the absolute file path of your `twiki/lib` e.g. `/var/www/twiki/lib`. - If you need to install additional [CPAN](http://cpan.perl.org/) modules, but can't update the main Perl installation files on the server, you can set `$CPANBASE` to point to your personal [CPAN](http://cpan.perl.org/) install. Don't forget that the webserver user has to be able to read those files as well. 6. **Choose best configuration method** for your webserver. There are two ways to configure Apache: config file included from httpd.conf or .htaccess files - Apache config file: The recommended method is using a config file. With a config file you can put the entire TWiki configuration in ONE file (typically named `twiki.conf`). Performance is much better with a config file, and one file gives the best overview and ensures that you get a safe installation . However using a config file requires that you can restart Apache which again means that you need root or sudo access to stop and start Apache. The TWiki apache config file is included from the main Apache config file http.conf. Most distributions have a directory from which any file that ends with `.conf` gets included when you restart Apache (Example RedHat/Fedora/Centos: /etc/httpd/conf.d). If you use a virtual host setup in Apache you should include the twiki.conf file from inside the desired virtual host config in your Apache configuration. @@ -101,7 +102,8 @@ If you need help, ask a question in the TWiki:Support web or on TWiki:Codev.TWik - Resolve any errors or warnings it tells you about. - **Note!** When you run `configure` for the first time, you can only edit the section `General Path Settings`. Save these settings, and then return to `configure` to continue configuration. - If your webserver can be accessed by more than one domain name make sure to add the additional alternative URLs to `{PermittedRedirectHostUrls}` - - When you return to configure you now need to setup _Mail and Proxies_. Especially the `{WebMasterEmail}`, and `{SMTP}{MAILHOST}` must be defined to enable TWiki to send registration emails. Many ISPs have introduced authentication when sending emails to fight spam so you may also have to set `{SMTP}{Username}` and `{SMTP}{Password}`. If you do not want to enable mailing or want to enable it later you can uncheck `{EnableEmail}`. + - When you return to configure you now need to setup _Mail and Proxies_. Especially the `{WebMasterEmail}`, and `{SMTP}{MAILHOST}` must be defined to enable TWiki to send administrative emails, such as for registration and notification of topic changes. Many ISPs have introduced authentication when sending emails to fight spam so you may also have to set `{SMTP}{Username}` and `{SMTP}{Password}`. If you do not want to enable mailing or want to enable it later you can uncheck `{EnableEmail}`. + - If you want administrative e-mails to be signed, see [[S/MIME setup instructions below|Main/WebHome#SmimeSetup]]. You now have a basic, unauthenticated installation running. At this point you can just point your Web browser at `http://yourdomain.com/twiki/bin/view` and start TWiki-ing away! @@ -169,6 +171,27 @@ Each TWiki web has an automatic email notification service that sends you an ema 1. Confirm the Mail and Proxies settings in the Configure interface. 2. Setup a cron job (or equivalent) to call the `tools/mailnotify` script as described in the `TWiki.MailerContrib` topic. + + +## Enable Signed Email Notification + +TWiki administrative e-mails are an attractive target for SPAM generators and phishing attacks. One good way to protect against this possibility to enable S/MIME signatures on all administrative e-mails. To do this, you need an an X.509 certificate and private key for the the `{WebMasterEmail}` email account. Obtain these as you would for any other S/MIME e-mail user. + +To enable TWiki to sign administrative e-mails: + +1. Enable e-mail as described above +2. If necessary, convert your certificate and key files to **PEM** format ( _openssl_ has all the necessary utilities) +3. Place the certificate anyplace convenient that the webserver can read. It should be protected against write. The conventional place under linux is `/etc/pki/tls/certs` +4. Place the key file in a secure location that **only** the webserver can read. It **must not** be readable by anyone else, and **must not** be served by the webserver. +5. Using the `configure` script, change the following settings under **Mail and Proxies**: + 1. Follow the directions under `{MailProgram}` to enable an external mail program such as _sendmail_. Net::SMTP is not supported. + 2. Enter the full path to the certificate file in the `{SmimeCertificateFile}` configuration variable + 3. Enter the full path to the private key file in the `{SmimeKeyFile}` configuration variable + 4. Save the configuration +6. Re-run the `configure` script an resolve any errors that it identifies + +All out-going administrative e-mails will now be signed. + ## Enable WebStatistics You can generate a listing manually, or on an automated schedule, of visits to individual pages, on a per web basis. For information on setting up this feature, see the `TWiki.TWikiSiteTools` topic. @@ -225,7 +248,7 @@ However you may prefer to have the same user interface as in TWiki 4.1 where _Ed ## Copyright, License and Classification Statements -In the bottom of each topic you will find a default copyright messages saying "Copyright &© by the contributing authors. All material on this collaboration platform is the property of the contributing authors." It is a setting WEBCOPYRIGHT that defines this. This is often not adequate. +In the bottom of each topic you will find a default copyright messages saying "Copyright © by the contributing authors. All material on this collaboration platform is the property of the contributing authors." It is a setting WEBCOPYRIGHT that defines this. This is often not adequate. - If your TWiki is used in a commercial application without public access you should replace this by your normal copyright notice. You should also consider adding classifications (e.g. For Internal Use Only) so people do not have to add this manually to every new topic. - If your TWiki is public with public access you need to decide which copyright and license the contributions should be covered by. For open source type applications licenses such as [the GNU Free Documentation License](http://www.gnu.org/licenses/fdl.html), [FreeBSD Documentation License](http://www.freebsd.org/copyright/freebsd-doc-license.html), and [Creative Commons license](http://creativecommons.org/licenses/) are possible licenses to consider. Remember that once people have started contributing it is difficult and not correct to change or impose licenses on existing contributions. @@ -392,6 +415,11 @@ See [TWiki:TWiki.HowToInstallCpanModules](http://twiki.org/cgi-bin/view/TWiki/Ho Highly recommended! Used for session support + Crypt::SMIME + >=0.09 + Required if S/MIME-signed administrative e-mail is enabled. + + Digest::base     diff --git a/TWiki/TWikiNetSkin.mdwn b/TWiki/TWikiNetSkin.mdwn new file mode 100644 index 0000000..a2db57d --- /dev/null +++ b/TWiki/TWikiNetSkin.mdwn @@ -0,0 +1,125 @@ +# TWikiNetSkin + +This is the default skin provided with [Certified TWiki](http://www.twiki.net/), designed by [Paul van Berkel](http://www.linkedin.com/in/paulvanberkel). + +
    + +
    + +## Screen Shot + +
    +

    TWiki Installation Error

    Incorrect format of searchformat template (missing sections? There should be 4 %SPLIT% tags)
    + +## Installation + +**Note:** You do not need to install anything on the browser to use this skin. The following instructions are for the administrator who installs the skin on the server where TWiki is running. + +This skin needs TWiki 4.2 or newer. + +- Download the ZIP file from the Skin Home page (see below) +- Unzip **%TOPIC%.zip** in your twiki installation directory + +### Additional installation steps + +- Modify [[TablePlugin]] settings: copy the `TABLEATTRIBUTES` below to Main.TWikiPreferences: %BR% + * TWikiNetSkin table attributes: + * Set TABLEPLUGIN_TABLEATTRIBUTES = tableborder="1" cellpadding="0" cellspacing="0" valign="top" headercolor="#252b37" headerbg="#d8dde4" headerbgsorted="#ced4dd" headercolor="#252b37" databg="#ffffff,#f2f3f6" databgsorted="#f3f5f7,#e7e9ee" tablerules="cols" +- In TWiki.TWikiPreferences, remove the `
    ` tags (if any) from `BROADCASTMESSAGE` + +- To turn on the skin, write in Main.TWikiPreferences: %BR% + * Set SKIN = twikinet,pattern +- [[Test if installed|%WEB%/%TOPIC%?skin=twikinet,pattern]] + +### Enhanced look + +Part of the design is done by TWiki:Plugins/TWikiNetSkinPlugin. Install this plugin for rounded tables and h2 headers. + +Example when installed: + +
    twikiNetSkinPlugin_example.png
    + +## Creating your own look + +This skin is based on TWiki:Plugins/PatternSkin, and the same rules for customization apply. + +## Skin Info + +- Set SHORTDESCRIPTION = Certified TWiki skin + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Skin Author: TWiki:Main/ArthurClemens
    Copyright: © 2007, 2008, TWIKI.NET; © design 2007: Paul van Berkel
    License: GPL (GNU General Public License)
    Description: Certified TWiki skin
    Screenshot: Click for full screen image
    Preview: Preview with this topic
    Base Name: twikinet,pattern
    Skin Version: 16 Mar 2008 (v1.0.1)
    Change History:  
    16 Mar 2008: Public release (v1.000)
    Dependencies: TWiki 4.2; TWiki:Plugins/PatternSkin (automatically provided by TWiki); TWiki:Plugins/TWikiNetSkinPlugin
    Skin Home: http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%
    Feedback: http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev
    Appraisal: http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal
    + +**_Related topic:_** [[TWikiSkins]], [[TWikiSkinBrowser]], [[UserDocumentationCategory]], [[AdminDocumentationCategory]] diff --git a/TWiki/TWikiNetSkinColorSettings.mdwn b/TWiki/TWikiNetSkinColorSettings.mdwn new file mode 100644 index 0000000..0d733ef --- /dev/null +++ b/TWiki/TWikiNetSkinColorSettings.mdwn @@ -0,0 +1,1604 @@ +# Color scheme settings for [[TWikiNetSkin]] + +- Set SKIN = twikinet,pattern + +## Usage + +### Step 1 + +Let [[TWikiNetSkin]] point to the custom-made colors style sheet. In [[Main.TWikiPreferences|Main/TWikiPreferences]] put: + + * Set USERCOLORSURL = %PUBURLPATH%/%TWIKIWEB%/TWikiNetSkin/theme-colors.css + +### Step 2 + +Edit this topic, and change the color variables as you like. + +### Step 3 + +Save the topic. This will generate an [attachment](http://www.dementia.org/twiki//view/TWiki/TWikiNetSkin/theme-colors.css) to topic [[TWikiNetSkin]]. + +info For more help on customizing styles, see [[PatternSkinCustomization]]. + +## Color variables + +
    + +
    + +### [[TWikiNetSkin]] specific + +#### SHADE\_TOPTOOLBAR\_BORDER + +- Set SHADE\_TOPTOOLBAR\_BORDER = #c4cbd6 + +#### SHADE\_TOPTOOLBAR\_BACKGROUND + +- Set SHADE\_TOPTOOLBAR\_BACKGROUND = #e9ecf2 + +#### SHADE\_SIDE\_BAR\_STRONG\_TEXT + +- Set SHADE\_SIDE\_BAR\_STRONG\_TEXT = #252b37 + +#### SHADE\_BLOCKQUOTE\_BACKGROUND + +- Set SHADE\_BLOCKQUOTE\_BACKGROUND = #edeff4 + +#### SHADE\_TWIKIFORM\_TABLECELL\_BORDER + +- Set SHADE\_TWIKIFORM\_TABLECELL\_BORDER = #e6e8ee + +#### SHADE\_TWIKITABLE\_HEADER\_BACKGROUND + +- Set SHADE\_TWIKITABLE\_HEADER\_BACKGROUND = #f4f5f9 + +#### SHADE\_TWIKIFORM\_FIRSTCOL\_BACKGROUND + +- Set SHADE\_TWIKIFORM\_FIRSTCOL\_BACKGROUND = #f9f9fb + +#### SHADE\_TWIKIFORM\_HEADER\_BACKGROUND + +- Set SHADE\_TWIKIFORM\_HEADER\_BACKGROUND = #eceef2 + +#### SHADE\_BOTTOM\_BAR\_BACKGROUND + +- Set SHADE\_BOTTOM\_BAR\_BACKGROUND = #7d8ca5 + +#### SHADE\_BOTTOM\_BAR\_TEXT + +- Set SHADE\_BOTTOM\_BAR\_TEXT = #d8dde4 + +#### SHADE\_ALERT\_TEXT + +- Set SHADE\_ALERT\_TEXT = #f60 + +#### SHADE\_BLUEISH\_TEXT + +- Set SHADE\_BLUEISH\_TEXT = #3f4e67 + +#### SHADE\_DARKISH\_TEXT + +- Set SHADE\_DARKISH\_TEXT = #333 + +#### SHADE\_TOPTOOLBAR\_WEBNAME\_TEXT + +- Set SHADE\_TOPTOOLBAR\_WEBNAME\_TEXT = %SHADE\_BLUEISH\_TEXT% + +#### SHADE\_BROADCASTMESSAGE\_BACKGROUND + +- Set SHADE\_BROADCASTMESSAGE\_BACKGROUND = #fff765 + +## Logical groupings + +### Text + +#### MAIN\_TEXT\_COLOR Main text color + +- Set MAIN\_TEXT\_COLOR = #252b37 + +#### MAIN\_BACKGROUND\_COLOR Main background color + +- Set MAIN\_BACKGROUND\_COLOR = #fff + +#### LIGHT\_ON\_DARK\_TEXT\_COLOR Light on dark text color + +- Set LIGHT\_ON\_DARK\_TEXT\_COLOR = #fff + +#### GRAYED\_TEXT\_COLOR + +- Set GRAYED\_TEXT\_COLOR = #7d8ca5 + +#### GENERAL\_TEXT General text (if not set in MAIN\_BACKGROUND\_COLOR) (black) + +- Set GENERAL\_TEXT = #000 + +#### HEADER\_TEXT Header text + +- Set HEADER\_TEXT = %SHADE\_ALERT\_TEXT% + +#### CODE\_TEXT Code text, left bar text and links + +- Set CODE\_TEXT = #669 + +#### MUTED\_TEXT Muted text + +- Set MUTED\_TEXT = %GRAYED\_TEXT\_COLOR% + +#### GRAYED\_OUT\_TEXT Grayed out text + +- Set GRAYED\_OUT\_TEXT = #999 + +#### TOPIC\_ACTION\_TEXT + +- Set TOPIC\_ACTION\_TEXT = #97a3b7 + +### Links + +#### LINK\_TEXT\_NORMAL Link normal text + +- Set LINK\_TEXT\_NORMAL = #36c + +#### LINK\_BACKGROUND\_NORMAL Link normal background + +- Set LINK\_BACKGROUND\_NORMAL = + +#### LINK\_TEXT\_NORMAL\_VISITED Link normal text visited + +- Set LINK\_TEXT\_NORMAL\_VISITED = #707f99 + +#### LINK\_TEXT\_ACTION\_BUTTON Link text + +- Set LINK\_TEXT\_ACTION\_BUTTON = %LINK\_TEXT\_NORMAL% + +#### LINK\_TEXT\_HOVER Link hover text + +- Set LINK\_TEXT\_HOVER = #036 + +#### SIDE\_BAR\_LINK\_TEXT Side bar link text + +- Set SIDE\_BAR\_LINK\_TEXT = %SHADE\_BLUEISH\_TEXT% + +### Disabled + +#### DISABLED\_BORDER Disabled border + +- Set DISABLED\_BORDER = #e0e0e0 + +#### DISABLED\_TEXT Disabled text + +- Set DISABLED\_TEXT = #aaa + +#### DISABLED\_BACKGROUND Disabled background + +- Set DISABLED\_BACKGROUND = #f8f8f8 + +#### BUTTON\_BORDERS\_DISABLED Disabled button borders + +- Set BUTTON\_BORDERS\_DISABLED = #fff #ccc #ccc #fff + +### 'New' + +#### NEW\_TEXT New text (green) + +- Set NEW\_TEXT = #049804 + +#### NEW\_BACKGROUND New background (light green) + +- Set NEW\_BACKGROUND = #ECFADC + +### Alert + +#### ALERT\_TEXT Alert text (red) + +- Set ALERT\_TEXT = #f00 + +#### ALERT\_TEXT\_MUTED Muted alert text (dark red) + +- Set ALERT\_TEXT\_MUTED = #900 + +#### ALERT\_BORDER Alert border + +- Set ALERT\_BORDER = #f00 + +### Buttons + +#### BUTTON\_TEXT Button text color (dark gray) + +- Set BUTTON\_TEXT = #000 + +#### BUTTON\_BORDERS Button borders + +- Set BUTTON\_BORDERS = #fff #888 #888 #fff + +#### BUTTON\_BACKGROUND Button background + +- Set BUTTON\_BACKGROUND = #e2e3e3 + +#### BUTTON\_CANCEL\_BACKGROUND Cancel button background + +- Set BUTTON\_CANCEL\_BACKGROUND = #f2d5d0 + +#### SUBMIT\_BUTTON\_BACKGROUND Submit button background + +- Set SUBMIT\_BUTTON\_BACKGROUND = #06c + +#### SUBMIT\_BUTTON\_BORDER\_TEXT Submit button text color + +- Set SUBMIT\_BUTTON\_BORDER\_TEXT = #fff + +#### SELECT\_BORDER Select border + +- Set SELECT\_BORDER = #888 + +### Background colors + +#### GENERAL\_BACKGROUND General background color (if not set in MAIN\_BACKGROUND\_COLOR) (white) + +- Set GENERAL\_BACKGROUND = #fff + +#### SIDE\_BAR\_BACKGROUND Side bar background + +- Set SIDE\_BAR\_BACKGROUND = #f4f5f8 + +#### NEUTRAL\_BACKGROUND + +- Set NEUTRAL\_BACKGROUND = #fdfaf1 + +#### TOP\_BAR\_BACKGROUND Top bar background + +- Set TOP\_BAR\_BACKGROUND = #dfe3ec + +#### TOPIC\_ACTION\_BACKGROUND Topic action row + +- Set TOPIC\_ACTION\_BACKGROUND = #f8f9fa + +#### HEADER\_BACKGROUND h2 + +- Set HEADER\_BACKGROUND = #f8f9fb + +#### ATTACHMENT\_AND\_FORM\_BACKGROUND Attachment, form + +- Set ATTACHMENT\_AND\_FORM\_BACKGROUND = #f2f3f6 + +#### DIFF\_HEADER\_BACKGROUND Diff header + +- Set DIFF\_HEADER\_BACKGROUND = #ccc + +#### NOTIFICATION\_BACKGROUND Info and notifications + +- Set NOTIFICATION\_BACKGROUND = #fff9d1 + +#### INFO\_BACKGROUND + +- Set INFO\_BACKGROUND = #f4f5f8 + +### Border colors + +#### NEUTRAL\_BORDER Info (light gray) + +- Set NEUTRAL\_BORDER = #d7dbe4 + +#### SEPARATOR\_BORDER + +- Set SEPARATOR\_BORDER = #e5e8ed + +#### MINOR\_SEPARATOR\_BORDER Header H3..H6 bottom + +- Set MINOR\_SEPARATOR\_BORDER = %SEPARATOR\_BORDER% + +#### LAYOUT\_ELEMENT\_BORDER Main layout elements (neutral tone) + +- Set LAYOUT\_ELEMENT\_BORDER = #cfcfcf + +#### IMAGE\_BORDER Image border + +- Set IMAGE\_BORDER = #eee + +#### NOTIFICATION\_BORDER Broadcast message + +- Set NOTIFICATION\_BORDER = #fc0 + +#### TOPIC\_ACTION\_BORDER + +- Set TOPIC\_ACTION\_BORDER = #dee2e8 + +#### Table colors + +##### TABLE\_DATA\_BACKGROUND Table data background + +- Set TABLE\_DATA\_BACKGROUND = #f2f3f6 + +##### TABLE\_HEADER\_BACKGROUND Table header background + +- Set TABLE\_HEADER\_BACKGROUND = #d8dde4 + +##### TABLE\_SELECTED\_COLUMN\_HEADER\_BACKGROUND Sorted table column accent background + +- Set TABLE\_SELECTED\_COLUMN\_HEADER\_BACKGROUND = #ced4dd + +##### TABLE\_DATA\_ODD\_BACKGROUND Table data background (odd row) + +- Set TABLE\_DATA\_ODD\_BACKGROUND = #f2f3f6 + +##### TABLE\_DATA\_EVEN\_BACKGROUND Table data background (even row) + +- Set TABLE\_DATA\_EVEN\_BACKGROUND = #ffffff + +##### TABLE\_DATA\_ODD\_SELECTED\_BACKGROUND Table data background (odd row, selected column) + +- Set TABLE\_DATA\_ODD\_SELECTED\_BACKGROUND = #e7e9ee + +##### TABLE\_DATA\_EVEN\_SELECTED\_BACKGROUND Table data background (even row, selected column) + +- Set TABLE\_DATA\_EVEN\_SELECTED\_BACKGROUND = #f3f5f7 + +##### TABLE\_DATA\_MIX\_BACKGROUND Table data background (mix between even and odd) + +- Set TABLE\_DATA\_MIX\_BACKGROUND = #e7e9ee + +#### TABLE\_BORDER Table border, sup (light neutral tone) + +- Set TABLE\_BORDER = #e7e9ef + +#### LINK\_TEXT\_NORMAL\_TABLE\_HEADER Table header link text + +- Set LINK\_TEXT\_NORMAL\_TABLE\_HEADER = #252b37 + +#### LINK\_TEXT\_NORMAL\_UNDERLINE\_TABLE\_HEADER Table header link border + +- Set LINK\_TEXT\_NORMAL\_UNDERLINE\_TABLE\_HEADER = #252b37 + +#### LINK\_TEXT\_SORTED\_TABLE\_HEADER Sorted table header link text + +- Set LINK\_TEXT\_SORTED\_TABLE\_HEADER = %LINK\_TEXT\_NORMAL\_TABLE\_HEADER% + +#### LINK\_TEXT\_HOVER\_TABLE\_HEADER Table header link hover text + +- Set LINK\_TEXT\_HOVER\_TABLE\_HEADER = %LINK\_TEXT\_NORMAL\_TABLE\_HEADER% + +#### LINK\_BORDER\_TABLE\_SELECTED\_COLUMN\_HEADER Link border in selected column header + +- Set LINK\_BORDER\_TABLE\_SELECTED\_COLUMN\_HEADER = %LINK\_TEXT\_NORMAL\_TABLE\_HEADER% + +### Forms + +#### INPUT\_FIELD\_BORDERS Input field borders + +- Set INPUT\_FIELD\_BORDERS = #bbc3d1 #c3cad7 #c3cad7 #bbc3d1 + +#### FORM\_INPUT\_BORDER Textarea, input and select (darker gray) + +- Set FORM\_INPUT\_BORDER = #aaa + +#### FORM\_BORDER Form + +- Set FORM\_BORDER = #dee2e8 + +#### ACTIVE\_FORM\_BACKGROUND Edit form, form steps + +- Set ACTIVE\_FORM\_BACKGROUND = #f4f5f8 + +#### FORM\_STEP\_BORDER Form step border + +- Set FORM\_STEP\_BORDER = %FORM\_BORDER% + +#### FORMFIELD\_ACTIVE Active form field + +- Set FORMFIELD\_ACTIVE = %NOTIFICATION\_BACKGROUND% + +Do not change the text below this line unless you know what you are doing! + +---- + + %STARTATTACH{"theme-colors.css" web="%TWIKIWEB%" topic="TWikiNetSkin"}% + /* PatternSkin colors */ + /* Generated by AttachContentPlugin from %WEB%.%TOPIC% */ + + /* LAYOUT ELEMENTS */ + + #patternTopBar { + background-color:%TOP_BAR_BACKGROUND%; + } + #patternMain { /* don't set a background here; use patternOuter */ } + #patternOuter { + background-color:%MAIN_BACKGROUND_COLOR%; /* Sets background of center col */ + border-color:%LAYOUT_ELEMENT_BORDER%; + } + #patternLeftBar, + #patternWrapper { + background-color:%MAIN_BACKGROUND_COLOR%; + } + #patternBottomBar { + background-color:%SHADE_BOTTOM_BAR_BACKGROUND%; + } + #patternBottomBarContents, + #patternBottomBarContents a:link, + #patternBottomBarContents a:visited { + color:%SHADE_BOTTOM_BAR_TEXT%; + } + #patternBottomBarContents a:hover { + color:%LIGHT_ON_DARK_TEXT_COLOR%; + } + + /* GENERAL HTML ELEMENTS */ + + html body { + background-color:%SHADE_BOTTOM_BAR_BACKGROUND%; + color:%MAIN_TEXT_COLOR%; + } + /* be kind to netscape 4 that doesn't understand inheritance */ + body, p, li, ul, ol, dl, dt, dd, acronym, h1, h2, h3, h4, h5, h6 { + background-color:transparent; + } + hr { + color:%SEPARATOR_BORDER%; + background-color:%SEPARATOR_BORDER%; + } + pre, code, tt { + color:%CODE_TEXT%; + } + blockquote { + background-color:%SHADE_BLOCKQUOTE_BACKGROUND%; + border-color:%NEUTRAL_BORDER%; + } + h1, h2, h3, h4, h5, h6 { + color:%HEADER_TEXT%; + } + /* to override old Render.pm coded font color style */ + .twikiNewLink font { + color:inherit; + } + .twikiNewLink a:link sup, + .twikiNewLink a:visited sup { + color:%MUTED_TEXT%; + border-color:%NEUTRAL_BORDER%; + } + .twikiNewLink a:hover sup { + color:%LINK_TEXT_HOVER%; + border-color:%LINK_TEXT_HOVER%; + } + .twikiNewLink { + border-color:%NEUTRAL_BORDER%; + } + :link:focus, + :visited:focus, + :link, + :visited, + :link:active, + :visited:active { + color:%LINK_TEXT_NORMAL%; + background-color:transparent; + } + :link:hover, + :visited:hover { + color:%LINK_TEXT_HOVER%; + background-color:transparent; + background-image:none; + text-decoration:underline; + } + :link:hover img, + :visited:hover img { + background-color:transparent; + } + .patternTopic a:visited { + color:%LINK_TEXT_NORMAL_VISITED%; + } + .patternTopic a:hover { + color:%LINK_TEXT_HOVER%; + } + #patternMainContents h1 a:link, #patternMainContents h1 a:visited, + #patternMainContents h2 a:link, #patternMainContents h2 a:visited, + #patternMainContents h3 a:link, #patternMainContents h3 a:visited, + #patternMainContents h4 a:link, #patternMainContents h4 a:visited, + #patternMainContents h5 a:link, #patternMainContents h5 a:visited, + #patternMainContents h6 a:link, #patternMainContents h6 a:visited { + color:%HEADER_TEXT%; + } + #patternMainContents h1 a:hover, + #patternMainContents h2 a:hover, + #patternMainContents h3 a:hover, + #patternMainContents h4 a:hover, + #patternMainContents h5 a:hover, + #patternMainContents h6 a:hover { + color:%LINK_TEXT_HOVER%; + } + .patternTopic .twikiUnvisited a:visited { + color:%LINK_TEXT_NORMAL%; + } + .patternTopic .twikiUnvisited a:hover { + color:%LINK_TEXT_HOVER%; + } + .patternTop a:hover { + border:none; + color:%LINK_TEXT_HOVER%; + } + + /* Form elements */ + + textarea, + input, + select { + border-color:%FORM_INPUT_BORDER%; + color:%SHADE_BLUEISH_TEXT%; + background-color:%GENERAL_BACKGROUND%; + } + .twikiSubmit, + .twikiButton { + border-color:%BUTTON_BORDERS%; + } + .twikiSubmit { + color:%SUBMIT_BUTTON_BORDER_TEXT%; + background-color:%SUBMIT_BUTTON_BACKGROUND%; + } + .twikiButton { + color:%BUTTON_TEXT%; + background-color:%BUTTON_BACKGROUND%; + } + .twikiButtonCancel { + color:%BUTTON_TEXT%; + background-color:%BUTTON_CANCEL_BACKGROUND%; + } + .twikiSubmitDisabled, + .twikiSubmitDisabled:active { + border-color:%BUTTON_BORDERS_DISABLED%; + color:%DISABLED_TEXT%; + background-color:%ACTIVE_FORM_BACKGROUND%; + } + .twikiTextarea, + .twikiInputField, + .twikiInputFieldDisabled, + .twikiInputFieldReadOnly, + .twikiSelect { + border-color:%INPUT_FIELD_BORDERS%; + } + .twikiTextarea, + .twikiInputField, + .twikiSelect { + color:%MAIN_TEXT_COLOR%; + background-color:%MAIN_BACKGROUND_COLOR%; + } + .twikiInputField:active, + .twikiInputField:focus { + background-color:%FORMFIELD_ACTIVE%; + } + .twikiTextareaRawView { + color:%SHADE_BLUEISH_TEXT%; + } + .twikiInputFieldDisabled { + color:%DISABLED_TEXT%; + background-color:%DISABLED_BACKGROUND%; + } + .twikiInputFieldReadOnly { + color:%GRAYED_TEXT_COLOR%; + } + .twikiSelect { + border-color:%INPUT_FIELD_BORDERS%; + color:%SHADE_BLUEISH_TEXT%; + background-color:%MAIN_BACKGROUND_COLOR%; + } + .twikiInputFieldDisabled, + .twikiSelectDisabled { + color:%DISABLED_TEXT%; + border-color:%INPUT_FIELD_BORDERS%; + background-color:%DISABLED_BACKGROUND%; + } + .twikiInputFieldBeforeFocus { + color:%MUTED_TEXT%; + } + + /* ----------------------------------------------------------- + Plugin elements + ----------------------------------------------------------- */ + + /* TablePlugin */ + + .twikiTable, + .twikiTable td { + border-color:%TABLE_BORDER%; + } + .twikiTable th { + border-color:%LIGHT_ON_DARK_TEXT_COLOR%; + } + .twikiTable th.twikiFirstCol { + border-left-color:%SHADE_TWIKITABLE_HEADER_BACKGROUND%; + } + .twikiTable th.twikiLastCol { + border-right-color:%SHADE_TWIKITABLE_HEADER_BACKGROUND%; + } + .twikiTable th a:link, + .twikiTable th a:visited, + .twikiTable th a font { + color:%LINK_TEXT_NORMAL_TABLE_HEADER%; + } + + /* TwistyContrib */ + .twistyPlaceholder { + color:%GRAYED_OUT_TEXT%; + } + a:hover.twistyTrigger { + color:%LINK_TEXT_HOVER%; + } + + /* RevCommentPlugin */ + .revComment .patternTopicAction { + background-color:%ATTACHMENT_AND_FORM_BACKGROUND%; + } + + /* ----------------------------------------------------------- + TWiki styles + ----------------------------------------------------------- */ + + .twikiGrayText { + color:%GRAYED_OUT_TEXT%; + } + .twikiGrayText a:link, + .twikiGrayText a:visited { + color:%GRAYED_OUT_TEXT%; + } + .twikiGrayText a:hover { + color:%LINK_TEXT_HOVER%; + } + + .twikiAttachments .twikiTable th { + border-top-color:%ATTACHMENT_AND_FORM_BACKGROUND%; + } + .twikiAttachments .twikiTable th, + .twikiForm th { + background-color:%SHADE_TWIKIFORM_HEADER_BACKGROUND%; + } + .twikiAttachments .twikiTable th.twikiFirstCol { + border-left-color:%SHADE_TWIKITABLE_HEADER_BACKGROUND%; + } + .twikiAttachments .twikiTable th.twikiLastCol { + border-right-color:%SHADE_TWIKITABLE_HEADER_BACKGROUND%; + } + .twikiFormTable td, + .twikiFormTable th { + border-color:%SHADE_TWIKIFORM_TABLECELL_BORDER%; + } + .patternContent .twikiForm td.twikiFirstCol, + .patternEditPage .twikiFormTable th { + background-color:%SHADE_TWIKIFORM_FIRSTCOL_BACKGROUND%; + color:%SHADE_BLUEISH_TEXT%; + } + .patternContent .twikiForm td, + .patternEditPage .twikiFormTable td { + background-color:%TABLE_DATA_EVEN_BACKGROUND%; + color:%LINK_TEXT_NORMAL_TABLE_HEADER%; + } + .twikiEditForm { + color:%SHADE_BLUEISH_TEXT%; + } + + .twikiFormStep { + border-top-color:%TOPIC_ACTION_BACKGROUND%; + border-bottom-color:%FORM_STEP_BORDER%; + } + .twikiFormStep h3, + .twikiFormStep h4 { + color:%SHADE_BLUEISH_TEXT%; + } + .twikiFormStep h2, + .twikiFormStep h3, + .twikiFormStep h4 { + background-color:transparent; + background-image:none; + } + .twikiActionFormStepSign { + color:%NEUTRAL_BORDER%; + } + .twikiToc .twikiTocTitle { + color:%MUTED_TEXT%; + } + .twikiBroadcastMessage { + background-color:%SHADE_BROADCASTMESSAGE_BACKGROUND%; + border-color:%NOTIFICATION_BORDER%; + color:%SHADE_DARKISH_TEXT%; + } + .twikiNotification { + background-color:%NOTIFICATION_BACKGROUND%; + } + .twikiHelp { + background-color:%ATTACHMENT_AND_FORM_BACKGROUND%; + color:%SHADE_DARKISH_TEXT%; + border-color:%SEPARATOR_BORDER%; + } + .twikiHelp b, + .twikiHelp strong, + .twikiHelp h1, + .twikiHelp h2, + .twikiHelp h3, + .twikiHelp h4, + .twikiHelp h5, + .twikiHelp h6 { + color:%SHADE_ALERT_TEXT%; + } + .twikiBroadcastMessage b, + .twikiBroadcastMessage strong { + color:%ALERT_TEXT%; + } + .twikiAlert, + .twikiAlert code { + color:%ALERT_TEXT%; + } + .twikiEmulatedLink { + color:%LINK_TEXT_NORMAL%; + } + .twikiPageForm table { + border-color:%TABLE_BORDER%; + background:%MAIN_BACKGROUND_COLOR%; + } + .twikiPageForm hr { + border-color:%FORM_BORDER%; + background-color:%FORM_BORDER%; + color:%FORM_BORDER%; + } + .twikiAccessKey { + color:inherit; + border-color:%GRAYED_OUT_TEXT%; + } + a:link .twikiAccessKey, + a:visited .twikiAccessKey { + color:inherit; + } + a:hover .twikiAccessKey { + color:inherit; + } + .twikiImage img { + border-color:%IMAGE_BORDER%; + background-color:%MAIN_BACKGROUND_COLOR%; + } + #patternTopBar .twikiImage img { + background-color:transparent; + } + .twikiImage a:hover img { + border-color:%LINK_TEXT_HOVER%; + } + + /* ----------------------------------------------------------- + Pattern skin specific elements + ----------------------------------------------------------- */ + #patternPage { + background-color:%MAIN_BACKGROUND_COLOR%; + } + .patternTop, + .patternHomePath .patternRevInfo, + .patternRevInfo { + color:%GRAYED_TEXT_COLOR%; + } + .patternRevInfo a:link, + .patternRevInfo a:visited { + color:%GRAYED_TEXT_COLOR%; + } + .patternRevInfo a:hover { + color:%LINK_TEXT_HOVER%; + } + .patternHomePath .patternRevInfo a:link, + .patternHomePath .patternRevInfo a:visited { + color:%LINK_TEXT_NORMAL%; + } + .patternHomePath { + color:%SHADE_BLUEISH_TEXT%; + } + .patternHomePath a:link, + .patternHomePath a:visited { + color:%LINK_TEXT_NORMAL%; + } + .patternHomePath a:hover { + color:%LINK_TEXT_HOVER%; + text-decoration:underline; + } + .patternHomePath .twikiSeparator { + color:%GRAYED_TEXT_COLOR%; + } + + /* Left bar */ + #patternLeftBarContents, + #patternLeftBarContents .patternLeftBarPersonal { + background:none; + background-image:none; + } + + #patternLeftBarContents, + #patternLeftBarContents a:link, + #patternLeftBarContents a:visited, + #patternLeftBarContents .patternLeftBarPersonal a:link, + #patternLeftBarContents .patternLeftBarPersonal a:visited { + color:%SHADE_BLUEISH_TEXT%; + } + #patternLeftBarContents strong, + #patternLeftBarContents b { + color:%SHADE_SIDE_BAR_STRONG_TEXT%; + text-decoration:none; + } + #patternLeftBarContents a:hover, + #patternLeftBarContents .patternLeftBarPersonal a:hover, + #patternLeftBarContents strong a:hover, + #patternLeftBarContents strong .patternLeftBarPersonal a:hover, + #patternLeftBarContents b a:hover, + #patternLeftBarContents b .patternLeftBarPersonal a:hover { + color:%LINK_TEXT_HOVER%; + text-decoration:underline; + } + + #patternLeftBarContents hr { + color:%SEPARATOR_BORDER%; + background-color:%SEPARATOR_BORDER%; + } + .patternTopicActions { + border-color:%MINOR_SEPARATOR_BORDER%; + background-color:%TOPIC_ACTION_BACKGROUND%; + color:%TOPIC_ACTION_TEXT%; + } + .patternTopicAction s, + .patternTopicAction strike { + color:%DISABLED_TEXT%; + } + .patternTopicAction .twikiSeparator { + color:#bec5d2; + } + .patternActionButtons a:link, + .patternActionButtons a:visited { + color:%LINK_TEXT_ACTION_BUTTON%; + } + .patternActionButtons a:hover { + color:%LINK_TEXT_HOVER%; + } + .patternTopicAction .twikiAccessKey { + color:%LINK_TEXT_ACTION_BUTTON%; + border-color:%LINK_TEXT_ACTION_BUTTON%; + } + .patternTopicAction a:hover .twikiAccessKey { + color:%LINK_TEXT_HOVER%; + } + .patternTopicAction label { + color:%GENERAL_TEXT%; + } + .patternHelpCol { + color:%GRAYED_OUT_TEXT%; + } + .patternSigLine { + color:%SHADE_BLUEISH_TEXT%; + } + .patternToolBar a:link .twikiAccessKey, + .patternToolBar a:visited .twikiAccessKey { + color:inherit; + border-color:#333; + } + .patternToolBar a:hover .twikiAccessKey { + background-color:transparent; + color:inherit; + border-color:#333; + } + .patternSaveHelp { + background-color:%MAIN_BACKGROUND_COLOR%; + } + + /* WebSearch, WebSearchAdvanced */ + table#twikiSearchTable { + border-color:%FORM_STEP_BORDER%; + } + table#twikiSearchTable th, + table#twikiSearchTable td { + background-color:%GENERAL_BACKGROUND%; + border-color:%FORM_STEP_BORDER%; + } + table#twikiSearchTable hr { + border-color:%FORM_STEP_BORDER%; + background-color:%FORM_STEP_BORDER%; + } + table#twikiSearchTable th { + color:%SHADE_BLUEISH_TEXT%; + } + + /* ----------------------------------------------------------- + Search results + styles and overridden styles used in search.pattern.tmpl + ----------------------------------------------------------- */ + + h3.patternSearchResultsHeader, + h4.patternSearchResultsHeader { + background-color:%ATTACHMENT_AND_FORM_BACKGROUND%; + border-color:%SEPARATOR_BORDER%; + } + h4.patternSearchResultsHeader { + color:%SHADE_BLUEISH_TEXT%; + } + .patternNoViewPage h4.patternSearchResultsHeader { + color:%HEADER_TEXT%; + } + .patternSearchResult .twikiBottomRow { + border-color:%MINOR_SEPARATOR_BORDER%; + } + .patternSearchResult .twikiAlert { + color:%ALERT_TEXT%; + } + .patternSearchResult .twikiSummary .twikiAlert { + color:%ALERT_TEXT_MUTED%; + } + .patternSearchResult .twikiNew { + background-color:%NEW_BACKGROUND%; + border-color:%NEW_TEXT%; + color:%NEW_TEXT%; + } + .patternViewPage .patternSearchResultsBegin { + border-color:%TABLE_BORDER%; + } + + /* Search results in book view format */ + + .patternBookView .twikiTopRow { + background-color:transparent; /* set to WEBBGCOLOR in css.pattern.tmpl */ + color:%MUTED_TEXT%; + } + .patternBookView .twikiBottomRow { + border-color:%TABLE_BORDER%; + } + .patternBookView .patternSearchResultCount { + color:%GRAYED_OUT_TEXT%; + } + + /* preview.pattern.tmpl */ + + .twikiPreviewArea { + border-color:%ALERT_BORDER%; + background-color:%MAIN_BACKGROUND_COLOR%; + } + + /* rdiff.pattern.tmpl */ + + .patternDiff { + border-color:%TABLE_HEADER_BACKGROUND%; + } + .patternDiff h4.patternSearchResultsHeader { + background-color:%TABLE_HEADER_BACKGROUND%; + color:%LIGHT_ON_DARK_TEXT_COLOR%; + } + .patternDiff h4.patternSearchResultsHeader a:link, + .patternDiff h4.patternSearchResultsHeader a:visited { + color:%LIGHT_ON_DARK_TEXT_COLOR%; + } + tr.twikiDiffDebug td { + border-color:%TABLE_BORDER%; + } + .patternDiffPage .twikiDiffTable th { + background-color:%DIFF_HEADER_BACKGROUND%; + } + /* Changed */ + .twikiDiffChangedHeader, + tr.twikiDiffDebug .twikiDiffChangedText, + tr.twikiDiffDebug .twikiDiffChangedText { + background:#9f9; /* green - do not change */ + } + /* Deleted */ + .twikiDiffDeletedHeader, + tr.twikiDiffDebug .twikiDiffDeletedMarker, + tr.twikiDiffDebug .twikiDiffDeletedText { + background-color:#f99; /* red - do not change */ + } + /* Added */ + .twikiDiffAddedHeader, + tr.twikiDiffDebug .twikiDiffAddedMarker, + tr.twikiDiffDebug .twikiDiffAddedText { + background-color:#ccf; /* violet - do not change */ + } + /* Unchanged */ + tr.twikiDiffDebug .twikiDiffUnchangedText { + color:%GRAYED_OUT_TEXT%; + } + .twikiDiffUnchangedTextContents { } + .twikiDiffLineNumberHeader { + background-color:%DIFF_HEADER_BACKGROUND%; + } + + /* IMAGES */ + /* image positions are set here as well as these are dependent on the image */ + + .patternTopic h2.twikinetRoundedAttachments { + padding-top:0; + padding-right:11px; + background:url(bg_header_right.gif) top right no-repeat; + } + .patternTopic h2.twikinetRoundedAttachments .twikinetHeader { + display:block; + padding-top:.4em; /* same as h2 */ + padding-left:11px; + padding-right:11px; + margin-left:-11px; + background:url(bg_header.gif) top left no-repeat; + } + .patternTopic .twikiFormSteps h2.twikinetRoundedAttachments, + .patternTopic .twikiFormSteps h2.twikinetRoundedAttachments .twikinetHeader, + .patternTopic blockquote h2.twikinetRoundedAttachments, + .patternTopic blockquote h2.twikinetRoundedAttachments .twikinetHeader { + background:none; + } + .twikiToc li { + background-image:url(bullet-toc.gif); + background-repeat:no-repeat; + background-position:0 .4em; + } + #patternTopBar { + background-image:url(bg_topbar_gradient.gif); + background-repeat:repeat-x; + } + #twikinetLogo { + background-image:url(logo_twiki_net_faded.gif); + background-repeat:no-repeat; + } + #patternLeftBar, + #patternWrapper { + background-image:url(bg_leftbar_gradient.gif); + background-repeat:repeat-y; + } + .patternPrintPage #patternOuter { + background:#fff; /* white - do not change */ + } + + /* start buttons */ + .twikiSubmit, + .twikiSubmitDisabled { + background-image:url(bg_button_submit.gif); + background-repeat:repeat-x; + } + .twikiSubmit, + a.twikiSubmit:link, + a.twikiSubmit:visited { + background-position:0px 0px; + background-color:#9eafd0; + border-color:#dee4f0 #96a3bc #96a3bc #dee4f0; + color:%SHADE_BLUEISH_TEXT%; + } + .twikiSubmit:hover, + a.twikiSubmit:hover { + background-position:0px -80px; + background-color:#7589b2; + border-color:#cbd3e4 #8391af #8391af #cbd3e4; + color:%SHADE_BLUEISH_TEXT%; + } + .twikiSubmit:active, + a.twikiSubmit:active { + background-position:0px -160px; + background-color:#fff; + border-color:#96a3bc #dee4f0 #dee4f0 #96a3bc; + color:%SHADE_BLUEISH_TEXT%; + } + .twikiButton, + a.twikiButton:link, + a.twikiButton:visited { + background-image:url(bg_button.gif); + background-repeat:repeat-x; + background-position:0px 0px; + border-color:#e9ebf1 #a2adbf #a2adbf #e9ebf1; + background-color:#d9dee7; + color:%SHADE_BLUEISH_TEXT%; + } + .twikiButton:hover, + .twikiChangeFormButtonHolder .twikiButton:hover, + a.twikiButton:hover { + background-position:0px -80px; + border-color:#e9ebf1 #a2adbf #a2adbf #e9ebf1; + background-color:#fff; + color:%SHADE_DARKISH_TEXT%; + } + .twikiButton:active, + .twikiChangeFormButtonHolder .twikiButton:active, + a.twikiButton:active { + background-position:0px -160px; + border-color:#a2adbf #e9ebf1 #e9ebf1 #a2adbf; + background-color:#fff; + color:%SHADE_DARKISH_TEXT%; + } + .twikiSubmitDisabled, + .twikiSubmitDisabled:hover, + .twikiSubmitDisabled:active, + .twikiButtonDisabled, + .twikiButtonDisabled:hover, + .twikiButtonDisabled:active { + background-image:url(bg_button.gif); + background-repeat:repeat-x; + background-position:0px -240px; + border-color:#dce0e7; + background-color:#e1e5ed; + color:#ccc; + } + .twikiButtonCancel { + background-image:url(bg_button_cancel.gif); + background-repeat:repeat-x; + background-position:0px 0px; + border-color:#fcdfe0 #cca6ae #cca6ae #fcdfe0; + background-color:#c6afb6; + color:%SHADE_BLUEISH_TEXT%; + } + .twikiButtonCancel:hover { + background-position:0px -80px; + border-color:#fcdfe0 #cca6ae #cca6ae #fcdfe0; + background-color:#b19aa0; + color:%SHADE_DARKISH_TEXT%; + } + .twikiButtonCancel:active { + background-position:0px -160px; + border-color:#cca6ae #fcdfe0 #fcdfe0 #cca6ae; + background-color:#fce2e2; + color:%SHADE_DARKISH_TEXT%; + } + /* end buttons */ + + .patternToolBar .patternButton a:link, + .patternToolBar .patternButton a:visited, + .patternToolBar .patternButton s, + .patternToolBar .patternButton strike { + background-image:url(bg_button.gif); + background-repeat:repeat-x; + } + .patternToolBar .patternButton a:link, + .patternToolBar .patternButton a:visited { + background-position:0px 0px; + border-color:#f8f6ec #b8b6ad #b8b6ad #f8f6ec; + background-color:#dbd9cf; + color:#333; + } + .patternToolBar .patternButton a:hover { + background-position:0px -80px; + border-color:#f4f2eb #a3a092 #a3a092 #f4f2eb; + background-color:#c2bfae; + color:#222; + } + .patternToolBar .patternButton a:active { + background-position:0px -160px; + border-color:#a3a092 #f4f2eb #f4f2eb #a3a092; + background-color:#e8e5d7; + color:#222; + } + .patternToolBar .patternButton s, + .patternToolBar .patternButton strike { + background-position:0px -240px; + border-color:#fcfbf9 #e3e2dd #e3e2dd #fcfbf9; + background-color:#edece6; + color:%DISABLED_TEXT%; + } + .patternTextareaButton { + border-color:#e9ebf1 #a2adbf #a2adbf #e9ebf1; + overflow:hidden; + } + .patternButtonFontSelector { + background-image:url(button_font_selector.gif); + width:33px; + height:16px; + } + .patternButtonFontSelectorProportional { + background-position:0 0; + } + .patternButtonFontSelectorMonospace { + background-position:0 -16px; + } + .patternButtonEnlarge, + .patternButtonShrink { + background-image:url(button_arrow.gif); + width:16px; + height:16px; + } + .patternButtonEnlarge { + background-position:0 0; + } + .patternButtonEnlarge:hover { + background-position:0 -42px; + } + .patternButtonEnlarge:active { + background-position:0 -84px; + } + .patternButtonShrink { + background-position:16px 0; + } + .patternButtonShrink:hover { + background-position:16px -42px; + } + .patternButtonShrink:active { + background-position:16px -84px; + } + + /* common settings */ + .patternLeftBarPersonal li, + li.patternLogOut, + li.patternLogIn { + padding-left:13px; + background-position:0 .4em; + background-repeat:no-repeat; + } + .patternLeftBarPersonal li { + background-image:url(bullet-personal_sidebar.gif); + } + .patternLeftBarPersonal li.patternLogOut { + background-image:url(bullet-lock.gif); + } + .patternLeftBarPersonal li.patternLogIn { + background-image:url(bullet-lock.gif); + } + + /* TWikiNetSkin colors */ + + #twikinetTopToolBar { + border-color:%SHADE_TOPTOOLBAR_BORDER%; + background-color:%SHADE_TOPTOOLBAR_BACKGROUND%; + } + .twikinetWebName h2, + .twikinetWebName a:link, + .twikinetWebName a:visited { + background:none; + color:%SHADE_TOPTOOLBAR_WEBNAME_TEXT%; + } + + /* TWikiNetSkin images */ + + #twikinetTopToolBar { + background-image:url(bg_toptoolbar_gradient.gif); + background-repeat:repeat-x; + } + + /* background behind search and jump */ + .twikinetSearchJumpLeft { + background-image:url(bg_search_jump.gif); + background-repeat:no-repeat; + } + .twikinetSearchJumpRight { + background-image:url(bg_search_jump.gif); + background-repeat:no-repeat; + background-position:top right; + width:5px; + } + .twikiInputField, + .twikiInputFieldReadOnly, + .twikiSelect { + background-image:url(bg_inputfield.gif); + } + .twikiInputField:active, + .twikiInputField:focus { + background-image:url(bg_inputfield_active.gif); + } + .twikinetJumpButton { + background-image:url(button_jump.gif); + } + .twikinetJumpButton:hover, + .twikinetJumpButton:active { + background-image:url(button_jump_hover.gif); + } + .twikinetSearchButton { + background-image:url(button_search.gif); + } + .twikinetSearchButton:hover, + .twikinetSearchButton:active { + background-image:url(button_search_hover.gif); + } + .twikinetToolBar a:link .rCRounded .rCTR, + .twikinetToolBar a:link .rCRounded .rCTL, + .twikinetToolBar a:link .rCRounded .rCBR, + .twikinetToolBar a:link .rCRounded .rCBL, + .twikinetToolBar a:visited .rCRounded .rCTR, + .twikinetToolBar a:visited .rCRounded .rCTL, + .twikinetToolBar a:visited .rCRounded .rCBR, + .twikinetToolBar a:visited .rCRounded .rCBL { + background-image:url(button_action.gif); + } + .twikinetToolBar a:hover .rCRounded .rCTR, + .twikinetToolBar a:hover .rCRounded .rCTL, + .twikinetToolBar a:hover .rCRounded .rCBR, + .twikinetToolBar a:hover .rCRounded .rCBL { + background-image:url(button_action_hover.gif); + } + .twikinetToolBar strike .rCRounded .rCTR, + .twikinetToolBar strike .rCRounded .rCTL, + .twikinetToolBar strike .rCRounded .rCBR, + .twikinetToolBar strike .rCRounded .rCBL { + background-image:url(button_action_disabled.gif); + } + .twikinetToolBar a .twikiLinkLabel { + color:%SHADE_BLUEISH_TEXT%; + } + .twikinetToolBar strike .twikiLinkLabel { + color:#cfd3d9; + } + .twikinetToolBar .twikinetEditIcon { + background-image:url(button_edit_icon.gif); + background-repeat:no-repeat; + background-position:2px 1px; + padding-left:25px; + } + .twikiTable th { + background-image:url(bg_table_header_gradient.gif); + background-repeat:repeat-x; + } + .twikiTable th.twikiSortedCol { + background-image:url(bg_table_header_sorted_gradient.gif); + background-repeat:repeat-x; + } + + /* Rounded table */ + + .twikinetWrapperTableT { + background-color:%SHADE_TWIKITABLE_HEADER_BACKGROUND%; + } + .twikinetWrapperTable table.twikiTable th { + border-top-color:%SHADE_TWIKITABLE_HEADER_BACKGROUND%; + } + .twikinetWrapperTableTL { + background-image:url(table_corner_TL.gif); + background-repeat:no-repeat; + } + .twikinetWrapperTableTR { + background-image:url(table_corner_TR.gif); + background-repeat:no-repeat; + background-position:100% 0; + } + .twikinetWrapperTableB { + background-color:%NEUTRAL_BORDER%; + } + .twikinetWrapperTableBL { + background-image:url(table_corner_BL.gif); + background-repeat:no-repeat; + background-position:0 100%; + height:10px; + } + .twikinetWrapperTableBR { + background-image:url(table_corner_BR.gif); + background-repeat:no-repeat; + background-position:100% 100%; + height:10px; + } + .twikiAttachments .twikiTable th, + .twikiForm th.twikiFormTableHRow { + background-image:url(bg_attachments_header_gradient.gif); + background-repeat:repeat-x; + } + .twikiAttachments .twikiTable th.twikiFirstCol, + .twikiForm th.twikiFormTableHRow { + /* hide left line */ + background-position:-1px 0; + } + .twikiAttachments .twikiTable th.twikiSortedCol, + .twikiForm th.twikiSortedCol { + background-image:url(bg_attachments_header_sorted_gradient.gif); + } + .twikiAttachments .twikiTable td.twikiSortedCol, + .twikiForm td.twikiSortedCol { + border-color:#dbdee7; + } + + /* Generic rounded objects, for twikiAttachments, twikiForm and twikiHelp */ + .twikinetRounded, + .twikiFormSteps { + background-color:%ATTACHMENT_AND_FORM_BACKGROUND%; + background-image:url(bg_form_bottom_gradient.gif); + background-repeat:repeat-x; + background-position:0 100%; + } + .twikinetRounded .rCRounded .rCTL { + background-image:url(rounded_TL.gif); + } + .twikinetRounded .rCRounded .rCTR { + background-image:url(rounded_TR.gif); + } + .twikinetRounded .rCRounded .rCBL { + background-image:url(rounded_BL.gif); + } + .twikinetRounded .rCRounded .rCBR { + background-image:url(rounded_BR.gif); + } + + .twikinetRoundedTopicActions { + background:none; + } + .twikinetRoundedTopicActions .rCRounded .rCTL, + .twikinetRoundedTopicActions .rCRounded .rCTR, + .twikinetRoundedTopicActions .rCRounded .rCBL, + .twikinetRoundedTopicActions .rCRounded .rCBR { + background-image:url(bg_topicactions.gif); + } + + .twikinetRoundedBroadcastMessage .rCRounded .rCTL, + .twikinetRoundedBroadcastMessage .rCRounded .rCTR, + .twikinetRoundedBroadcastMessage .rCRounded .rCBL, + .twikinetRoundedBroadcastMessage .rCRounded .rCBR { + background-image:url(bg_broadcastmessage.gif); + } + .twikinetRoundedBroadcastMessage .twikiBroadcastMessage { + background-image:url(icon_alert.gif); + background-repeat:no-repeat; + background-position:9px 12px; + padding-left:64px; + min-height:33px; /* at least height of icon */ + } + .twikinetRoundedHelp { + background:none; + } + .twikinetRoundedHelp .rCRounded .rCTL, + .twikinetRoundedHelp .rCRounded .rCTR, + .twikinetRoundedHelp .rCRounded .rCBL, + .twikinetRoundedHelp .rCRounded .rCBR { + background-image:url(bg_help.gif); + } + + #patternBottomBar { + background-image:url(bg_bottom_gradient.gif); + background-repeat:repeat-x; + } + #patternBottomBarContents #twikinetBadge { + float:right; + margin-left:10px; + } + + #attachhelpshow img, + #attachhelphide img, + #topicattachmentslistshow img, + #topicattachmentslisthide img, + #edithelpshow img, + #edithelphide img, + #renamehelpshow img, + #renamehelphide img{ + visibility:hidden; + } + #attachhelpshow, + #attachhelphide, + #topicattachmentslistshow, + #topicattachmentslisthide, + #edithelpshow, + #edithelphide, + #renamehelphide, + #renamehelpshow { + padding:0 0 0 7px; + margin:0 0 0 3px; + } + #attachhelpshow, + #topicattachmentslistshow, + #edithelpshow, + #renamehelpshow { + background:url(twisty_in.gif) no-repeat; + background-position:0 .1em; + background-position:0 50%; + } + #attachhelphide, + #topicattachmentslisthide, + #edithelphide, + #renamehelphide { + background:url(twisty_out.gif) no-repeat; + background-position:0 .1em; + background-position:0 50%; + } + + /* Preloads button hover images */ + .twikinetImageLoader { + background:url(button_action.gif); + background:url(button_action_hover.gif); + background:url(button_action_disabled.gif); + background:url(twisty_in.gif); + background:url(twisty_out.gif); + background:url(button_search_hover.gif); + background:url(button_jump_hover.gif); + visibility:hidden; + height:1px; + } + %ENDATTACH% diff --git a/TWiki/TWikiNetSkinPlugin.mdwn b/TWiki/TWikiNetSkinPlugin.mdwn new file mode 100644 index 0000000..7a3233a --- /dev/null +++ b/TWiki/TWikiNetSkinPlugin.mdwn @@ -0,0 +1,91 @@ +# [[TWikiNetSkin]] Plugin + +Helps [[TWikiNetSkin]] to render tables and h2 headers. This plugin is only enabled if the skin is set to `twikinet`. + +## Syntax Rules + +(none) + +## Plugin Settings + +Plugin settings are stored as preferences variables. To reference a plugin setting write **%<plugin>\_<setting>%**, i.e. **%TWIKINETSKINPLUGIN\_SHORTDESCRIPTION%** + +- One line description, is shown in the [[TextFormattingRules]] topic: + - Set SHORTDESCRIPTION = Helps [[TWikiNetSkin]] to render tables and h2 headers + +- Debug plugin: ( TWiki sets `$debug` in your plugin. See output in `data/debug.txt`.) + - Set DEBUG = 0 + +## Plugin Installation Instructions + +- Download the ZIP file from the Plugin web (see below) +- Unzip **%TOPIC%.zip** in your root ($TWIKI\_ROOT) directory. Content: + + + + + + + + + + + + +
    File: Description:
    data/TWiki/%TOPIC%.txt  
    lib/TWiki/Plugins/%TOPIC%.pm  
    + +- Optionally, if it exists, run **%TOPIC%\_installer** to automatically check and install other TWiki modules that this module depends on. You can also do this step manually. +- Alternatively, manually make sure the dependencies listed in the table below are resolved. None +- Visit `configure` in your TWiki installation, and enable the plugin in the \{Plugins\} section. +- Set the skin to `twikinet` (together with `pattern`): %BR% `* Set SKIN = twikinet,pattern` + +## Plugin Info + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Plugin Author: TWiki:Main.ArthurClemens
    License: GPL (GNU General Public License)
    Plugin Version: 17859 (30 Mar 2009)
    Change History:  
    30 Jul 2007: Initial version
    TWiki Dependency: $TWiki::Plugins::VERSION 1.1
    Dependencies: %$DEPENDENCIES
    TWiki:Plugins/Benchmark: [[TWiki/GoodStyle]] 99%, [[TWiki/FormattedSearch]] 99%, %TOPIC% 99%
    Plugin Home: http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%
    Feedback: http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Dev
    Appraisal: http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal
    + +**_Related Topics:_** [[TWikiPlugins]], [[DeveloperDocumentationCategory]], [[AdminDocumentationCategory]], [[TWikiPreferences]] diff --git a/TWiki/TWikiNetSkinWebCreateNewTopicTemplate.mdwn b/TWiki/TWikiNetSkinWebCreateNewTopicTemplate.mdwn new file mode 100644 index 0000000..408111c --- /dev/null +++ b/TWiki/TWikiNetSkinWebCreateNewTopicTemplate.mdwn @@ -0,0 +1,3 @@ +%TMPL:INCLUDE\{"WebCreateNewTopic"\}% + +%\{"hide page top controls"\}% %TMPL:DEF\{"toptoolbar:buttons"\}%%TMPL:END% diff --git a/TWiki/TWikiPreferences.mdwn b/TWiki/TWikiPreferences.mdwn index c280998..6cd6cd6 100644 --- a/TWiki/TWikiPreferences.mdwn +++ b/TWiki/TWikiPreferences.mdwn @@ -163,7 +163,7 @@ Preference settings local to your site should be set in [[Main.TWikiPreferences| ### Search Settings - Default type for search, one of: keyword (for search engine like syntax), regex (for [[RegularExpression]] search), or literal (for verbatim search) - - Set SEARCHDEFAULTTTYPE = keyword + - Set SEARCHDEFAULTTYPE = keyword - Default for `%SEARCH{}%` variable, one of: keyword, regex, or literal - Set SEARCHVARDEFAULTTYPE = literal - Stop words, e.g., common words and characters to exclude from a keyword search: @@ -226,7 +226,7 @@ Preference settings local to your site should be set in [[Main.TWikiPreferences| ### 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 @@ -337,7 +337,7 @@ Preference settings local to your site should be set in [[Main.TWikiPreferences| - Format of a [[NewWikiWord]] link: - Note that `$text` is the topic link text, `$topic` is the name of the new topic, and `$web` is the name of the web for the new topic. Values for the 3 are taken from the link syntax `[[$web.$topic][$text]]`. For normal plain WikiWord links `$text` and `$topic` are the same. The value of `$web` is the current web unless the link is in the format `$web.$topic`. - default setting: - - Set NEWLINKFORMAT = $text[?](http://www.dementia.org/twiki/edit/$web/$topic?topicparent=%WEB%.%TOPIC% Create this topic) + - Set NEWLINKFORMAT = [$text](http://www.dementia.org/twiki/edit/$web/$topic?topicparent=%WEB%.%TOPIC% $text (this topic does not yet exist; you can create it)) - alternative setting: - #Set NEWLINKFORMAT = [$text](http://www.dementia.org/twiki/edit/$web/$topic?topicparent=%WEB%.%TOPIC% Create this topic) diff --git a/TWiki/TWikiPreferencesForm.mdwn b/TWiki/TWikiPreferencesForm.mdwn index 4544363..cfea33e 100644 --- a/TWiki/TWikiPreferencesForm.mdwn +++ b/TWiki/TWikiPreferencesForm.mdwn @@ -234,7 +234,7 @@ S - SEARCHDEFAULTTTYPE + SEARCHDEFAULTTYPE select 1 keyword,literal,regex diff --git a/TWiki/TWikiReleaseNotes04x01.mdwn b/TWiki/TWikiReleaseNotes04x01.mdwn index f54040a..f6cd617 100644 --- a/TWiki/TWikiReleaseNotes04x01.mdwn +++ b/TWiki/TWikiReleaseNotes04x01.mdwn @@ -1,4 +1,4 @@ -# TWiki Release 4.1.2 (Edinburgh), 00:35:32 06 December 2008 +# TWiki Release 4.1.2 (Edinburgh), 02:05:01 30 March 2009 _Note: This is the release note for the previous major release version 4.1.X. This note and the [[TWikiReleaseNotes04x00]] are included with 4.2.X because they contain valuable information for people upgrading from earlier versions. Both for the admin and the users. See [[TWikiReleaseNotes04x02]] for the 4.2.X release notes_ @@ -1401,7 +1401,7 @@ None ## TWiki 4.1.2 Patch Release Details -The 4.1.2 release was built from SVN revision 17773 (06 Dec 2008) (00:35:32 06 December 2008). +The 4.1.2 release was built from SVN revision 17948 (30 Mar 2009) (02:05:01 30 March 2009). TWiki 4.1.1 Fixes diff --git a/TWiki/TWikiReleaseNotes04x02.mdwn b/TWiki/TWikiReleaseNotes04x02.mdwn index a8b4d0e..0e506a9 100644 --- a/TWiki/TWikiReleaseNotes04x02.mdwn +++ b/TWiki/TWikiReleaseNotes04x02.mdwn @@ -1,11 +1,10 @@ -# TWiki Release 4.2.4 (Georgetown), 00:35:32 06 December 2008 +# TWiki Release 4.2.2 (Freetown), 02:05:01 30 March 2009 @@ -70,7 +53,7 @@ TWiki 4.2.2 is a patch release which only contains bug fixes. The major issues f TWiki 4.2.3 is a patch release containing only the configure script as a security fix for TWiki:Codev.SecurityAlert-CVE-2008-3195. -TWiki 4.2.4 is a patch release which only contains over 30 bug fixes. This release also has a security fix for TWiki:Codev.SecurityAlert-CVE-2008-5304 and TWiki:Codev.SecurityAlert-CVE-2008-5305 +TWiki 4.2.4 is a patch release which only contains bug fixes. It is highly recommended to upgrade TWiki 4.2.x to 4.2.4. Users will find the 4.2.4 much more stable in daily use. @@ -112,14 +95,8 @@ TWiki 4.2.4 is shipped with - Table of Content (TOC) feature enhanced - User Mapping (mapping between login name and WikiName) code has been extended to allow pluggable modules to integrate with all sorts of alternative authentication and Management schemes. For normal cases you use the default TWikiUserMapping which is using the Main.TWikiUsers topic to map between login and WikiName. A new BaseUserMapping is provided for TWikis where you only have guests and an administrator. In this case you use the login and password given in configure to login as an admin. -## Important Changes since 4.2.4 - -This release was targeted for fixing maximum number of bugs. We have also fixed security issues listed at TWiki:Codev.SecurityAlert-CVE-2008-5304 and TWiki:Codev.SecurityAlert-CVE-2008-5305 - ## Important Changes since 4.2.3 -This release was targeted to fix the configure script as described security issue in TWiki:Codev.SecurityAlert-CVE-2008-3195. - ## Important Changes since 4.2.2 TWiki 4.2.3 is a patch release containing only the configure script as a security fix for TWiki:Codev.SecurityAlert-CVE-2008-3195. @@ -280,7 +257,7 @@ In Func getOopsUrl and permissionsSet have been declared deprecated. There is no The 4.2.0 release was built from SVN revision 16277 (22 Jan 2008) -### Fixes +## Fixes @@ -1081,7 +1058,7 @@ The 4.2.0 release was built from SVN - + @@ -1193,7 +1170,7 @@ The 4.2.0 release was built from SVN - + @@ -1201,7 +1178,7 @@ The 4.2.0 release was built from SVN - + @@ -1385,7 +1362,7 @@ The 4.2.0 release was built from SVN - + @@ -1469,7 +1446,7 @@ The 4.2.0 release was built from SVN
    [[BUGS/Item3803]] %USERINFO{format="$groups"}% crashes %!USERINFO{format="$groups"}% crashes
    [[BUGS/Item3796]]
    [[BUGS/Item3703]] &nbsp; in the size field of a form will crash the forms code & nbsp; in the size field of a form will crash the forms code
    [[BUGS/Item3690]]
    [[BUGS/Item3689]] CommentPlugin location only works if it is above the %COMMENT... variable CommentPlugin location only works if it is above the %COMMENT... tag
    [[BUGS/Item3688]]
    [[BUGS/Item2772]] Mailto link should use %20 instead of &#32; for spaces Mailto link should use %20 instead of for spaces
    [[BUGS/Item2690]]
    -### Enhancements +## Enhancements @@ -1730,7 +1707,7 @@ The 4.2.0 release was built from SVN revision 17311 (03 Aug 2008) -### Fixes +## Fixes
    @@ -2367,7 +2344,7 @@ The 4.2.1 release was built from SVN
    -### Enhancements +## Enhancements None! @@ -2375,7 +2352,7 @@ None! The 4.2.2 release was built from SVN revision 17396 (10 Aug 2008). -### Fixes +## Fixes @@ -2420,166 +2397,8 @@ The 4.2.2 release was built from SVN
    -### Enhancements +## Enhancements None! -## TWiki 4.2.3 Patch Release - Details - -### Fixes - -Only security issue from "configure" script as described in TWiki:Codev.SecurityAlert-CVE-2008-3195. was fixed in this release. - -### Enhancements - -None! - -## TWiki 4.2.4 Patch Release - Details - -### Fixes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    [[BUGS/Item5967]] viewfile partly broken
    [[BUGS/Item6136]] User input is passed to the perl "eval" command without first being sanitized.
    [[BUGS/Item5937]] move initialization of SwitchBoard to TWiki.spec
    [[BUGS/Item6089]] backslash at end of line inside verbatim and pre being used as line continuation
    [[BUGS/Item6135]] changes required in TWikiUserMappings.pm required to support registration in case PasswordManager is LdapUser
    [[BUGS/Item5961]] WysiwygPlugin and TWiki's odd idea of needing a space before *'s causes user surprise.
    [[BUGS/Item5865]] TablePlugin should support rowspan from header row
    [[BUGS/Item6082]] deep recursion bug in query search
    [[BUGS/Item5979]] add non-alarmist PerlOnRedHatIsSlow detection to configure
    [[BUGS/Item6005]] EditTable changes "label"-formatted cell in unexpected way
    [[BUGS/Item6061]] TWiki::Func::getContext documentation
    [[BUGS/Item5939]] Rogue <p /> below </html> on every topic in every web
    [[BUGS/Item6108]] Add documentation for customising the registration emails
    [[BUGS/Item6054]] No longer possible to have a twisty on one line without linebreak
    [[BUGS/Item5176]] %SCRIPTSUFFIX is added twice in TOC links
    [[BUGS/Item6060]] configure's get more extensions seems to require LWP
    [[BUGS/Item6043]] TWiki::Sandbox::sysCommand leads to errors with Plugins.FastCGIEngineContrib
    [[BUGS/Item5991]] JSCalendarContrib does not work correctly in IE7
    [[BUGS/Item6026]] With header format emtpy table is initialized with one column only
    [[BUGS/Item6050]] statistics script fails when cuid is not equal login name (as login is whats in the log files...)
    [[BUGS/Item6095]] Registration confirmation page fails to display when user confirmation e-mail can't be sent
    [[BUGS/Item5914]] TWiki::Request::url() must support -rewrite, -absolute and -relative
    [[BUGS/Item5852]] Split out operators into seperate modules, so that extensions can plug in new operators
    [[BUGS/Item5994]] Turn on taint mode in configure and fix the problems
    [[BUGS/Item5943]] TWikiRegistrationAgent should be in Main's ALLOWWEBCHANGE by default
    [[BUGS/Item6031]] TablePlugin date sorting is broken.
    [[BUGS/Item2525]] TablePlugin produces bad links for sorting when using "short" URLs
    [[BUGS/Item5957]] htdigest format password file gets stomped on password or email change/reset
    [[BUGS/Item6066]] MailerContrib makes an assumption that cuid equal loginname
    [[BUGS/Item5910]] %TOC% variable creates links with unecessary query string
    [[BUGS/Item5922]] $formfield data not being displayed in formatted searches
    [[BUGS/Item6022]] %ENCODE{}% treats % as safe character
    [[BUGS/Item6062]] EditTablePlugin destroys verbatim-tags
    - -### Enhancements - - - - - - -
    [[BUGS/Item4875]] Add javascript function 'makeSafeForTableEntry'
    - **_Related Topic:_** [[TWikiHistory]] diff --git a/TWiki/TWikiReleaseNotes04x03.mdwn b/TWiki/TWikiReleaseNotes04x03.mdwn new file mode 100644 index 0000000..cecd5a9 --- /dev/null +++ b/TWiki/TWikiReleaseNotes04x03.mdwn @@ -0,0 +1,291 @@ +# TWiki Release 4.3 (Georgetown), 2009-03-30 + + + +## Introduction + +TWiki 4.3.0 released on 30 Mar 2009 introduces security enhancements, usability enhancements, feature enhancements, and adds extensions to strengthen TWiki as an enterprise collaboration platform. + +It is highly recommended to upgrade to TWiki 4.3.0. Users will find this release much more stable and secure in daily use. + +## Pre-installed Extensions + +TWiki 4.3 is ships with: + +- **Plugins:** CommentPlugin, EditTablePlugin, EmptyPlugin, HeadlinesPlugin, InterwikiPlugin, PreferencesPlugin, RenderListPlugin, SlideShowPlugin, SmiliesPlugin, SpreadSheetPlugin, TablePlugin, TinyMCEPlugin, TWikiNetSkinPlugin, TwistyPlugin, WysiwygPlugin +- **Contribs:** BehaviourContrib, JSCalendarContrib, MailerContrib, TipsContrib, TWikiUserMappingContrib, TwistyContrib +- **Skins:** ClassicSkin, PatternSkin, TWikiNetSkin, + +**_Note:_** HeadlinesPlugin, TWikiNetSkin and TWikiNetSkinPlugin are new in TWiki 4.3. + +## New Features Highlights + +- **Security Enhancements** + - Reduced risk of XSS ([cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting)) + - S/MIME support to sign administrative e-mails +- **Usability Enhancements** + - Replace question mark links with red-links to point to non-existing topics +- **Enterprise Collaboration Enhancements** + - Pre-installed HeadlinesPlugin to show headline newsfeeds in TWiki topics + - Pre-installed TWikiNetSkin, TWikiNetSkinPlugin for corporate look and feel +- **Search Enhancements** + - Add footer parameter to Formatted Search + - Add number of topics to Formatted Search +- **Miscellaneous Feature Enhancements** + - Control over variable expansion at topic creation time + - 17 new TWikiDocGraphics images + - Include URL supports list of domains to exclude from proxy + - Adding Korean language +- **Plugin Enhancements** + - SpreadSheetPlugin: 5 new functions + +## Important Changes in 4.3.0 + +### Highlights of bug fixes in 4.3.0 + +- Security: + - Review code for robustness and security + - Secure configure script with taint mode turned on +- Rendering: + - %TOC% does not distinguish two headlines that have the same text + - TablePlugin produces bad links for sorting when using "short" URLs + - %SCRIPTSUFFIX% is added twice in %TOC% links + - Incorrect Content-length breaks HTTP headers, a.o. pound fail results + - TablePlugin: Date sorting is broken + - Bullet lists in form fields are not rendered properly + - TWiki Forms expand variables like $nop, $quote $percnt + - TwistyPlugin: Twisty can't be placed in TWiki table cells +- Users and groups: + - TWikiGroups shows all members twice +- Editing: + - WysiwygPlugin: Bolding single character within a word introduces spaces around bolded character +- Miscellaneous: + - configure's get more extensions does not work well without LWP + - CommentPlugin: Lost data if it's targeted before/after a missing anchor + - Plugin installation fails on windows: extender.pl line 684 + - Statistics script does not handle properly topics with special characters + +See the full list of bug fixes at the bottom of this topic. + +## Important Changes in Recent Releases + +## Deprecation Notices + +The %MAINWEB% and %TWIKIWEB% variables have been deprecated. For compatibility reasons they are unlikely to ever be removed completely, but you should use the %USERSWEB% and %SYSTEMWEB% variables instead. + +In Func getOopsUrl and permissionsSet have been declared deprecated. There is no plan to remove them yet. + +## TWiki 4.3.0 Minor Release - Details + +The 4.3.0 release was built from SVN revision 17948 (30 Mar 2009) + +## Enhancements in TWiki 4.3.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    [[BUGS/Item3647]] Usability: Control over variable expansion in topic templates
    [[BUGS/Item5025]] InterwikiPlugin: Allow special characters in "Page" of Site:Page
    [[BUGS/Item6148]] HeadlinesPlugin: Support for {PROXY}{HOST} and {PROXY}{PORT} configure settings
    [[BUGS/Item6176]] Search: Add footer parameter to Formatted Search
    [[BUGS/Item6180]] HeadlinesPlugin: Support for {PROXY}{SkipProxyForDomains} configure setting, USERAGENTNAME plugin setting
    [[BUGS/Item6184]] Search: Add Number of Topics to Formatted Search
    [[BUGS/Item6189]] Usability: Replace question mark links with red links to point to non-existing topics
    [[BUGS/Item6199]] Enhancement: Add TWikiNetSkin to Distribution
    [[BUGS/Item6200]] Enhancement: Add HeadlinesPlugin to Distribution
    [[BUGS/Item6222]] SpreadSheetPlugin: New functions $EMPTY(), $INSERTSTRING(), $LEFTSTRING(), $RIGHTSTRING(), $SUBSTRING() functions
    [[BUGS/Item6226]] Include: Specify a list of domains to exclude from proxy with {PROXY}{SkipProxyForDomains} setting
    [[BUGS/Item6227]] Documentation: 17 new TWikiDocGraphics images
    [[BUGS/Item6228]] Security: Option to send signed e-mail with S/MIME
    + +## Fixes in TWiki 4.3.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    [[BUGS/Item1607]] %TOC% does not distinguish two headlines that have the same text
    [[BUGS/Item2525]] TablePlugin produces bad links for sorting when using "short" URLs
    [[BUGS/Item4835]] SpreadSheetPlugin: SUBSTITUTE error when text=old and replace is empty
    [[BUGS/Item5176]] %SCRIPTSUFFIX% is added twice in %TOC% links
    [[BUGS/Item5471]] SpreadSheetPlugin: The character 0 cannot be replaced using the REPLACE-funtion
    [[BUGS/Item5910]] TablePlugin: %TOC% variable creates links with unecessary query string
    [[BUGS/Item5914]] TWiki::Request::url() must support -rewrite, -absolute and -relative
    [[BUGS/Item5920]] TWikiGroups shows all members twice
    [[BUGS/Item5939]] Rogue <p /> below </html> on every topic in every web
    [[BUGS/Item5960]] Incorrect Content-length breaks HTTP headers, a.o. pound fail results
    [[BUGS/Item5961]] WysiwygPlugin: Bolding single character within a word introduces spaces around bolded character
    [[BUGS/Item5991]] JSCalendarContrib: Does not work correctly in IE7
    [[BUGS/Item5994]] Secure configure script with taint mode turned on
    [[BUGS/Item6005]] EditTablePlugin: "label"-formatted cell changed in unexpected way
    [[BUGS/Item6022]] %ENCODE{}% treats % as safe character
    [[BUGS/Item6026]] With header format emtpy table is initialized with one column only
    [[BUGS/Item6031]] TablePlugin: Date sorting is broken.
    [[BUGS/Item6041]] TinyMCE bug with Firefox 3 and bulleted lists
    [[BUGS/Item6050]] statistics script fails when cuid is not equal login name (as login name is what's in the log files...)
    [[BUGS/Item6054]] TwistyPlugin: No longer possible to have a twisty on one line without linebreak
    [[BUGS/Item6060]] configure's get more extensions does not work well without LWP
    [[BUGS/Item6061]] TWiki::Func::getContext documention
    [[BUGS/Item6138]] Bullet lists in form fields are not rendered properly
    [[BUGS/Item6163]] CommentPlugin: Lost data if it's targeted before/after a missing anchor.
    [[BUGS/Item6167]] TWiki Forms expand variables like $nop, $quote $percnt
    [[BUGS/Item6170]] Plugin installation fails on windows: extender.pl line 684
    [[BUGS/Item6171]] Per RFC 5321, single quote is allwed in e-mail addresses
    [[BUGS/Item6178]] Statistics script does not handle properly topics with special characters
    [[BUGS/Item6185]] Missing newline in Formatted Search if footer used
    [[BUGS/Item6186]] Review code for robustness and security
    [[BUGS/Item6208]] WebChanges does not work on Windows
    [[BUGS/Item6220]] TwistyPlugin: Twisty can't be placed in TWiki table cells
    [[BUGS/Item6223]] Users can't edit content in Main web
    + +**_Related Topic:_** [[TWikiHistory]] diff --git a/TWiki/TWikiSystemRequirements.mdwn b/TWiki/TWikiSystemRequirements.mdwn index 8bcc867..461e22a 100644 --- a/TWiki/TWikiSystemRequirements.mdwn +++ b/TWiki/TWikiSystemRequirements.mdwn @@ -68,7 +68,7 @@ The following Perl modules are used by TWiki: Preferred version - Algorithm::Diff (included) + Algorithm::Diff (included in TWiki distribution)   @@ -88,7 +88,11 @@ The following Perl modules are used by TWiki: >=2.121 - Error (included) + Encode + >=2.1 + + + Error (included in TWiki distribution)   @@ -116,7 +120,7 @@ The following Perl modules are used by TWiki: >=1.10 - Text::Diff (included) + Text::Diff (included in TWiki distribution)   diff --git a/TWiki/TWikiTemplates.mdwn b/TWiki/TWikiTemplates.mdwn index 5ff1106..65d8463 100644 --- a/TWiki/TWikiTemplates.mdwn +++ b/TWiki/TWikiTemplates.mdwn @@ -14,7 +14,12 @@ _Definition of the templates used to render all HTML pages displayed in TWiki_
  • Template Topics
      -
    • Variable Expansion
      • +
    • Variable Expansion +
    • Specifying a Form
    • Automatically Generated Topic Names
    • Template Topics in Action
      • @@ -213,7 +218,13 @@ When you create a new topic using the `edit` script, TWiki locates a topic to us ### Variable Expansion -When the following variables are used in a template topic, they automatically get expanded when new topic is created based on it: +[[TWikiVariables]] located in template topics get expanded as follows when a new topic is created. + + + +#### 1. Default variable expansion + +The following variables used in a template topic automatically get expanded when new topic is created based on it: @@ -254,7 +265,7 @@ When the following variables are used in a template topic, they automatically ge - + @@ -266,18 +277,50 @@ When the following variables are used in a template topic, they automatically ge
      %URLPARAM{"name"}% Value of a named URL parameter Value of a named URL parameter. See [[Main/VarURLPARAM]].
      %WIKINAME%
      -`%STARTSECTION{type="templateonly"}%%BR%...%BR%%ENDSECTION{type="templateonly"}%` markers are used to embed text that you _do not_ want expanded when a new topic based on the template topic is created. For example, you might want to write in the template topic: + + +#### 2. Preventing variable expansion + +In a template topic, embed text that you _do not_ want expanded inside a `%STARTSECTION{type="templateonly"}% ... %ENDSECTION{type="templateonly"}%` section. For example, you might want to write this in the template topic: %STARTSECTION{type="templateonly"}% This template can only be changed by: * Set ALLOWTOPICCHANGE = %USERSWEB%.TWikiAdminGroup %ENDSECTION{type="templateonly"}% -This will restrict who can edit the template topic, but will get removed when a new topic based on that template topic is created. +This will restrict who can edit the template topic, but will be removed when a new topic based on that template topic is created. + +`%NOP%` can be used to prevent expansion of TWiki variables that would otherwise be expanded during topic creation. For example, escape `%SERVERTIME%` with `%SER%NOP%VERTIME%`. + + + +#### 3. Control over variable expansion + +You can forcefully expand [[TWikiVariables]] by placing them inside a `type="expandvariables"` section in the template topic, such as: + + %STARTSECTION{ type="expandvariables" }% ... %ENDSECTION{ type="expandvariables" }% + +Example: + +If you have the following content in a template topic: + + %STARTSECTION{ type="expandvariables" }% + * %TWIKIWEB%.ATasteOfTWiki - view a short introductory presentation on TWiki for beginners + * %TWIKIWEB%.WelcomeGuest - starting points on TWiki + * %TWIKIWEB%.TWikiUsersGuide - complete TWiki documentation + * Sandbox.%HOMETOPIC% - try out TWiki on your own + * Sandbox.%TOPIC%Sandbox - just for me + %ENDSECTION{ type="expandvariables" }% + +you will get this raw text in new topics based on that template topic: -`%NOP%` can be used to prevent expansion of TWiki variables that would otherwise be expanded during topic creation e.g.i escape `%SERVERTIME%` with `%SER%NOP%VERTIME%`. + * TWiki.ATasteOfTWiki - view a short introductory presentation on TWiki for beginners + * TWiki.WelcomeGuest - starting points on TWiki + * TWiki.TWikiUsersGuide - complete TWiki documentation + * Sandbox.WebHome - try out TWiki on your own + * Sandbox.JimmyNeutronSandbox - just for me -All other variables are unchanged, e.g. are carried over "as is" into the new topic. + ### Specifying a Form @@ -335,4 +378,4 @@ When you use [[TWikiVariables]] such as %PUBURL% and %PUBURLPATH% in templates y **_Related Topics:_** [[TWikiSkins]], [[DeveloperDocumentationCategory]], [[AdminDocumentationCategory]] --- **_Contributors:_** TWiki:Main.PeterThoeny, TWiki:Main.MikeMannix, TWiki:Main.DavidLeBlanc, TWiki:Main.CrawfordCurrie +-- **_Contributors:_** TWiki:Main.PeterThoeny, TWiki:Main.MikeMannix, TWiki:Main.DavidLeBlanc, TWiki:Main.CrawfordCurrie, TWiki:Main.SopanShewale diff --git a/TWiki/TinyMCEPlugin.mdwn b/TWiki/TinyMCEPlugin.mdwn index 69816dc..af492ad 100644 --- a/TWiki/TinyMCEPlugin.mdwn +++ b/TWiki/TinyMCEPlugin.mdwn @@ -145,7 +145,7 @@ Another great TWiki extension from the [![](http://www.dementia.org/twiki//view/ Plugin Version: - 03 Aug 2008 17302 (06 Dec 2008) + 03 Aug 2008 17302 (30 Mar 2009) Copyright: diff --git a/TWiki/TwistyContrib.mdwn b/TWiki/TwistyContrib.mdwn index d2aaab2..8365dca 100644 --- a/TWiki/TwistyContrib.mdwn +++ b/TWiki/TwistyContrib.mdwn @@ -193,7 +193,7 @@ You can also set the global TWiki variable TWISTYCONTRIB\_DEBUG to 1 to make the Version: - 17595 (06 Dec 2008) + 17595 (30 Mar 2009) Change History: diff --git a/TWiki/VarENCODE.mdwn b/TWiki/VarENCODE.mdwn index 1cbc42c..8fbf776 100644 --- a/TWiki/VarENCODE.mdwn +++ b/TWiki/VarENCODE.mdwn @@ -19,6 +19,11 @@ required (can be empty) + type="safe" + Encode special characters into HTML entities to avoid XSS exploits: "<", ">", "%", single quote (') and double quote (") + type="url" + + type="entity" Encode special characters into HTML entities, like a double quote into &#034;. Does not encode \n or \r. type="url" @@ -40,7 +45,9 @@ - Example: `%ENCODE{"spaced name"}%` expands to `spaced%20name` -- **_%X% Note:_** Values of HTML input fields must be entity encoded.%BR% Example: `` -- **_%X% Note:_** Double quotes in strings must be escaped when passed into other TWiki variables.%BR% Example: `%SEARCH{ "%ENCODE{ "string with "quotes"" type="quotes" }%" noheader="on" }%` +- **_%X% Notes:_** + - Values of HTML input fields must be entity encoded.%BR% Example: `` + - Double quotes in strings must be escaped when passed into other TWiki variables.%BR% Example: `%SEARCH{ "%ENCODE{ "string with "quotes"" type="quotes" }%" noheader="on" }%` + - Use `type="entity"` or `type="safe"` to protect user input from URL parameters and external sources against cross-site scripting (XSS). `type="entity"` is more aggressive, but some TWiki applications might not work. `type="safe"` provides a safe middle ground. - Related: [[URLPARAM|Main/VarURLPARAM]] diff --git a/TWiki/VarENDSECTION.mdwn b/TWiki/VarENDSECTION.mdwn index ee325ce..a458b7f 100644 --- a/TWiki/VarENDSECTION.mdwn +++ b/TWiki/VarENDSECTION.mdwn @@ -4,6 +4,8 @@ - Syntax: `%ENDSECTION{"name"}%` - Syntax: `%ENDSECTION{type="include"}%` +- Syntax: `%ENDSECTION{type="templateonly"}%` +- Syntax: `%ENDSECTION{type="expandvariables"}%` - Supported parameter: @@ -15,7 +17,7 @@ - +
      Parameter:
      type="..." Type of the section being terminated; supported types "section", "include", "templateonly". Type of the section being terminated; supported types "section", "include", "templateonly", "expandvariables"
      - If the `STARTSECTION` is named, the corresponding `ENDSECTION` must also be named with the same name. If the `STARTSECTION` specifies a type, then the corresponding `ENDSECTION` must also specify the same type. If the section is unnamed, `ENDSECTION` will match with the nearest unnamed `%STARTSECTION%` **of the same type** above it. diff --git a/TWiki/VarINCLUDE.mdwn b/TWiki/VarINCLUDE.mdwn index adff4b5..b638b53 100644 --- a/TWiki/VarINCLUDE.mdwn +++ b/TWiki/VarINCLUDE.mdwn @@ -2,6 +2,7 @@ ### INCLUDE\{"page"\} -- include other topic or web page +- Merges the content of a specified page into the current one before rendering. - Syntax: `%INCLUDE{"page" ...}%` - Supported parameters: diff --git a/TWiki/VarSEARCH.mdwn b/TWiki/VarSEARCH.mdwn index b6eb62b..9d30145 100644 --- a/TWiki/VarSEARCH.mdwn +++ b/TWiki/VarSEARCH.mdwn @@ -111,7 +111,7 @@ - + diff --git a/TWiki/VarSTARTSECTION.mdwn b/TWiki/VarSTARTSECTION.mdwn index 0b26c11..de6573f 100644 --- a/TWiki/VarSTARTSECTION.mdwn +++ b/TWiki/VarSTARTSECTION.mdwn @@ -6,10 +6,12 @@ - Sections may be given a name to help identify them, and/or a type, which changes how they are used. - `type="section"` - the default, used for a generic section, such as a named section used by [[INCLUDE|Main/VarINCLUDE]]. - `type="include"` - like `%STARTINCLUDE%` ... `%STOPINCLUDE%` except that you can have as many include blocks as you want (`%STARTINCLUDE%` is restricted to only one). - - `type="templateonly"` - start position of text to be removed when a template topic is used. This is used to embed text that you _do not_ want expanded when a new topic based on the template topic is created. See [[TWikiTemplates]] for more information. -- Syntax: `%STARTSECTION{"name"}% ................ %ENDSECTION{"name"}%` -- Syntax: `%STARTSECTION{type="include"}% ........ %ENDSECTION{type="include"}%` -- Syntax: `%STARTSECTION{type="templateonly"}% ... %ENDSECTION{type="templateonly"}%` + - `type="templateonly"` - start position of text to be removed when a template topic is used. Use this to embed text that you _do not_ want expanded when a new topic based on the template topic is created. [[TWikiTemplates]] has more. + - `type="expandvariables"` - start position where [[TWikiVariables]] get expanded when a new topic is created. Normally only certain variables get expanded when a new topic based on the template topic is created. All variables get expanded within a `"expandvariables"` section. [[TWikiTemplates]] has more. +- Syntax: `%STARTSECTION{"name"}% ................... %ENDSECTION{"name"}%` +- Syntax: `%STARTSECTION{type="include"}% ........... %ENDSECTION{type="include"}%` +- Syntax: `%STARTSECTION{type="templateonly"}% ...... %ENDSECTION{type="templateonly"}%` +- Syntax: `%STARTSECTION{type="expandvariables"}% ... %ENDSECTION{type="expandvariables"}%` - Supported parameters:
      Show webs with no hits
      header="..."
      format="..."      		header="..."
      format="..."
      footer="..."      		 Custom format results: see [[Main/FormattedSearch]] for usage, variables & examples Results in table
      @@ -23,10 +25,10 @@ - +
      Parameter:
      type="..." Type of the section; type "section", "include" or "templateonly" Type of the section; type "section", "include", "templateonly", or "expandvariables" "section"
      - **_%X% Note:_** If a section is not given a name, it will be assigned one. Unnamed sections are assigned names starting with `_SECTION0` for the first unnamed section in the topic, `_SECTION1` for the second, etc.. -- **_%X% Note:_** You can define nested sections. It is not recommended to overlap sections, although it is valid in TWiki. Use named sections to make sure that the correct START and ENDs are matched. Section markers are **not** displayed when a topic is viewed. +- **_%X% Note:_** You can define nested sections. Do not overlap sections. Use named sections to make sure that the correct START and ENDs are matched. Section markers are **not** displayed when a topic is viewed. - Related: [[ENDSECTION|Main/VarENDSECTION]], [[INCLUDE|Main/VarINCLUDE]], [[NOP|Main/VarNOP]], [[STARTINCLUDE|Main/VarSTARTINCLUDE]], [[STOPINCLUDE|Main/VarSTOPINCLUDE]] diff --git a/TWiki/VarURLPARAM.mdwn b/TWiki/VarURLPARAM.mdwn index 80f070a..c65c10d 100644 --- a/TWiki/VarURLPARAM.mdwn +++ b/TWiki/VarURLPARAM.mdwn @@ -26,19 +26,29 @@ no conversion + encode="off" + Turn off encoding. See important security note below + encode="safe" + + + encode="safe" + Encode special characters into HTML entities to avoid XSS exploits: "<", ">", "%", single quote (') and double quote (") + (this is the default) + + encode="entity" Encode special characters into HTML entities. See [[Main/VarENCODE]] for more details. - no encoding + encode="safe" encode="url" Encode special characters for URL parameter use, like a double quote into %22 - no encoding + encode="safe" encode="quote" Escape double quotes with backslashes (\"), does not change other characters; required when feeding URL parameters into other TWiki variables - no encoding + encode="safe" multiple="on" %BR% multiple="[[$item]]" @@ -53,8 +63,8 @@ - Example: `%URLPARAM{"skin"}%` returns `print` for a `.../view/%WEB%/%INCLUDINGTOPIC%?skin=print` URL - **_%X% Notes:_** - - **IMPORTANT:** There is a risk that this variable could be misused for [cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting) (XSS). - - URL parameters passed into HTML form fields **_must be_** entity [[ENCODEd|Main/VarENCODE]].%BR% Example: `` + - **IMPORTANT:** There is a risk that this variable can be misused for [cross-site scripting](http://en.wikipedia.org/wiki/Cross-site_scripting) (XSS) if the encoding is turned off. The `encode="safe"` is the default, it provides a safe middle ground. The `encode="entity"` is more aggressive, but some TWiki applications might not work. + - URL parameters passed into HTML form fields must be entity [[ENCODEd|Main/VarENCODE]].%BR% Example: `` - Double quotes in URL parameters must be escaped when passed into other TWiki variables.%BR% Example: `%SEARCH{ "%URLPARAM{ "search" encode="quotes" }%" noheader="on" }%` - When used in a template topic, this variable will be expanded when the template is used to create a new topic. See [[TWikiTemplates#TemplateTopicsVars]] for details. - Watch out for TWiki internal parameters, such as `rev`, `skin`, `template`, `topic`, `web`; they have a special meaning in TWiki. Common parameters and view script specific parameters are documented at [[TWikiScripts]]. diff --git a/TWiki/WebChanges.mdwn b/TWiki/WebChanges.mdwn index 8f79d08..08aae02 100644 --- a/TWiki/WebChanges.mdwn +++ b/TWiki/WebChanges.mdwn @@ -1,4 +1,4 @@ -# 50 Recent Changes in %INCLUDINGWEB% Web retrieved at 16:04 (GMT) +# 50 Recent Changes in %INCLUDINGWEB% Web retrieved at 16:14 (GMT) # TWiki Installation Error diff --git a/TWiki/WebHome.mdwn b/TWiki/WebHome.mdwn index d3d95e7..4e6a897 100644 --- a/TWiki/WebHome.mdwn +++ b/TWiki/WebHome.mdwn @@ -19,7 +19,7 @@ TWiki is a flexible, powerful, secure, yet simple web-based collaboration platfo - [[Frequently Asked Questions|Main/TWikiFAQ]] - about TWiki - [[Reference Manual|Main/TWikiReferenceManual]] - documentation for system administrators - [[Admin Tools|Main/AdminToolsCategory]] - manage the TWiki site -- [[TWiki-4.2 Release Notes|Main/TWikiReleaseNotes04x02]] - describes what's new in this release +- [[TWiki-4.3 Release Notes|Main/TWikiReleaseNotes04x03]] - describes what's new in this release ## %WEB% Web Utilities @@ -37,7 +37,7 @@ TWiki is a flexible, powerful, secure, yet simple web-based collaboration platfo ## Disclaimer -- TWiki® is a registered trademarks of TWiki founder [Peter Thoeny](http://twiki.org/cgi-bin/view/Main/PeterThoeny), [TWIKI.NET](http://twiki.net/). The [[TWiki logo|Main/TWikiLogos]] and the "Collaborate with TWiki" tagline are trademarks of Peter Thoeny. +- TWiki® is a registered trademarks of TWiki founder [Peter Thoeny](http://twiki.org/cgi-bin/view/Main/PeterThoeny), [TWIKI.NET](http://www.twiki.net/). The [[TWiki logo|Main/TWikiLogos]] and the "Collaborate with TWiki" tagline are trademarks of Peter Thoeny. - Twiki (with a lower case "w") is a robot character from the _Buck Rogers™ in the 25th Century_ TV series. TWiki (with an upper case "W") is not affiliated with the Dille Family Trust, the registered trademark owner of the _Buck Rogers_ name. - TWiki is developed as Free Software under the [[GNU/GPL|Main/GnuGeneralPublicLicense]]. - Get the latest version from [TWiki.org downloads](http://TWiki.org/download.html). diff --git a/TWiki/WysiwygPlugin.mdwn b/TWiki/WysiwygPlugin.mdwn index 1cf823b..8c21173 100644 --- a/TWiki/WysiwygPlugin.mdwn +++ b/TWiki/WysiwygPlugin.mdwn @@ -237,7 +237,7 @@ Many thanks to the following sponsors for supporting this work: Plugin Version: - 17680 (06 Dec 2008) + 17829 (30 Mar 2009) Change History: diff --git a/Trash/TrashAttachment.mdwn b/Trash/TrashAttachment.mdwn new file mode 100644 index 0000000..f6c538e --- /dev/null +++ b/Trash/TrashAttachment.mdwn @@ -0,0 +1 @@ +# Placeholder for trashed attachments diff --git a/Trash/WebAtom.mdwn b/Trash/WebAtom.mdwn new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Trash/WebAtom.mdwn @@ -0,0 +1 @@ + diff --git a/Trash/WebChanges.mdwn b/Trash/WebChanges.mdwn new file mode 100644 index 0000000..e69de29 diff --git a/Trash/WebHome.mdwn b/Trash/WebHome.mdwn new file mode 100644 index 0000000..5c1c8c8 --- /dev/null +++ b/Trash/WebHome.mdwn @@ -0,0 +1,21 @@ +This is the Trash. Here you can undelete topics; deleted attachments are in [[TrashAttachment]]. + +%RED% Security Note: %ENDCOLOR% By default, viewing the Trash web is restricted to %USERSWEB%.TWikiAdminGroup. If you would like to allow all users to view the Trash web, remove the `ALLOWWEBVIEW` restriction in [[WebPreferences]]. + +# TWiki Installation Error + +Incorrect format of search template (missing sections? There should be 4 %SPLIT% tags) [[more...|Main/WebChanges]] + +## %WEB% Web Utilities + +
      +
        +
      •   - [[Main/WebSearchAdvanced]]
        • +
      • [[Main/WebTopicList]] - all topics in alphabetical order
        • +
      • [[Main/WebChanges]] - recent topic changes in this web
        • +
      • [[Main/WebNotify]] - subscribe to an e-mail alert sent when topics change
        • +
      • [[Main/WebRss]], [[Main/WebAtom]] - RSS and ATOM news feeds of topic changes
        • +
      • [[Main/WebStatistics]] - listing popular topics and top contributors
        • +
      • [[Main/WebPreferences]] - preferences of this web
        • +
      +
      diff --git a/Trash/WebIndex.mdwn b/Trash/WebIndex.mdwn new file mode 100644 index 0000000..e69de29 diff --git a/Trash/WebLeftBar.mdwn b/Trash/WebLeftBar.mdwn new file mode 100644 index 0000000..adeccd5 --- /dev/null +++ b/Trash/WebLeftBar.mdwn @@ -0,0 +1,6 @@ +- **[[ %INCLUDINGWEB% Web|INCLUDINGWEB/WebHome]]** +- [[ Index|Main/WebTopicList]] +- [[ Search|INCLUDINGWEB/WebSearch]] +- [[ Changes|Main/WebChanges]] + +---- diff --git a/Trash/WebNotify.mdwn b/Trash/WebNotify.mdwn new file mode 100644 index 0000000..47bc661 --- /dev/null +++ b/Trash/WebNotify.mdwn @@ -0,0 +1,5 @@ +This is a subscription service to be automatically notified by e-mail when topics change in this **%WEB%** web. This is a convenient service, so you do not have to come back and check all the time if something has changed. To subscribe, please add a bullet with your %SYSTEMWEB%.WikiName in alphabetical order to this list: + +- [[TWikiGuest]] - + +**_Related topics:_** %SYSTEMWEB%.WebChangesAlert, %SYSTEMWEB%.TWikiRegistration diff --git a/Trash/WebPreferences.mdwn b/Trash/WebPreferences.mdwn new file mode 100644 index 0000000..eff5b84 --- /dev/null +++ b/Trash/WebPreferences.mdwn @@ -0,0 +1,26 @@ +# %WEB% Web Preferences + +The following settings are **_web preferences_** of the [[%WEB%|WEB/WebHome]] web. These preferences overwrite the **_site-level preferences_** in [[%SYSTEMWEB%.TWikiPreferences|SYSTEMWEB/TWikiPreferences]] and [[Main.TWikiPreferences|Main/TWikiPreferences]], and can be overwritten by **_user preferences_** (your personal topic, eg: %USERSWEB%.admin in the [[%USERSWEB%|USERSWEB/WebHome]] web). + + + +## Web Preferences Settings + +These settings override the defaults for this web only. See [[full list of defaults with explanation|SYSTEMWEB/TWikiPreferences#DefaultWebPreferences]]. + +- Set WEBBGCOLOR = #FF0099 +- Set SITEMAPWHAT = Place for trashed topics and attachments. +- Set SITEMAPUSETO = ...get rid of unused stuff. +- Set NOSEARCHALL = on + +- Restricted to adminsso that deleted topics can't be viewed by spies. + - Set ALLOWWEBVIEW = %USERSWEB%.TWikiAdminGroup + - Set ALLOWTOPICCHANGE = %USERSWEB%.TWikiAdminGroup + - Set ALLOWTOPICRENAME = %USERSWEB%.TWikiAdminGroup + +- Web preferences that are **not** allowed to be overridden by sub-web, user or topic preferences: + - Set FINALPREFERENCES = NOSEARCHALL, ATTACHFILESIZELIMIT, WIKIWEBMASTER, WEBCOPYRIGHT, WEBTOPICLIST, DENYWEBVIEW, ALLOWWEBVIEW, DENYWEBCHANGE, ALLOWWEBCHANGE, DENYWEBRENAME, ALLOWWEBRENAME diff --git a/Trash/WebRss.mdwn b/Trash/WebRss.mdwn new file mode 100644 index 0000000..594bd76 --- /dev/null +++ b/Trash/WebRss.mdwn @@ -0,0 +1 @@ +http://www.dementia.org/twiki/view/%WEB% The %WEB% web of TWiki. TWiki is a Web-Based Collaboration Platform for the Enterprise. diff --git a/Trash/WebSearch.mdwn b/Trash/WebSearch.mdwn new file mode 100644 index 0000000..e69de29 diff --git a/Trash/WebSearchAdvanced.mdwn b/Trash/WebSearchAdvanced.mdwn new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/Trash/WebSearchAdvanced.mdwn @@ -0,0 +1 @@ + diff --git a/Trash/WebStatistics.mdwn b/Trash/WebStatistics.mdwn new file mode 100644 index 0000000..115b3cf --- /dev/null +++ b/Trash/WebStatistics.mdwn @@ -0,0 +1,32 @@ +## Statistics for %WEB% Web + + + + + + + + + + + + + + + + + + +
      Month: Topic
      views:       		Topic
      saves:       		File
      uploads:       		Most popular
      topic views:       		Top contributors for
      topic save and uploads:
      + + + + + +
      + +**_Notes:_** + +- Do not edit this topic, it is updated automatically. (You can also [force](http://www.dementia.org/twiki/statistics/%WEB%) an update) +- [[TWikiSiteTools|SYSTEMWEB/TWikiSiteTools#WebStatistics_site_statistics]] tells you how to enable the automatic updates of the statistics. +- Suggestion: You could archive this topic once a year and delete the previous year's statistics from the table. diff --git a/Trash/WebTopicList.mdwn b/Trash/WebTopicList.mdwn new file mode 100644 index 0000000..e69de29 diff --git a/_default/WebAtom.mdwn b/_default/WebAtom.mdwn new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/_default/WebAtom.mdwn @@ -0,0 +1 @@ + diff --git a/_default/WebChanges.mdwn b/_default/WebChanges.mdwn new file mode 100644 index 0000000..e69de29 diff --git a/_default/WebCreateNewTopic.mdwn b/_default/WebCreateNewTopic.mdwn new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/_default/WebCreateNewTopic.mdwn @@ -0,0 +1 @@ + diff --git a/_default/WebHome.mdwn b/_default/WebHome.mdwn new file mode 100644 index 0000000..99d4bd7 --- /dev/null +++ b/_default/WebHome.mdwn @@ -0,0 +1,21 @@ +# Welcome to the %WEB% web + +## Available Information + +- ... +- ... +- ... + +## %WEB% Web Utilities + +
      +
        +
      •   - [[Main/WebSearchAdvanced]]
        • +
      • [[Main/WebTopicList]] - all topics in alphabetical order
        • +
      • [[Main/WebChanges]] - recent topic changes in this web
        • +
      • [[Main/WebNotify]] - subscribe to an e-mail alert sent when topics change
        • +
      • [[Main/WebRss]], [[Main/WebAtom]] - RSS and ATOM news feeds of topic changes
        • +
      • [[Main/WebStatistics]] - listing popular topics and top contributors
        • +
      • [[Main/WebPreferences]] - preferences of this web
        • +
      +
      diff --git a/_default/WebIndex.mdwn b/_default/WebIndex.mdwn new file mode 100644 index 0000000..e69de29 diff --git a/_default/WebLeftBar.mdwn b/_default/WebLeftBar.mdwn new file mode 100644 index 0000000..a3e8a43 --- /dev/null +++ b/_default/WebLeftBar.mdwn @@ -0,0 +1,11 @@ +- **[[ %INCLUDINGWEB% Web|INCLUDINGWEB/WebHome]]** +- [[ Create New Topic|Main/WebCreateNewTopic?topicparent=WebHome]] +- [[ Index|Main/WebTopicList]] +- [[ Search|INCLUDINGWEB/WebSearch]] +- [[ Changes|Main/WebChanges]] +- [[ Notifications|Main/WebNotify]] +- [[ RSS Feed|Main/WebRss]] +- [[ Statistics|Main/WebStatistics]] +- [[ Preferences|Main/WebPreferences]] + +---- diff --git a/_default/WebNotify.mdwn b/_default/WebNotify.mdwn new file mode 100644 index 0000000..47bc661 --- /dev/null +++ b/_default/WebNotify.mdwn @@ -0,0 +1,5 @@ +This is a subscription service to be automatically notified by e-mail when topics change in this **%WEB%** web. This is a convenient service, so you do not have to come back and check all the time if something has changed. To subscribe, please add a bullet with your %SYSTEMWEB%.WikiName in alphabetical order to this list: + +- [[TWikiGuest]] - + +**_Related topics:_** %SYSTEMWEB%.WebChangesAlert, %SYSTEMWEB%.TWikiRegistration diff --git a/_default/WebPreferences.mdwn b/_default/WebPreferences.mdwn new file mode 100644 index 0000000..2f6a3a9 --- /dev/null +++ b/_default/WebPreferences.mdwn @@ -0,0 +1,63 @@ +# %WEB% Web Preferences + +The following settings are **_web preferences_** of the [[%WEB%|WEB/WebHome]] web. These preferences overwrite the **_site-level preferences_** in [[%SYSTEMWEB%.TWikiPreferences|SYSTEMWEB/TWikiPreferences]] and [[Main.TWikiPreferences|Main/TWikiPreferences]], and can be overwritten by **_user preferences_** (your personal topic, eg: %USERSWEB%.admin in the [[%USERSWEB%|USERSWEB/WebHome]] web). + + + +## Web Preferences Settings + +These settings override the defaults for this web only. See [[full list of defaults with explanation|SYSTEMWEB/TWikiPreferences#DefaultWebPreferences]]. Many of the settings below are commented out. Remove the # sign to enable a local customisation. + +- List of topics of the %WEB% web: + - #Set WEBTOPICLIST = %WEBTOPICLIST% + +
       %WEBBGCOLOR% 
      + +- Web-specific background color: (Pick a lighter one of the %SYSTEMWEB%.StandardColors). + - Set WEBBGCOLOR = #DDDDDD + - **_Note:_** This setting is automatically configured when you create a web + +- Image, URL and alternate tooltip text of web's logo.%BR% **_Note:_** Don't add your own local logos to the %SYSTEMWEB%.TWikiLogos topic; create your own logos topic instead. + - #Set WEBLOGOIMG = %WEBLOGOIMG% + - #Set WEBLOGOURL = %WEBLOGOURL% + - #Set WEBLOGOALT = %WEBLOGOALT% + +- List this web in the %SYSTEMWEB%.SiteMap. If you want the web listed, then set SITEMAPLIST to `on`, do not set NOSEARCHALL, and add the "what" and "use to..." description for the site map. Use links that include the name of the web, i.e. %WEB%.Topic links.%BR% **_Note:_** Unlike other variables, the setting of SITEMAPLIST is **not** inherited from parent webs. It has to be set in **every** web that is to be listed in the %SYSTEMWEB%.SiteMap %BR% + - Set SITEMAPLIST = on + - Set SITEMAPWHAT = + - Set SITEMAPUSETO = + - **_Note:_** Above settings are automatically configured when you create a web + +- Exclude web from a `web="all"` search: (Set to `on` for hidden webs). + - Set NOSEARCHALL = + - **_Note:_** This setting is automatically configured when you create a web + +- Prevent automatic linking of [[WikiWords]] and acronyms (if set to `on`); link WikiWords (if empty); can be overwritten by web preferences: + - #Set NOAUTOLINK = %NOAUTOLINK% + - **_Note:_** You can still use the `[[...][...]]` syntax to link topics if you disabled WikiWord linking. The ` ... ` syntax can be used to prevents links within a block of text. + +- Default template for **new topics** for this web: + - [[WebTopicEditTemplate]]: Default template for new topics in this web. (Site-level is used if topic does not exist) + - [[%SYSTEMWEB%.WebTopicEditTemplate|SYSTEMWEB/WebTopicEditTemplate]]: Site-level default topic template + +- Comma separated list of **forms** that can be attached to topics in this web. See %SYSTEMWEB%.TWikiForms for more information. + - Set WEBFORMS = + +- Users or groups who **_are not_** / **_are_** allowed to **_view_** / **_change_** / **_rename_** topics in the %WEB% web: (See %SYSTEMWEB%.TWikiAccessControl). + - Set DENYWEBVIEW = + - Set ALLOWWEBVIEW = + - Set DENYWEBCHANGE = + - Set ALLOWWEBCHANGE = + - Set DENYWEBRENAME = + - Set ALLOWWEBRENAME = + +- Users or groups allowed to change or rename this %TOPIC% topic: (e.g., %USERSWEB%.TWikiAdminGroup) + - Set ALLOWTOPICCHANGE = + - Set ALLOWTOPICRENAME = + +- Web preferences that are **not** allowed to be overridden by sub-web, user or topic preferences: + - Set FINALPREFERENCES = NOSEARCHALL, ATTACHFILESIZELIMIT, WIKIWEBMASTER, WEBCOPYRIGHT, WEBTOPICLIST, DENYWEBVIEW, ALLOWWEBVIEW, DENYWEBCHANGE, ALLOWWEBCHANGE, DENYWEBRENAME, ALLOWWEBRENAME diff --git a/_default/WebRss.mdwn b/_default/WebRss.mdwn new file mode 100644 index 0000000..594bd76 --- /dev/null +++ b/_default/WebRss.mdwn @@ -0,0 +1 @@ +http://www.dementia.org/twiki/view/%WEB% The %WEB% web of TWiki. TWiki is a Web-Based Collaboration Platform for the Enterprise. diff --git a/_default/WebSearch.mdwn b/_default/WebSearch.mdwn new file mode 100644 index 0000000..e69de29 diff --git a/_default/WebSearchAdvanced.mdwn b/_default/WebSearchAdvanced.mdwn new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/_default/WebSearchAdvanced.mdwn @@ -0,0 +1 @@ + diff --git a/_default/WebStatistics.mdwn b/_default/WebStatistics.mdwn new file mode 100644 index 0000000..115b3cf --- /dev/null +++ b/_default/WebStatistics.mdwn @@ -0,0 +1,32 @@ +## Statistics for %WEB% Web + + + + + + + + + + + + + + + + + + +
      Month: Topic
      views:       		Topic
      saves:       		File
      uploads:       		Most popular
      topic views:       		Top contributors for
      topic save and uploads:
      + + + + + +
      + +**_Notes:_** + +- Do not edit this topic, it is updated automatically. (You can also [force](http://www.dementia.org/twiki/statistics/%WEB%) an update) +- [[TWikiSiteTools|SYSTEMWEB/TWikiSiteTools#WebStatistics_site_statistics]] tells you how to enable the automatic updates of the statistics. +- Suggestion: You could archive this topic once a year and delete the previous year's statistics from the table. diff --git a/_default/WebTopicList.mdwn b/_default/WebTopicList.mdwn new file mode 100644 index 0000000..e69de29 diff --git a/_empty/WebPreferences.mdwn b/_empty/WebPreferences.mdwn new file mode 100644 index 0000000..e69de29 -- 1.9.4