Changeset 505


Ignore:
Timestamp:
11/10/08 02:32:17 (3 years ago)
Author:
KennethLavrsen
Message:

Item109: Continuing TWiki to Default/SitePreferences update
More to come

Location:
branches/Release04x02
Files:
16 edited
1 moved

Legend:

Unmodified
Added
Removed

  • branches/Release04x02/data/Main/SitePreferences.txt

    r493 r505  
    44<div class="twikiHelp">%ICON{"info"}% %MAKETEXT{"Site-level preferences are located in [_1], however this [_2] prefs topic has override priority and should be used for local customisations. This allows for easier upgrades as you don't need to worry about the shipped preferences clobbering yours. It's easier to keep a handle on if you only copy over the settings you actually change." args="[[%SYSTEMWEB%.%TOPIC%]], [[%USERSWEB%.%TOPIC%]]"}% </div> 
    55 
    6 %EDITPREFERENCES{"%SYSTEMWEB%/TWikiPreferencesForm"}% 
     6%EDITPREFERENCES{"%SYSTEMWEB%/DefaultPreferencesForm"}% 
    77%IF{"$ SCRIPTNAME != 'viewauth%SCRIPTSUFFIX%'" then="<span class='twikiGrayText'>%MAKETEXT{"Quick edit of existing preferences (edit the topic text to set new preferences)"}%</span>" }% 
    88 

  • branches/Release04x02/data/TWiki/TWikiReleaseNotes04x02.txt

    r481 r505  
    377377| [[%BUGS%/Item4028][Item4028]] | Authenticated twice; garbled !CommentPlugin text | 
    378378| [[%BUGS%/Item4023][Item4023]] | configure link for 'Expert mode' missing t= parameter to prevent caching | 
    379 | [[%BUGS%/Item4019][Item4019]] | Remove preferences edit button from TWiki.TWikiPreferences | 
     379| [[%BUGS%/Item4019][Item4019]] | Remove preferences edit button from !TWiki.TWikiPreferences | 
    380380| [[%BUGS%/Item4006][Item4006]] | More options: do not show "View previous topic revision" when there is no previous version | 
    381381| [[%BUGS%/Item3991][Item3991]] | Add =spaceOutWikiWord= to Func | 

  • branches/Release04x02/data/TWiki/TWikiUpgradeGuide.txt

    r503 r505  
    7171      * TablePlugin - Set TABLEATTRIBUTES    
    7272   * Remember that a plugin must be activated in [[%SCRIPTURLPATH{"configure"}%][configure]]. 
    73    * To avoid having to re-apply plugin settings each time you upgrade a plugin or TWiki itself, define the altered plugin settings in =Main.TWikiPreferences= instead 
     73   * To avoid having to re-apply plugin settings each time you upgrade a plugin or TWiki itself, define the altered plugin settings in =%USERSWEB%.SitePreferences= instead 
    7474 
    7575---+++ Copy your old webs to new TWiki 
    … …  
    127127 
    128128   * Attach a favicon.ico file to !WebPreferences in each web. 
    129    * Preferred: Change the setting of the location of favicon.ico in !TWikiPreferences so all webs use the favicon.ico from the TWiki web. This is the fastest and easiest solution. 
    130  
    131 To change the location of favicon.ico in !TWikiPreferences to the TWiki web add this line to Main.TWikiPreferences 
     129   * Preferred: Change the setting of the location of favicon.ico in !%USERSWEB%.SitePreferences so all webs use the favicon.ico from the TWiki web. This is the fastest and easiest solution. 
     130 
     131To change the location of favicon.ico in !DefaultPreferences to the %SYSTEM% web add this line to !%USERSWEB%.SitePreferences 
    132132 
    133133<verbatim> 

  • branches/Release04x02/data/TestCases/TestCaseAutoInternalTags.txt

    r481 r505  
    7676 <tr> 
    7777  <td>WIKIPREFSTOPIC</td> 
    78   <td><!-- expected sexteen -->WIKIPREFSTOPIC TWikiPreferences<!-- /expected --></td> 
     78  <td><!-- expected sexteen -->WIKIPREFSTOPIC DefaultPreferences<!-- /expected --></td> 
    7979  <td><!-- actual -->WIKIPREFSTOPIC <nop>%WIKIPREFSTOPIC%<!-- /actual --></td> 
    8080 </tr> 

  • branches/Release04x02/data/TestCases/WebPreferences.txt

    r481 r505  
    4747                * Set FINALPREFERENCES = WEBTOPICLIST, DENYWEBVIEW, ALLOWWEBVIEW, DENYWEBCHANGE, ALLOWWEBCHANGE, DENYWEBRENAME, ALLOWWEBRENAME, SAUSAGES 
    4848 
    49    * Try and kidnap a final preference from TWikiPreferences. The FINALPREFERENCES setting there should block this 
     49   * Try and kidnap a final preference from DefaultPreferences. The FINALPREFERENCES setting there should block this 
    5050   * Set GLOBALFINALTESTPREF1 = ERROR in web 
    5151   * Set GLOBALFINALTESTPREF2 = ERROR in web 

  • branches/Release04x02/twikiplugins/CommentPlugin/data/TWiki/CommentPlugin.txt

    r503 r505  
    229229| =%<nop>COMMENTPLUGIN_TEMPLATES%= | =comments= | Name of template file in the 'templates' directory that contains the comment templates. The default 'comments.tmpl' automatically includes user templates from %SYSTEMWEB%.CommentPluginTemplate, which in turn includes %SYSTEMWEB%.UserCommentsTemplate. | 
    230230| =%<nop>COMMENTPLUGIN_DEFAULT_TYPE%= | =above= | Default template type | 
    231 These can be set in !TWikiPreferences, in !WebPreferences or in individual topics. 
     231These can be set in !SitePreferences, in !WebPreferences or in individual topics. 
    232232 
    233233#Installation 

  • branches/Release04x02/twikiplugins/PatternSkin/data/TWiki/PatternSkin.txt

    r503 r505  
    7171</pre> 
    7272 
    73 *NOTE:* customization of these values should be done in [[%USERSWEB%.TWikiPreferences]] 
     73*NOTE:* customization of these values should be done in [[%USERSWEB%.SitePreferences]] 
    7474 
    7575If this still does not work, contact the administrator who installs skins. 

  • branches/Release04x02/twikiplugins/PatternSkin/data/TWiki/PatternSkinColorSettings.txt

    r481 r505  
    77---++!! Usage 
    88---+++!! Step 1 
    9 Let %SYSTEMWEB%.PatternSkin point to the custom-made colors style sheet. In [[%MAINWEB%.TWikiPreferences]] put: <verbatim> 
     9Let %SYSTEMWEB%.PatternSkin point to the custom-made colors style sheet. In [[%USERSWEB%.SitePreferences]] put: <verbatim> 
    1010   * Set USERCOLORSURL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/theme-colors.css 
    1111</verbatim> 

  • branches/Release04x02/twikiplugins/PatternSkin/data/TWiki/PatternSkinCustomization.txt

    r481 r505  
    3636   %TMPL:DEF{"top:toolbarbuttons"}%%TMPL:P{"more_link"}%%TMPL:END%</verbatim></blockquote> 
    3737   1 For testing, view any topic and append to the topic name: =?cover=myskin=. You should see an effect now. 
    38    1 To make the changes visible on all pages, go to [[Main.TWikiPreferences]] (to keep %WIKIPREFSTOPIC% intact) and write: 
     38   1 To make the changes visible on all pages, go to [[%USERSWEB%.SitePreferences]] (to keep %WIKIPREFSTOPIC% intact) and write: 
    3939<blockquote><pre> 
    4040   * <nop>Set COVER = myskin 

  • branches/Release04x02/twikiplugins/PreferencesPlugin/data/TWiki/PreferencesPlugin.txt

    r503 r505  
    2020---++ Examples 
    2121        * =%<nop>EDITPREFERENCES%=  
    22         * =%<nop>EDITPREFERENCES{ "%<nop>SYSTEMWEB%.TWikiPreferencesForm" }%=  
     22        * =%<nop>EDITPREFERENCES{ "%<nop>SYSTEMWEB%.SitePreferencesForm" }%=  
    2323 
    2424---++ Plugin Settings 

  • branches/Release04x02/twikiplugins/PreferencesPlugin/lib/TWiki/Plugins/PreferencesPlugin/MANIFEST

    r3 r505  
    11data/TWiki/PreferencesPlugin.txt 0644 
    2 data/TWiki/TWikiPreferencesForm.txt 0644 
     2data/TWiki/DefaultPreferencesForm.txt 0644 
    33lib/TWiki/Plugins/PreferencesPlugin.pm 0444 

  • branches/Release04x02/twikiplugins/TWikiUserMappingContrib/data/TWiki/ManagingUsers.txt

    r481 r505  
    104104cp registernotifyadmin.tmpl registernotifyadmin.myskin.tmpl 
    105105</verbatim> 
    106 then add =myskin= to the beginning of the =SKIN= setting in %MAINWEB%.TWikiPreferences. 
     106then add =myskin= to the beginning of the =SKIN= setting in %USERSWEB%.SitePreferences. 
    107107 
    108108From this point on, your myskin templates will be used for the registration emails. 

  • branches/Release04x02/twikiplugins/TWikiUserMappingContrib/data/TWiki/TWikiUserSetting.txt

    r463 r505  
    11%META:TOPICINFO{author="SteP" date="1187649998" format="1.1" version="1.2"}% 
    2 %META:TOPICPARENT{name="TWikiPreferences"}% 
     2%META:TOPICPARENT{name="DefaultPreferences"}% 
    33---+++ User Settings -- preference variables customizable by users 
    4 Some of the TWikiPreferences are explicitly intended to be customized by TWiki users, though a default is provided in [[%SYSTEMWEB%.%WIKIPREFSTOPIC%]], and a site customisation can take place in [[%LOCALSITEPREFS%]]. 
     4Some of the preferences are explicitly intended to be customized by TWiki users, though a default is provided in [[%SYSTEMWEB%.%WIKIPREFSTOPIC%]], and a site customisation can take place in [[%LOCALSITEPREFS%]]. 
    55 
    66Users can customize these variables by assigning them values. Example: 
    … …  
    1616*See also:* 
    1717   * TWikiVariables - an alphabetical list of all variables 
    18    * TWikiPreferences and [[%LOCALSITEPREFS%]] - where user shortcuts are defined 
     18   * DefaultPreferences and [[%LOCALSITEPREFS%]] - where user shortcuts are defined 

  • branches/Release04x02/twikiplugins/TipsContrib/data/TWiki/TWikiTip023.txt

    r481 r505  
    1010        * Table attributes can be set and overridden in this order: 
    1111                * Default =TABLEATTRIBUTES= Plugin setting in this topic 
    12                 * A =TABLEATTRIBUTES= preferences setting on site-level (TWikiPreferences), web-level (any WebPreferences), or topic level. For example: 
     12                * A =TABLEATTRIBUTES= preferences setting on site-level ([[%USERSWEB%.SitePreferences]]), web-level (any WebPreferences), or topic level. For example: 
    1313                        * =Set TABLEATTRIBUTES = tableborder="0" cellpadding="1" ...= 
    1414 

  • branches/Release04x02/twikiplugins/TwistyContrib/data/TWiki/TwistyContrib.txt

    r503 r505  
    6767 
    6868---+++ You Write  
    69 In your !Main.TWikiPreferences write: 
     69In your !%USERSWEB%.SitePreferences write: 
    7070<verbatim> 
    7171   * Set FLIP = <span id="twid_%CALC{$SETM(twisty_id, + 1)$GET(twisty_id)}%show" class="twistyTrigger twistyMakeVisible"> 

  • branches/Release04x02/twikiplugins/WysiwygPlugin/data/TWiki/WysiwygPluginSettings.txt

    r3 r505  
    1111If you excluded =calls= in =WYSIWYG_EXCLUDE=, you can still define a subset of TWiki variables that do *not* block edits. this is done in the *global* TWiki variable =WYSIWYG_EDITABLE_CALLS=, which should be a list of TWiki variable names separated by vertical bars, with no spaces, e.g: =* Set WYSIWYG_EDITABLE_CALLS = COMMENT|CALENDAR|INCLUDE= 
    1212 
    13 You should set =WYSIWYG_EXCLUDE= and =WYSIWYG_EDITABLE_CALLS= in %MAINWEB%.TWikiPreferences, or in %WEBPREFSTOPIC% for each web. 
     13You should set =WYSIWYG_EXCLUDE= and =WYSIWYG_EDITABLE_CALLS= in %USERSWEB%.SitePreferences, or in %WEBPREFSTOPIC% for each web. 
    1414 
    1515You can define the global variable =WYSIWYGPLUGIN_STICKYBITS= to stop the 
Note: See TracChangeset for help on using the changeset viewer.