From db6c68aa88281454f38aa66bba7cd3c45bacd9fe Mon Sep 17 00:00:00 2001 From: TWikiContributor Date: Sat, 6 Dec 2008 09:02:32 +0000 Subject: [PATCH] buildrelease --- TWiki/BehaviourContrib.mdwn | 2 +- TWiki/CommentPlugin.mdwn | 2 +- TWiki/EditTablePlugin.mdwn | 26 ++- TWiki/EmptyPlugin.mdwn | 2 +- TWiki/FormattedSearch.mdwn | 8 +- TWiki/InterwikiPlugin.mdwn | 2 +- TWiki/JSCalendarContrib.mdwn | 22 +-- TWiki/MailerContrib.mdwn | 16 +- TWiki/ManagingUsers.mdwn | 64 +++++++- TWiki/PatternSkinCustomization.mdwn | 187 +++++++++++++++------- TWiki/PreferencesPlugin.mdwn | 2 +- TWiki/SiteMap.mdwn | 2 +- TWiki/SourceCode.mdwn | 15 +- TWiki/TWikiCss.mdwn | 16 +- TWiki/TWikiDocGraphics.mdwn | 30 ++++ TWiki/TWikiFuncDotPm.mdwn | 2 +- TWiki/TWikiHistory.mdwn | 6 +- TWiki/TWikiIfOP_iswebDotPm.mdwn | 7 + TWiki/TWikiInfixParserDotPm.mdwn | 6 +- TWiki/TWikiInstallationGuide.mdwn | 4 +- TWiki/TWikiReleaseNotes04x01.mdwn | 4 +- TWiki/TWikiReleaseNotes04x02.mdwn | 309 +++++++++++++++++++++++++++++++++--- TWiki/TWikiRenderDotPm.mdwn | 8 + TWiki/TWikiScripts.mdwn | 2 +- TWiki/TWikiStoreDotPm.mdwn | 2 + TWiki/TWikiTemplates.mdwn | 2 +- TWiki/TWikiUserAuthentication.mdwn | 23 +-- TWiki/TablePlugin.mdwn | 168 ++++++++++---------- TWiki/TinyMCEPlugin.mdwn | 2 +- TWiki/TwistyContrib.mdwn | 2 +- TWiki/TwistyPlugin.mdwn | 27 ++-- TWiki/VarEDITACTION.mdwn | 9 ++ TWiki/VarEDITTABLE.mdwn | 5 + TWiki/VarURLPARAM.mdwn | 4 +- TWiki/WebAtomBase.mdwn | 2 +- TWiki/WebRssBase.mdwn | 4 +- TWiki/WebSearchAdvanced.mdwn | 2 +- TWiki/WysiwygPlugin.mdwn | 21 ++- 38 files changed, 770 insertions(+), 247 deletions(-) create mode 100644 TWiki/TWikiIfOP_iswebDotPm.mdwn create mode 100644 TWiki/VarEDITACTION.mdwn diff --git a/TWiki/BehaviourContrib.mdwn b/TWiki/BehaviourContrib.mdwn index b0b7dca..f244206 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 (04 Aug 2008) +> 15675 (06 Dec 2008) > > > Dependencies: diff --git a/TWiki/CommentPlugin.mdwn b/TWiki/CommentPlugin.mdwn index 61ea4cf..d82b4f5 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 (04 Aug 2008) + 03 Aug 2008 17302 (06 Dec 2008) Change History: diff --git a/TWiki/EditTablePlugin.mdwn b/TWiki/EditTablePlugin.mdwn index b2ba351..d96c2a0 100644 --- a/TWiki/EditTablePlugin.mdwn +++ b/TWiki/EditTablePlugin.mdwn @@ -258,11 +258,11 @@ Plugin settings are stored as preferences variables. To reference a plugin setti - + - + @@ -270,19 +270,35 @@ Plugin settings are stored as preferences variables. To reference a plugin setti - + + + + + + + + + + + + + + + + + - + - + diff --git a/TWiki/EmptyPlugin.mdwn b/TWiki/EmptyPlugin.mdwn index 046d9e1..0fb3eab 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 - + diff --git a/TWiki/FormattedSearch.mdwn b/TWiki/FormattedSearch.mdwn index 012cf38..ac996af 100644 --- a/TWiki/FormattedSearch.mdwn +++ b/TWiki/FormattedSearch.mdwn @@ -133,11 +133,11 @@ Variables that can be used in the format string: - + - + @@ -356,10 +356,10 @@ Use an HTML form and an embedded formatted search on the same topic. You can lin Find Topics: -   +   Result: - %SEARCH{ search="%URLPARAM{"q"}%" format=" * $web.$topic: %BR% $summary" nosearch="on" }% + %SEARCH{ search="%URLPARAM{"q" encode="quote"}%" type="keyword" format=" * $web.$topic: %BR% $summary" nosearch="on" }% **To get this:** diff --git a/TWiki/InterwikiPlugin.mdwn b/TWiki/InterwikiPlugin.mdwn index d0a64fa..281143f 100644 --- a/TWiki/InterwikiPlugin.mdwn +++ b/TWiki/InterwikiPlugin.mdwn @@ -99,7 +99,7 @@ Plugin settings are stored as Preferences variables. To reference a plugin setti - + diff --git a/TWiki/JSCalendarContrib.mdwn b/TWiki/JSCalendarContrib.mdwn index 6ed87c5..6327059 100644 --- a/TWiki/JSCalendarContrib.mdwn +++ b/TWiki/JSCalendarContrib.mdwn @@ -113,17 +113,17 @@ All available date specifiers: You can also use the calendar directly in your own hand-built forms, without having to write any code. Just add this inline in the topic text: - %INCLUDE{"%SYSTEMWEB%/JSCalendarContribInline"}% + %INCLUDE{"%TWIKIWEB%/JSCalendarContribInline"}% Then, to display a calendar icon next to a text input field: - + If the contrib is installed, you will see such a field here: - + ### Installation Instructions @@ -176,7 +176,7 @@ Another great TWiki extension from the [![](http://www.dementia.org/twiki//view/ - + @@ -191,15 +191,15 @@ Another great TWiki extension from the [![](http://www.dementia.org/twiki//view/ - + - - + + - + @@ -232,7 +232,7 @@ Another great TWiki extension from the [![](http://www.dementia.org/twiki//view/ - + @@ -240,7 +240,7 @@ Another great TWiki extension from the [![](http://www.dementia.org/twiki//view/ - + @@ -256,4 +256,4 @@ Another great TWiki extension from the [![](http://www.dementia.org/twiki//view/
Plugin Author: TWiki:Main/PeterThoeny Arthur Clemens, TWiki:Main/PeterThoeny
Copyright: © 2002-2008, TWiki:Main.PeterThoeny (TWIKI.NET) and TWiki Contributors © 2008 Arthur Clemens, 2002-2008 TWiki:Main.PeterThoeny (TWIKI.NET) and TWiki Contributors
License:
Plugin Version: 4.8.4 (03 Aug 2008) 4.9 (01 Nov 2008)
Change History:  
01 Nov 2008: 4.9: Arthur Clemens: Fixed rendering of verbatim blocks when editing. Added parameter buttonrow="top" to allow the buttons to be positioned at the top of the table.
26 Sep 2008: 4.8.7: Arthur Clemens: Let empty table initialize more than one column from header parameter
24 Sep 2008: 4.8.6: Arthur Clemens: Fix parsing of header labels
21 Sep 2008: 4.8.5: Arthur Clemens: Fix rendering of TML inside label
03 Aug 2008: 4.8.4 TWiki 4.2.1 release version 4.8.4: TWiki 4.2.1 release version
19 Jul 2008: 4.8.3 Bugfix release 4.8.3: Bugfix release
20 Mar 2008:
Plugin Version: 15942 (04 Aug 2008) 15942 (06 Dec 2008)
Change History:
$date Time stamp of last topic update, e.g. 29 Jun 2010 - 16:07 Time stamp of last topic update, e.g. 29 Jun 2010 - 16:13
$isodate Time stamp of last topic update, e.g. 2010-06-29T16:07Z Time stamp of last topic update, e.g. 2010-06-29T16:13Z
$rev
Plugin Version: 03 Aug 2008 17302 (04 Aug 2008) 03 Aug 2008 17387 (06 Dec 2008)
Change History:
Version: 03 Aug 2008 17492 (06 Dec 2008) of the Mishoo calendar
Copyright ©: None
Change History: Change History:  
03 Aug 2008 TWiki 4.2.1 release version incl new calendar icon 10 Sep 2008 Bugs:Item5991 Applied patch to fix rendering on IE7 .
6 Sep 2007 06 Sep 2007 Bugs:Item4030 Added doc for using the calendar in user forms
5039 Split from [[Main/SharedCode]] Split from SharedCode
27 Dec 2005
14 Aug 2004 Separated out from [[Main/SharedCode]] module Separated out from SharedCode module
Home:
-**_Related Topics:_** %SYSTEMWEB%.TWikiPreferences +**_Related Topics:_** [[TWikiPreferences]] diff --git a/TWiki/MailerContrib.mdwn b/TWiki/MailerContrib.mdwn index 42baf67..0f4aabb 100644 --- a/TWiki/MailerContrib.mdwn +++ b/TWiki/MailerContrib.mdwn @@ -57,7 +57,7 @@ Users may further customize the specific content they will receive using the fol - **Using wild-card character in topic names** - You can use `*` in a topic name, where it is treated as a [wildcard character](http://en.wikipedia.org/wiki/Wildcard_character). A `*` will match zero or more other characters - so, for example, `Fred*` will match all topic names starting with `Fred`, `*Fred` will match all topic names _ending_ with `Fred`, and `*` will match _all_ topic names. - **Unsubscribing to specific topics** - Each topic may optionally be preceded by a '+' or '-' sign. The '+' sign means "subscribe to this topic". The '-' sign means "unsubscribe" or "don't send notifications regarding this particular topic". This allows users to elect to filter out certain topics. Topic filters ('-') take precedence over topic includes ('+') i.e. if you unsubscribe from a topic it will cancel out any subscriptions to that topic. - **Including child-topics in subscription** - Each topic may optionally be followed by an integer in parentheses, indicating the depth of the tree of children below that topic. Changes in all these children will be detected and reported along with changes to the topic itself. _Note_ This uses the TWiki "Topic parent" feature. -- **Subscribing to entire topic ("news mode")** - Each topic may optionally be immediately followed by an exclamation mark ! or a question mark ? with no intervening spaces, indicating that the topic (and children if there is a tree depth specifier as well) should be mailed out as **complete topics** instead of change summaries. ! causes the topic to be mailed every time _even if there have been no changes_, and ? will mail the topic only if there have been changes to it. One can limit the content of the subscribed topic to send out by inserting %STARTPUBLISH% and %STOPPUBLISH% markers within the topic. Note that "news mode" subscriptions require a corresponding cron job that includes the "-news" option (see [[details|Main/TOPIC#Setting_up_your_cron_job_s]]). +- **Subscribing to entire topic ("news mode")** - Each topic may optionally be immediately followed by an exclamation mark ! and/or a question mark ? with no intervening spaces, indicating that the topic (and children if there is a tree depth specifier as well) should be mailed out as **complete topics** instead of change summaries. ! causes the full topic to be mailed every time _even if there have been no changes_, and ? will mail the full topic only if there have been changes. One can limit the content of the subscribed topic to send out by inserting %STARTPUBLISH% and %STOPPUBLISH% markers within the topic. Note that "news mode" subscriptions require a corresponding cron job that includes the "-news" option (see [[details|Main/TOPIC#Setting_up_your_cron_job_s]]). Examples: Subscribe Daisy to all changes to topics in this web. @@ -96,7 +96,7 @@ A user may be listed many times in the WebNotify topic. Where a user has several If a _group_ is listed for notification, the group will be recursively expanded to the e-mail addresses of all members. -\_\_%X% Warning: Because an email address is not linked to a user name, there is no way for TWiki to check access controls for email addresses. A user identified by an email address will only be sent change notifications if the topic they are asubscribed to is readable by guest users. You can limit what email addresses can be used in WebNotify, or even block use of emails altogther, using the `{MailerContrib}{EmailFilterIn} setting in =configure`. +\_\_%X% Warning: Because an email address is not linked to a user name, there is no way for TWiki to check access controls for subscribers identified by email addresses. A subscriber identified by an email address alone will only be sent change notifications if the topic they are subscribed to is readable by guest users. You can limit what email addresses can be used in %NOTIFYTOPIC%, or even block use of emails altogther, using the `{MailerContrib}{EmailFilterIn} setting in =configure`. **_%T% Tip:_** List names in alphabetical order to make it easier to find the names. @@ -180,7 +180,7 @@ will generate newsletters from **all** webs every week on midnight Saturday. ## Developer Notes -The changes mails sent to users are based on a TWiki template called `mailnotify`. This template must contain the following definitions. +The changes mails sent to subscribers are based on a TWiki template called `mailnotify`. This template must contain the following definitions. @@ -241,13 +241,21 @@ Many thanks to the following sponsors for supporting this work: - + + + + + + + + + diff --git a/TWiki/ManagingUsers.mdwn b/TWiki/ManagingUsers.mdwn index 3a47a31..1271db1 100644 --- a/TWiki/ManagingUsers.mdwn +++ b/TWiki/ManagingUsers.mdwn @@ -10,6 +10,7 @@ _Register users on your TWiki site; change/reset/install passwords; remove user
  • Change, Reset and Install Passwords
  • Changing User Account Names
  • Removing User Accounts
    • +
  • Customizing registration Emails.
    • @@ -64,6 +65,67 @@ To remove a user account (FredQuimby, who logs in as "fred"): 3. Remove `FredQuimby` from all groups and from all the `ALLOWWEB/ALLOWTOPIC...` declarations, if any.%BR% **_Note:_** If you fail to do this you risk creating a security hole, as the next user to register with the wikiname FredQuimby will inherit the old FredQuimby's permissions. 4. _[optional]_ Delete their user topic Main.FredQuimby (including attachments, if any.) -**_Note:_** Consider leaving the user topic file in place so their past signatures and revision author entries don't end up looking like [[AnUncreatedTopic]]. If you want to make it clear the user is no longer around, replace the topic content with a note to that effect. The existance of the UserName topic should also prevent that user name from being re-used, sealing the potential security hole regarding inherited permissions.. +**_Note:_** Consider leaving the user topic file in place so their past signatures and revision author entries don't end up looking like [[AnUncreatedTopic]]. If you want to make it clear the user is no longer around, replace the topic content with a note to that effect. The existence of the UserName topic should also prevent that user name from being re-used, sealing the potential security hole regarding inherited permissions.. + +## Customizing registration Emails. + +TWiki's Registration can send 3 emails who's output is governed by templates: + +1. User registration confirmation - `templates/registerconfirm.tmpl` +2. User registration notification - `templates/registernotify.tmpl` +3. Email to notify the TWiki admin of registration - `templates/registernotifyadmin.tmpl` + +As these are [[TWikiTemplates]], they can be customized and selected using the SKIN path setting. Because there are default tmpl files in the `templates` dir, this cannot use Template topics. + +These template files have a specific format that matches the raw format of emails sent via SMTP, so be careful and test your changes. It is easiest to start by copying the default templates: + + cd twiki/templates + cp registernotify.tmpl registernotify.myskin.tmpl + cp registerconfirm.tmpl registerconfirm.myskin.tmpl + cp registernotifyadmin.tmpl registernotifyadmin.myskin.tmpl + +then add `myskin` to the beginning of the `SKIN` setting in [[TWikiPreferences]]. + +From this point on, your myskin templates will be used for the registration emails. + +To make it possible for [[TWikiUsers]] to modify the email contents, you could use a parameterized `%INCLUDE%` statement in your customized version. eg: + + From: %WIKIWEBMASTERNAME% <%WIKIWEBMASTER%> + To: %FIRSTLASTNAME% <%EMAILADDRESS%> + Subject: %MAKETEXT{"[_1] - Registration for [_2] ([_3])" args="%WIKITOOLNAME%, %WIKINAME%, %EMAILADDRESS%"}% + MIME-Version: 1.0 + Content-Type: text/plain; charset=%CHARSET% + Content-Transfer-Encoding: 8bit + + %INCLUDE{ + "Main.RegistrationNotification" + WIKINAME="%WIKINAME%" + FIRSTLASTNAME="%FIRSTLASTNAME%" + EMAILADDRESS="%EMAILADDRESS%" + }% + +- **_note the use of %WIKINAME%, %FIRSTLASTNAME%, %EMAILADDRESS% passed in from the INCLUDE so that the topic below is similar to the original template_** + +and then create a topic Main.RegisterNotifyEmail: + + Welcome to %WIKITOOLNAME%. + + %MAKETEXT{"Your personal [_1] topic is located at [_2]. You can customize it as you like:" args="%WIKITOOLNAME%, %SCRIPTURL{"view"}%/%USERSWEB%/%WIKINAME%"}% + + * %MAKETEXT{"Some people turn it into a personal portal with favorite links, what they work on, what help they'd like, etc."}% + * %MAKETEXT{"Some add schedule information and vacation notice."}% + + Regards + %WIKIWEBMASTERNAME% + Your TWiki Admin + + %MAKETEXT{"Note:"}% + 2 %MAKETEXT{"You can change your password at via [_1]" args="%SCRIPTURL{"view"}%/%SYSTEMWEB%/ChangePassword"}% + 3 %MAKETEXT{"If you haven't set a password yet or you want to reset it, go to: [_1]" args="%SCRIPTURL{"view"}%/%SYSTEMWEB%/ResetPassword"}% + + %MAKETEXT{"Submitted content:"}% + %FORMDATA% + +- **_remember to secure the topic appropriately to prevent attackers from getting emailed sensitive passwords._** **_Related Topics:_** [[AdminDocumentationCategory]] diff --git a/TWiki/PatternSkinCustomization.mdwn b/TWiki/PatternSkinCustomization.mdwn index 1c78c0d..7cb7ccb 100644 --- a/TWiki/PatternSkinCustomization.mdwn +++ b/TWiki/PatternSkinCustomization.mdwn @@ -1,6 +1,6 @@ -# %SYSTEMWEB%.PatternSkin Customization +# [[PatternSkin]] Customization -**Questions and answers on configuring page elements.** For styling your TWiki, see [[PatternSkinCssCookbook]]. +**Guidelines how to create and customize page templates.** For styling your TWiki using stylesheets, see [[PatternSkinCssCookbook]].
    -
  • Other page parts @@ -70,7 +74,7 @@ The quickest way to change the view template would be to simply change the text 2. Create a new (empty) view template file in `/templates` called `view.myskin.tmpl`. 3. In `view.myskin.tmpl` you write: > %TMPL:INCLUDE{"view"}% -> %TMPL:DEF{"topicactionbuttons"}%%TMPL:P{"activatable_more"}%%TMPL:END% +> %TMPL:DEF{"top:toolbarbuttons"}%%TMPL:P{"more_link"}%%TMPL:END% 4. For testing, view any topic and append to the topic name: `?cover=myskin`. You should see an effect now. 5. To make the changes visible on all pages, go to [[Main.TWikiPreferences|Main/TWikiPreferences]] (to keep [[TWikiPreferences]] intact) and write: @@ -100,27 +104,24 @@ Call this template by setting `VIEW_TEMPLATE`: We can use the same example as above. In a topic write: > %TMPL:INCLUDE{"view"}% -> %TMPL:DEF{"topicactionbuttons"}%%TMPL:P{"activatable_more"}%%TMPL:END% +> %TMPL:DEF{"top:toolbarbuttons"}%%TMPL:P{"more_link"}%%TMPL:END% You can also test this by appending `?template=PersonalInfoView` to the url. ## Reference: pattern skin template INCLUDE tree +The `view` script invokes the `view` template: + view - page - constants - javascript - styles - stylesdynamic - body - viewtopbar - %SYSTEMWEB%.WebTopBar - viewtoolbar - viewleftbar - %WEB%.WebLeftBar - viewtopicactionbuttons - viewbottombar - %SYSTEMWEB%.WebBottomBar + twiki + css + viewtopbar + %TWIKIWEB%.WebTopBar + viewleftbar + %WEB%.WebLeftBar + viewtopicactionbuttons + viewbottombar + %TWIKIWEB%.WebBottomBar ## Logo @@ -139,7 +140,7 @@ There are 2 ways to change the logo in a web: **Using logo.gif:** -> - Create a new image named `logo.gif` and attach it to the web's [[WebPreferences]] topic. %SYSTEMWEB%.PatternSkin's stylesheet assumes the logo is 40px high. More about that later. +> - Create a new image named `logo.gif` and attach it to the web's [[WebPreferences]] topic. [[PatternSkin]]'s stylesheet assumes the logo is 40px high. More about that later. > - You can also upload the image with FTP to `/pub/YourWeb/WebPreferences/`. > - Copy the above instructions ("Redefine your custom variables") and insert your logo name. @@ -163,7 +164,7 @@ See [[I want to change the height of the top bar|Main/WebHome#TopBarChangeHeight ### I want to change the white space above and below the logo -Change the table style in topic %SYSTEMWEB%.WebTopBar. The default top padding is 11px. +Change the table style in topic [[WebTopBar]]. The default top padding is 11px. ## Top bar @@ -210,7 +211,11 @@ The top bar is 64 pixels high by default. > > `USERLAYOUTURL` > -> to that topic attachment. See %SYSTEMWEB%.PatternSkinCssCookbook about creating custom styles. +> to that topic attachment. See +> +> [[PatternSkinCssCookbook]] +> +> about creating custom styles. ### I want to set or change the top background image @@ -218,7 +223,7 @@ The image at the top is called "header art" - commonly the top image found on bl Redefine your custom variables in [[Main.TWikiPreferences|Main/TWikiPreferences]] (to keep [[TWikiPreferences]] intact): -> * Set WEBHEADERART = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/TWiki_header.gif +> * Set WEBHEADERART = %PUBURLPATH%/%TWIKIWEB%/PatternSkin/TWiki_header.gif > * Set WEBHEADERBGCOLOR = somehexcolor (no quotes, for example: #ffffff) You can also set `WEBHEADERART` per web, by defining the variable in the Web's WebPreferences. @@ -233,7 +238,7 @@ Redefine `WEBHEADERBGCOLOR` in [[Main.TWikiPreferences|Main/TWikiPreferences]] ( If you have localization enabled, you will also see a language dropdown box at the far right. -You can remove these items from %SYSTEMWEB%.WebTopBar. +You can remove these items from [[WebTopBar]]. ### I want to hide the top bar @@ -251,10 +256,10 @@ The view template is populated with page elements using template inclusions: Each included template draws a part of the screen.%BR% Omit `%TMPL:INCLUDE{"viewtopbar"}%` to hide the top bar. -Another approach is to clear the contents of module `topbar`. Using either a template or a topic template, write in your custom template: +Another approach is to clear the contents of module `topbar` with an empty definition. Using either a template or a topic template, write in your custom template: > %TMPL:INCLUDE{"view"}% -> %TMPL:INCLUDE{"topbar"}%%TMPL:END% +> %TMPL:DEF{"topbar"}%%TMPL:END% > > and add: > @@ -274,7 +279,8 @@ Another approach is to clear the contents of module `topbar`. Using either a tem **Using templates:** %BR% Omit `%TMPL:INCLUDE{"viewleftbar"}%` to hide the left bar, or in a custom template clear it using -> %TMPL:DEF{"viewleftbar"}%%TMPL:END% +> %TMPL:DEF{"leftbar"}%%TMPL:END% +> %TMPL:DEF{"leftbardimensions"}%%TMPL:END% **Using style sheets:** %BR% See [[PatternSkinCssCookbookNoLeftBar]] @@ -296,19 +302,19 @@ The left bar is 12 em wide by default. > > And change the number from 12em to a different value (3 occurrences). -## Other page parts +## Buttons ### I want to hide the edit buttons from certain users It may defy the wiki-ness of your TWiki installation, but in certain circumstances it could be useful to hide the edit buttons from users that are not logged in, for instance for clients that have gotten viewing rights only. -Using either a template or a topic template, 'empty' `topicaction` and `toolbar` by writing: +Using either a template or a topic template, 'empty' `top:toolbarbuttons` and `topicaction` by writing: > %TMPL:INCLUDE{"view"}% +> %TMPL:DEF{"top:toolbarbuttons"}%%TMPL:END% > %TMPL:DEF{"topicaction"}%%TMPL:END% -> %TMPL:DEF{"toolbar"}%%TMPL:END% -In the user page of %USERSWEB%.TWikiGuest, set the cover to +In the user page of [[TWikiGuest]], set the cover to > * Set COVER = customer @@ -316,63 +322,122 @@ By default this topic is editable only by TWiki admins. ### I want to remove the History button from the bottom -All action buttons are defined in `viewtopicactionbuttons.pattern.tmpl`. The history buttons or in module `revisions`: +All action links and buttons are defined in `viewtopicactionbuttons.tmpl`. The bottom history link is defined in DEF `action_revisions` + +> %TMPL:DEF{"topicactionbuttons"}% +> %TMPL:P{"action_activatable_edit_or_create"}% +> %TMPL:P{"action_activatable_attach"}% +> %TMPL:P{"action_printable"}% +> %TMPL:P{"action_revisions"}% +> %TMPL:P{"action_backlinks_simple"}% +> %TMPL:P{"action_raw_or_view"}% +> %TMPL:P{"action_activatable_raw_edit"}% +> %TMPL:P{"activatable_more"}% +> %TMPL:END% + +To hide that link, In a custom skin view template `view.myskin.tmpl` empty `action_revisions` by replacing it with an empty string: + +> %TMPL:INCLUDE{"view"}% +> %TMPL:DEF{"action_revisions"}%%TMPL:END% -> %TMPL:DEF\{"topicactionbuttons"\}%%TMPL:P\{"activatable\_raw\_edit"\}%%TMPL:P\{"sep"\}% %TMPL:P\{context="WysiwygPluginEnabled" then="activatable\_edit\_wysiwyg"\}% %TMPL:P\{context="WysiwygPluginEnabled" then="sep"\}% %TMPL:P\{"activatable\_attach"\}%%TMPL:P\{"sep"\}% %TMPL:P\{"printable"\}%%TMPL:P\{"sep"\}% %TMPL:P\{"raw"\}%%TMPL:P\{"sep"\}% %TMPL:P\{"backlinks"\}%%TMPL:P\{"sep"\}% %TMPL:P\{"revisions"\}%%TMPL:P\{"sep"\}% < HERE %TMPL:P\{"activatable\_more"\}%%TMPL:END% +### I want to put the bottom links as buttons at the top -If we emptied module `revisions` we would end up with 2 separators, so we need to remove the line altogether. We do this by copying the block and omitting the line. %BR% Using either a template or a topic template, to remove the history buttons write in your custom template: +The default definition in `view.pattern.tmpl` is: + + %TMPL:DEF{"top:toolbarbuttons"}%%TMPL:P{"activatable_edit_or_create"}%%TMPL:P{"activatable_attach"}%%TMPL:END% + +Create a new skin by creating a file `view.myskin.tmpl` in the `templates` directory. Write in it: > %TMPL:INCLUDE{"view"}% -> -> %TMPL:DEF{"topicactionbuttons"}%%TMPL:P{"activatable_raw_edit"}%%TMPL:P{"sep"}% -> %TMPL:P{context="WysiwygPluginEnabled" then="activatable_edit_wysiwyg"}% -> %TMPL:P{context="WysiwygPluginEnabled" then="sep"}% -> %TMPL:P{"activatable_attach"}%%TMPL:P{"sep"}% -> %TMPL:P{"printable"}%%TMPL:P{"sep"}% -> %TMPL:P{"raw"}%%TMPL:P{"sep"}% -> %TMPL:P{"backlinks"}%%TMPL:P{"sep"}% -> %TMPL:P{"activatable_more"}%%TMPL:END% -> -> Remove all newlines if you copy-paste above text. +> %TMPL:DEF{"top:toolbarbuttons"}%%TMPL:P{"history_history_link"}%%TMPL:END% + +View any topic with `?skin=myskin,pattern`, or set the `SKIN` variable to `myskin,pattern`. + +This will remove the Edit and Attach buttons, and place a History button at the top. + +You will probably not just want to have the History button there. Other button include names are: + +> create_topic_link +> raw_edit_link +> view_topic_link +> activatable_attach +> activatable_edit_or_create +> more_link +> activatable_printable +> backlinks_web_link +> backlinks_all_link +> backlinks_link +> history_rdiff_link +> history_history_link +> raw_link + +## Other page parts ### I want to insert text outside of the topic content -PatternSkin has 2 'buckets' to write additional content to: `beforetextcontents` and `aftertextcontents`, both defined in `view.pattern.tmpl`. These containers can contain text or html and are placed directly before and after the topic text. +PatternSkin has 2 'buckets' to write additional content to: `contentheader` and `contentfooter`, both defined in `view.pattern.tmpl`. These containers can contain text or html and are placed directly before and after the topic text. Both modules are wrapped in CSS containers: -- `beforetextcontents` - wrapped in `div` of class `twikiBeforeText` -- `aftertextcontents` - wrapped in `div` of class `twikiAfterText` +- `contentheader` - wrapped in `div` of class `twikiContentHeader` +- `contentfooter` - wrapped in `div` of class `twikiContentFooter` To put contents **before** the main text, use the custom skin approach as described above.%BR% So our custom template contains: > %TMPL:INCLUDE{"view"}% -> %TMPL:DEF{"beforetextcontents"}%This is the text before%TMPL:END% +> %TMPL:DEF{"contentheader"}%This is the text before%TMPL:END% Use the same procedure for contents to be put **after** the topic text: > %TMPL:INCLUDE{"view"}% -> %TMPL:DEF{"aftertextcontents"}%This is the text after%TMPL:END% +> %TMPL:DEF{"contentfooter"}%This is the text after%TMPL:END% ### I want to place the form at the top -Pattern skin has 2 buckets for the form: `formattop` (form-at-the-top) and `formatbottom` (form-at-the-bottom): +Pattern skin has 2 buckets for the form: `formtop` (form at the top) and `formbottom` (form at the bottom). The default definition is: -> %TMPL:DEF{"formattop"}%%TMPL:END% -> %TMPL:DEF{"formatbottom"}%%TMPL:P{"form"}%%TMPL:END% +> %TMPL:DEF{"formtop"}%%TMPL:END% +> %TMPL:DEF{"formbottom"}%%TMPL:P{"form"}%%TMPL:END% You simply swap the bucket contents. Using either a template or a topic template, write in your custom template: > %TMPL:INCLUDE{"view"}% -> %TMPL:DEF{"formattop"}%%TMPL:P{"form"}%%TMPL:END% -> %TMPL:DEF{"formatbottom"}%%TMPL:END% +> %TMPL:DEF{"formtop"}%%TMPL:P{"form"}%%TMPL:END% +> %TMPL:DEF{"formbottom"}%%TMPL:END% + +### I want to put the topic form in a twisty + +The attachment tables are placed in a open/close twisty. You can do the same for the topic form. + +Edit `templates/formtables.pattern.tmpl` to have this code: + + %{ These templates define the form attached at the bottom of viewed page. }% + + %TMPL:DEF{"starttopicformwisty"}%%TWISTY{id="topicformlist" mode="div" remember="on" link="%MAKETEXT{"Form"}%" showimgleft="%ICONURLPATH{toggleopen}%" hideimgleft="%ICONURLPATH{toggleclose}%"}%%TMPL:END% + + %TMPL:DEF{"endtopicformwisty"}%%ENDTWISTY%%TMPL:END% + + %{ Start of form table }% + %TMPL:DEF{FORM:display:header}%
    %TMPL:P{"starttopicformwisty"}% +
    • Version: 03 Aug 2008 17629 (14 Oct 2008)
    Change History:  
    14 Oct 2008 TWikibug:Item6066: fixed issue for user mappings where cuid = login
    27 Aug 2008 TWikibug:Item5949: fixed problem with unsubscribe that should result in an empty subscription
    03 Aug 2008 TWiki 4.2.1 release version
    %TMPL:P{FORM:display:header:headerrow}%%TMPL:END% -### I only want to show the WYSIWYG button on explicit pages + %{ Header }% + %TMPL:DEF{FORM:display:header:headerrow}%%TMPL:END% -In [[Main.TWikiPreferences|Main/TWikiPreferences]], set `COMPOSER` to a blank value: + %{ Each row }% + %TMPL:DEF{FORM:display:row}%%TMPL:END% -> * Set COMPOSER = + %{ Footer }% + %TMPL:DEF{FORM:display:footer}%
    + [[%A_TITLE%]] +
    %A_TITLE% + %A_VALUE% +
    %TMPL:P{FORM:display:footer:editlink}% + %TMPL:P{"endtopicformwisty"}%%TMPL:END% -In the topic, set the `COMPOSER` variable to `kupu`: +To give the twisty toggle link the same style as the attachment twisty link, add this to pattern skin's `style.css`: -> * Set COMPOSER = kupu + .twikiForm .twistyTrigger .twikiLinkLabel { + font-size:122%; /* h4 size */ + font-weight:bold; + } diff --git a/TWiki/PreferencesPlugin.mdwn b/TWiki/PreferencesPlugin.mdwn index 1f1c0cf..6694abe 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 (04 Aug 2008) + 15487 (06 Dec 2008) Change History: diff --git a/TWiki/SiteMap.mdwn b/TWiki/SiteMap.mdwn index 8171b71..764b129 100644 --- a/TWiki/SiteMap.mdwn +++ b/TWiki/SiteMap.mdwn @@ -15,7 +15,7 @@ Incorrect format of searchformat template (missing sections? There should be 4 % - +
    You can use color coding by web for identification and reference. This table is updated automatically based on WebPreferences settings of the individual webs. Contact if you need a separate collaboration web for your team. See also [[Main/AdminToolsCategory]]. You can use color coding by web for identification and reference. This table is updated automatically based on WebPreferences settings of the individual webs. Contact if you need a separate collaboration web for your team. See also %SYSTEMWEB%.AdminToolsCategory.
    diff --git a/TWiki/SourceCode.mdwn b/TWiki/SourceCode.mdwn index fcac707..2c13687 100644 --- a/TWiki/SourceCode.mdwn +++ b/TWiki/SourceCode.mdwn @@ -41,6 +41,7 @@
  • TWiki::I18N
  • TWiki::I18N::Extract
  • TWiki::If::Node
    • +
  • TWiki::If::OP_isweb
  • TWiki::If::Parser
  • TWiki::Infix::Error
  • TWiki::Infix::Node
    • @@ -191,7 +192,7 @@ This package doesn't smell ## <> \[[TWikiConfigureUIsEXTENDDotPm]\[]] -This package has smell factor of **1** +This package has smell factor of **2** ## [[TWiki|Main/TWikiDotPm]] @@ -219,7 +220,7 @@ Global variables are avoided wherever possible to avoid problems with CGI accele - `users` TWiki::Users singleton - `webName` Name of web found in URL path, or `web` URL parameter, or \{UsersWebName\} -This package has smell factor of **34** +This package has smell factor of **35** ## [[TWiki::Form|Main/TWikiFormDotPm]] @@ -294,6 +295,10 @@ Node class for the result of an If statement parse This package doesn't smell +## [[TWiki::If::OP_isweb|Main/TWikiIfOP_iswebDotPm]] + +This package doesn't smell + ## [[TWiki::If::Parser|Main/TWikiIfParserDotPm]] Support for the conditions in %IF\{\} statements. @@ -583,7 +588,7 @@ Plugins may throw TWiki::OopsException. For example: This module provides most of the actual HTML rendering code in TWiki. - This package has smell factor of *20* + This package has smell factor of *22* ---++ [[TWikiSandboxDotPm][TWiki::Sandbox]] @@ -815,7 +820,7 @@ Plugins may throw TWiki::OopsException. For example: User registration handling. - This package has smell factor of *5* + This package has smell factor of *8* ---++ [[TWikiUISaveDotPm][TWiki::UI::Save]] @@ -981,4 +986,4 @@ Plugins may throw TWiki::OopsException. For example: This package doesn't smell - There were a total of *193* smells + There were a total of *200* smells diff --git a/TWiki/TWikiCss.mdwn b/TWiki/TWikiCss.mdwn index 5943310..a2d7d21 100644 --- a/TWiki/TWikiCss.mdwn +++ b/TWiki/TWikiCss.mdwn @@ -306,11 +306,11 @@ A wide range of standard styles are used in the TWiki core code and topics, and .twikiSubmit -   + Submit button .twikiSubmitDisabled -   + Disabled submit button .twikiInputField @@ -333,6 +333,10 @@ A wide range of standard styles are used in the TWiki core code and topics, and for use with Javascript: the color of the input text when not clicked in the field + .twikiSelect + Select dropdown menu + + .twikiTextarea   @@ -432,6 +436,14 @@ A wide range of standard styles are used in the TWiki core code and topics, and .twikiPopUp Behaviour marker so a popup-window can be invoked + + .twikiContentHeader + container around optional html placed before topic text + + + .twikiContentFooter + container around optional html placed after topic text + ### TWiki Styles used in =configure diff --git a/TWiki/TWikiDocGraphics.mdwn b/TWiki/TWikiDocGraphics.mdwn index faf5bd1..5c55f29 100644 --- a/TWiki/TWikiDocGraphics.mdwn +++ b/TWiki/TWikiDocGraphics.mdwn @@ -281,6 +281,36 @@ Other usage: [[see below|Main/TOPIC#Usage_extended]]. %ICON{target}% + Target - blue + target-blue.gif + Target - blue + %ICON{target-blue}% + + + Target - gray + target-gray.gif + Target - gray + %ICON{target-gray}% + + + Target - green + target-green.gif + Target - green + %ICON{target-green}% + + + Target - orange + target-orange.gif + Target - orange + %ICON{target-orange}% + + + Target - red + target-red.gif + Target - red + %ICON{target-red}% + + Tip, idea tip.gif Tip, idea diff --git a/TWiki/TWikiFuncDotPm.mdwn b/TWiki/TWikiFuncDotPm.mdwn index 3346445..ef58f9f 100644 --- a/TWiki/TWikiFuncDotPm.mdwn +++ b/TWiki/TWikiFuncDotPm.mdwn @@ -312,7 +312,7 @@ Return: true if the session value was cleared Get a hash of context identifiers representing the currently active context. -The context is a set of identifiers that are set during specific phases of TWiki processing. For example, each of the standard scripts in the 'bin' directory each has a context identifier - the view script has 'view', the edit script has 'edit' etc. So you can easily tell what 'type' of script your Plugin is being called within. The core context identifiers are listed in the %SYSTEMWEB%.TWikiTemplates topic. Please be careful not to overwrite any of these identifiers! +The context is a set of identifiers that are set during specific phases of TWiki processing. For example, each of the standard scripts in the 'bin' directory each has a context identifier - the view script has 'view', the edit script has 'edit' etc. So you can easily tell what 'type' of script your Plugin is being called within. The core context identifiers are listed in the %SYSTEMWEB%.IfStatements topic. Please be careful not to overwrite any of these identifiers! Context identifiers can be used to communicate between Plugins, and between Plugins and templates. For example, in [[FirstPlugin]].pm, you might write: diff --git a/TWiki/TWikiHistory.mdwn b/TWiki/TWikiHistory.mdwn index 6443d25..fe54044 100644 --- a/TWiki/TWikiHistory.mdwn +++ b/TWiki/TWikiHistory.mdwn @@ -3,7 +3,7 @@