Changeset 526


Ignore:
Timestamp:
11/10/08 22:01:01 (3 years ago)
Author:
KennethLavrsen
Message:

Item109: More TWikiPreferences to Default/SitePreferences changes
More to come

Location:
trunk
Files:
34 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/ActionTrackerPlugin/data/TWiki/ActionTrackerPlugin.txt

    r502 r526  
    339339        * Set SHORTDESCRIPTION = Adds support for action tags in topics, and automatic notification of action statuses 
    340340--> 
    341 You can override the defaults for these values in %MAINWEB%.<nop>TWikiPreferences, the Web<nop>Preferences topic of the current web, or in individual topics. Use the standard TWiki 'Set' syntax e.g: 
     341You can override the defaults for these values in %USERSWEB%.<nop>SitePreferences, the Web<nop>Preferences topic of the current web, or in individual topics. Use the standard TWiki 'Set' syntax e.g: 
    342342<pre> 
    343343   *<nop> Set ACTIONTRACKERPLUGIN_EDITORIENT = rows 

  • trunk/BuildContrib/create_new_extension.pl

    r492 r526  
    317317|  Appraisal: | %$UPLOADTARGETSCRIPT%/view%$UPLOADTARGETSUFFIX%/%$UPLOADTARGETWEB%/%$MODULE%Appraisal | 
    318318 
    319 __Related Topics:__ %SYSTEMWEB%.TWiki%$TYPE%s, %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.TWikiPreferences 
     319__Related Topics:__ %SYSTEMWEB%.TWiki%$TYPE%s, %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences 
    320320 
    321321<!-- Do _not_ attempt to edit this topic; it is auto-generated. Please add comments/questions/remarks to the feedback topic on twiki.org instead. --> 

  • trunk/CopyCatSkin/data/TWiki/CopyCatSkin.txt

    r464 r526  
    1111        * put the download archive in =$twikiroot= 
    1212        * unzip, with directories (will put files in =templates/, pub/Plugins/CopyCatSkin/, data/Plugins/=) 
    13         * edit TWiki.TWikiPreferences, WebPreferences, or your personal page and set the variables 
     13        * edit %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences, WebPreferences, or your personal page and set the variables 
    1414<verbatim> 
    1515                * Set SKIN = cc-movabletype 

  • trunk/CopyCatSkin/pub/TWiki/CopyCatSkin/CopyCatSkin.txt

    r464 r526  
    1111        * put the download archive in =$twikiroot= 
    1212        * unzip, with directories (will put files in =templates/, pub/Plugins/CopyCatSkin/, data/Plugins/=) 
    13         * edit TWiki.TWikiPreferences, WebPreferences, or your personal page and set the variables 
     13        * edit %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences, WebPreferences, or your personal page and set the variables 
    1414<verbatim> 
    1515                * Set SKIN = cc-movabletype 

  • trunk/DateFieldPlugin/data/TWiki/DateFieldPlugin.txt

    r498 r526  
    2929        * Set SHORTDESCRIPTION = Adds a =date= type to forms 
    3030--> 
    31 The default date format is taken from the JSCalendarContrib settings. You can change the date format by setting the TWiki variable 'DATEFORMAT' in your !TWikiPreferences, your !WebPreferences or in a topic. For example: 
     31The default date format is taken from the JSCalendarContrib settings. You can change the date format by setting the TWiki variable 'DATEFORMAT' in your !%SYSTEMWEB%.DefaultPreferences, your !%USERSWEB%.SitePreferences, your !WebPreferences or in a topic. For example: 
    3232   * Set <nop>DATEFORMAT = %c 
    3333Look up =strftime= in Google for a full list of the format options. 
    3434 
    35 The plugin can default to todays date by setting the TWiki variable 'DATEFIELDPLUGIN_DEFAULTTOTODAY' in your !TWikiPreferences, your !WebPreferences or in a topic.  For example: 
     35The plugin can default to todays date by setting the TWiki variable 'DATEFIELDPLUGIN_DEFAULTTOTODAY' in your !%SYSTEMWEB%.DefaultPreferences, your !%USERSWEB%.SitePreferences, your !WebPreferences or in a topic.  For example: 
    3636   * Set <nop>DATEFIELDPLUGIN_DEFAULTTOTODAY = 1 
    3737 

  • trunk/FormQueryPlugin/data/TWiki/FormQueryPlugin.txt

    r140 r526  
    459459      * <nop>Set FORMQUERYPLUGIN_ENABLE = 1 
    460460</pre> 
    461    * You can set a global default for the =moan= parameter by setting the =FORMQUERYPLUGIN_MOAN variable in %MAINWEB%.TWikiPreferences, WebPreferences in individual webs, or in individual topics. 
     461   * You can set a global default for the =moan= parameter by setting the =FORMQUERYPLUGIN_MOAN variable in %USERSWEB%.SitePreferences, WebPreferences in individual webs, or in individual topics. 
    462462   * FormQueryPlugin must appear in the Plugins evaluation order *before* TWiki:Plugins/SpreadSheetPlugin. You can ensure this by putting !FormQueryPlugin immediately after Default<nop>Plugin in the {PluginsOrder} list in =configure=. 
    463463   * Note: If you are using it, TWiki:Plugins/MacrosPlugin must appear in the Plugins evaluation order *before* FormQueryPlugin. 

  • trunk/FormQueryPlugin/test/unit/FormQueryPlugin/testDB.dat

    r492 r526  
    163163|TWikiPlannedFeatures|text|481|15-Nov-2000| 
    164164|TWikiPlugins|text|14377|15-Sep-2001| 
    165 |TWikiPreferences|text|7205|14-Sep-2001| 
     165|DefaultPreferences|text|7205|14-Sep-2001| 
    166166|TWikiRegistration|text|4009|11-Aug-2001| 
    167167|TWikiRegistrationPub|text|8455|11-Aug-2001| 

  • trunk/InlineEditPlugin/data/JSTests/WebPreferences.txt,v

    r464 r526  
    3737---++ Web Preferences Settings 
    3838 
    39 These settings override the defaults for this web only. See [[%SYSTEMWEB%.TWikiPreferences#DefaultWebPreferences][full list of defaults with explanation]]. Many of the settings below are commented out. Remove the # sign to enable a local customisation. 
     39These settings override the defaults for this web only. See [[%SYSTEMWEB%.DefaultPreferences#DefaultWebPreferences][full list of defaults with explanation]]. Many of the settings below are commented out. Remove the # sign to enable a local customisation. 
    4040 
    4141   * List of topics of the <nop>%WEB% web: 

  • trunk/NatSkin/data/Main/WebLinks.txt

    r482 r526  
    11%META:TOPICINFO{author="ProjectContributor" date="1174668643" format="1.1" reprev="1.4" version="$Rev$"}% 
    2 %META:TOPICPARENT{name="TWikiPreferences"}% 
    32---+ %TOPIC% 
    43 

  • trunk/NatSkin/data/TWiki/NatSkinConfiguration.txt

    r498 r526  
    1515that the selection made there will only last for the current session. You 
    1616need to add the respective preference variables to your [[%WIKIUSERNAME%][home topic]] 
    17 or the WebPreferences or the %MAINWEB%.TWikiPreferences to make the selection 
     17or the WebPreferences or the %USERSWEB%.SitePreferences to make the selection 
    1818persistent. 
    1919 
    … …  
    9696them using javascript. Most likely, web crawlers will only parse the html and don't run a javascript interpreter  
    9797beforehand. Nevertheless the obfuscation feature can be switched on and off by adding the =OBFUSCATEEMAIL= variable 
    98 to your %SYSTEMWEB%.TWikiPreferences like 
     98to your %SYSTEMWEB%.DefaultPreferences or %USERSWEB%.SitePreferences like 
    9999 
    100100<verbatim> 

  • trunk/NatSkin/data/TWiki/TWikiWebLinks.txt

    r482 r526  
    11%META:TOPICINFO{author="ProjectContributor" date="1197888740" format="1.1" reprev="1.10" version="$Rev$"}% 
    2 %META:TOPICPARENT{name="TWikiPreferences"}% 
    32---+ %TOPIC% 
    43 

  • trunk/PatternSkin/data/TWiki/PatternSkin.txt

    r498 r526  
    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. 

  • trunk/PatternSkin/data/TWiki/PatternSkinColorSettings.txt

    r482 r526  
    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 [[%SYSTEMWEB%.DefaultPreferences]] or [[%USERSWEB%.SitePreferences]] put: <verbatim> 
    1010   * Set USERCOLORSURL = %PUBURLPATH%/%SYSTEMWEB%/PatternSkin/theme-colors.css 
    1111</verbatim> 

  • trunk/PatternSkin/data/TWiki/PatternSkinCustomization.txt

    r482 r526  
    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 

  • trunk/PreferencesPlugin/data/TWiki/PreferencesPlugin.txt

    r498 r526  
    2020---++ Examples 
    2121        * =%<nop>EDITPREFERENCES%=  
    22         * =%<nop>EDITPREFERENCES{ "%<nop>SYSTEMWEB%.TWikiPreferencesForm" }%=  
     22        * =%<nop>EDITPREFERENCES{ "%<nop>SYSTEMWEB%.DefaultPreferencesForm" }%=  
    2323 
    2424---++ Plugin Settings 

  • trunk/SyntaxHighlightingPlugin/data/TWiki/SyntaxHighlightingPlugin.txt

    r498 r526  
    11%META:TOPICINFO{author="tisser_n" date="1043231880" format="1.0" version="1.4"}% 
    2 %META:TOPICPARENT{name="TWikiPreferences"}% 
    32<!-- 
    43   * Set SHORTDESCRIPTION = This Plugin is used to emphasize the rendering of your wiki text according to several languages. 

  • trunk/TWikiNetSkin/data/TWiki/TWikiNetSkin.txt

    r482 r526  
    2222 
    2323---+++ Additional installation steps 
    24    * Modify TablePlugin settings: copy the =TABLEATTRIBUTES= below to !Main.TWikiPreferences: %BR% 
     24   * Modify TablePlugin settings: copy the =TABLEATTRIBUTES= below to !%USERSWEB%.SitePreferences: %BR% 
    2525   <verbatim> 
    2626   * TWikiNetSkin table attributes: 
    2727      * 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" 
    2828</verbatim> 
    29    * In !TWiki.TWikiPreferences, remove the =&lt;div class="twikiBroadcastMessage"&gt;&lt;/div&gt;= tags (if any) from =BROADCASTMESSAGE= 
     29   * In !%SYSTEMWEB%.DefaultPreferences, remove the =&lt;div class="twikiBroadcastMessage"&gt;&lt;/div&gt;= tags (if any) from =BROADCASTMESSAGE= 
    3030 
    31    * To turn on the skin, write in !Main.TWikiPreferences: %BR% 
     31   * To turn on the skin, write in !%USERSWEB%.SitePreferences: %BR% 
    3232   <verbatim> 
    3333      * Set SKIN = twikinet,pattern 

  • trunk/TWikiNetSkin/data/TWiki/TWikiNetSkinColorSettings.txt

    r482 r526  
    66---++!! Usage 
    77---+++!! Step 1 
    8 Let %SYSTEMWEB%.TWikiNetSkin point to the custom-made colors style sheet. In [[%MAINWEB%.TWikiPreferences]] put: 
     8Let %SYSTEMWEB%.TWikiNetSkin point to the custom-made colors style sheet. In [[%USERSWEB%.SitePreferences]] put: 
    99<verbatim> 
    1010   * Set USERCOLORSURL = %PUBURLPATH%/%SYSTEMWEB%/TWikiNetSkin/theme-colors.css 

  • trunk/TWikiNetSkinPlugin/data/TWiki/TWikiNetSkinPlugin.txt

    r498 r526  
    4848|  Appraisal: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal | 
    4949 
    50 __Related Topics:__ %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences, %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.TWikiPreferences 
     50__Related Topics:__ %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences, %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences 

  • trunk/TWikiUserMappingContrib/data/TWiki/ManagingUsers.txt

    r482 r526  
    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. 

  • trunk/TWikiUserMappingContrib/data/TWiki/TWikiUserSetting.txt

    r464 r526  
    1 %META:TOPICINFO{author="SteP" date="1187649998" format="1.1" version="1.2"}% 
    2 %META:TOPICPARENT{name="TWikiPreferences"}% 
     1%META:TOPICINFO{author="ProjectContributor" date="1187649998" format="1.1" version="1.2"}% 
    32---+++ 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%]]. 
     3Some 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%]]. 
    54 
    65Users can customize these variables by assigning them values. Example: 
    … …  
    1615*See also:* 
    1716   * TWikiVariables - an alphabetical list of all variables 
    18    * TWikiPreferences and [[%LOCALSITEPREFS%]] - where user shortcuts are defined 
     17   * %SYSTEMWEB%.DefaultPreferences and [[%LOCALSITEPREFS%]] - where user shortcuts are defined 

  • trunk/TipsContrib/data/TWiki/TWikiTip023.txt

    r482 r526  
    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 (%SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences), web-level (any WebPreferences), or topic level. For example: 
    1313                        * =Set TABLEATTRIBUTES = tableborder="0" cellpadding="1" ...= 
    1414 

  • trunk/TwistyContrib/data/TWiki/TwistyContrib.txt

    r498 r526  
    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"> 

  • trunk/WebDAVPlugin/data/TWiki/WebDAVPlugin.txt

    r464 r526  
    182182 
    183183You may want to add a new DAV-edit-link to your attachments table. 
    184    * Add the following to your TWikiPreferences: 
     184   * Add the following to your %SYSTEMWEB%.DefaultPreferences or your %USERSWEB%.SitePreferences: 
    185185<verbatim> 
    186186   * For the WebDAV edit link in the attachment tables we need the DAV-path, which is the PUBURL with twiki replaced by the alias set in httpd.conf: 

  • trunk/WebDAVPlugin/test/unit/WebDAVPlugin/CReadTest.pm

    r387 r526  
    109109  $db->processText("Web", "WebPreferences", 
    110110                                   "\t* Set DENYWEBVIEW = atv1\n"); 
    111   $db->processText("TWiki", "TWikiPreferences", 
     111  $db->processText("TWiki", "DefaultPreferences", 
    112112                                   "\t* Set DENYWEBVIEW = atv2\n"); 
    113113  $db = undef; # force close 
    … …  
    122122  my $db = new TWiki::Plugins::WebDAVPlugin::Permissions($tmpdir); 
    123123 
    124   $db->processText("TWiki", "TWikiPreferences", 
     124  $db->processText("TWiki", "DefaultPreferences", 
    125125                                   "\t* Set DENYWEBVIEW = UsGroup\n"); 
    126126  $db->processText("Main", "UsGroup", 

  • trunk/WebDAVPlugin/test/unit/WebDAVPlugin/WriteReadTest.pm

    r387 r526  
    155155    my $db = new TWiki::Plugins::WebDAVPlugin::Permissions($tmpdir); 
    156156 
    157     $db->processText("TWiki", "TWikiPreferences", 
     157    $db->processText("TWiki", "DefaultPreferences", 
    158158                     "\t* Set DENYWEBVIEW = $dv\n\t* Set ALLOWWEBVIEW = $av\n\t* Set DENYTOPICCHANGE = $dt"); 
    159159    $db = undef; # force close 
    … …  
    170170    $this->assert_str_equals 
    171171      ($dttest, 
    172        $hash{"P:/TWiki/TWikiPreferences:C:D"}); 
     172       $hash{"P:/TWiki/DefaultPreferences:C:D"}); 
    173173    untie(%hash); 
    174174 
    175175    $db = new TWiki::Plugins::WebDAVPlugin::Permissions($tmpdir); 
    176     $db->processText("TWiki", "TWikiPreferences", ""); 
     176    $db->processText("TWiki", "DefaultPreferences", ""); 
    177177    $db = undef; # force close 
    178178 
    … …  
    180180    $this->assert_null($hash{"P:/:V:D"}); 
    181181    $this->assert_null($hash{"P:/:V:A"}); 
    182     $this->assert_null($hash{"P:/TWiki/TWikiPreferences:C:D"}); 
     182    $this->assert_null($hash{"P:/TWiki/DefaultPreferences:C:D"}); 
    183183    untie(%hash); 
    184184} 
    … …  
    188188    my $db = new TWiki::Plugins::WebDAVPlugin::Permissions($tmpdir); 
    189189 
    190     $db->processText("TWiki", "TWikiPreferences", 
     190    $db->processText("TWiki", "DefaultPreferences", 
    191191                     "\t* Set DENYWEBVIEW = TurfGroup\n\t* Set ALLOWWEBVIEW = Main.SodGroup\n"); 
    192192    $db->processText("Main", "SodGroup", 

  • trunk/WebPermissionsPlugin/data/TWiki/WebPermissionsPlugin.txt

    r498 r526  
    161161%$INSTALL_INSTRUCTIONS% 
    162162 
    163 To access the Topic Permission editor, add =webpermissions= to the SKIN setting in %MAINWEB%.TWikiPreferences . 
     163To access the Topic Permission editor, add =webpermissions= to the SKIN setting in %USERSWEB%.SitePreferences . 
    164164e.g. =Set SKIN=webpermissions,pattern=) 
    165165 
    … …  
    190190|  Appraisal: | http://TWiki.org/cgi-bin/view/Plugins/%TOPIC%Appraisal | 
    191191 
    192 __Related Topics:__ %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences, %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.TWikiPreferences 
     192__Related Topics:__ %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences, %SYSTEMWEB%.DeveloperDocumentationCategory, %SYSTEMWEB%.AdminDocumentationCategory, %SYSTEMWEB%.DefaultPreferences, %USERSWEB%.SitePreferences 
    193193 
    194194%META:FILEATTACHMENT{name="wikiringlogo20x20.png" attr="h" comment="" version="1"}% 

  • trunk/WysiwygPlugin/data/TWiki/WysiwygPluginSettings.txt

    r14 r526  
    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 

  • trunk/core/data/Main/SitePreferences.txt

    r492 r526  
    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 

  • trunk/core/data/TWiki/TWikiHistory.txt

    r482 r526  
    133133      * Change in WikiWord definition: Numbers are treated as lower case letters, e.g. !Y2K is now a !WikiWord. 
    134134      * Configurable template load path. Advanced feature for those that work with customized templates. 
    135       * Added %<nop>VBAR% to TWikiPreferences for vertical bar symbol. 
     135      * Added %<nop>VBAR% to !TWikiPreferences for vertical bar symbol. 
    136136      * On topic creation, force initial letter of topic name to be upper case. 
    137137      * Allow date format in form fields. 
    … …  
    607607      * Ref-By link searches all webs (not just the current web.)  
    608608   * *16 Aug 2000* - TWiki:Main.PeterThoeny 
    609       * New TWikiPreferences variables =%<nop>HTTP_EQUIV_ON_VIEW%= , =%<nop>HTTP_EQUIV_ON_EDIT%= and =%<nop>HTTP_EQUIV_ON_PREVIEW%= that define the =&lt;meta http-equiv="..."&gt;= meta tags for the TWiki templates. This can be used for example to set a document expiration time.  
     609      * New !TWikiPreferences variables =%<nop>HTTP_EQUIV_ON_VIEW%= , =%<nop>HTTP_EQUIV_ON_EDIT%= and =%<nop>HTTP_EQUIV_ON_PREVIEW%= that define the =&lt;meta http-equiv="..."&gt;= meta tags for the TWiki templates. This can be used for example to set a document expiration time.  
    610610   * *29 Jul 2000* - TWiki:Main.PeterThoeny 
    611611      * New variables =%<nop>GMTIME{"..."}%= and =%<nop>SERVERTIME{"..."}%= . More in TWikiVariables.  
    … …  
    648648      * New preference variables =%<nop>EDITBOXWIDTH%= and =%<nop>EDITBOXHEIGHT%= to specify the edit box size.  
    649649   * *25 Feb 2000* - TWiki:Main.PeterThoeny 
    650       * Edit preferences topics to set TWiki variables. There are three level of preferences Site-level (TWikiPreferences), web-level (WebPreferences in each web) and user-level preferences (for each of the Main.TWikiUsers). With this, discontinue use of server side include of =wikiwebs.inc= , =wikiwebtable.inc= , =weblist.inc= , =webcopyright.inc= and =webcolors.inc= files.   
     650      * Edit preferences topics to set TWiki variables. There are three level of preferences Site-level (!TWikiPreferences), web-level (WebPreferences in each web) and user-level preferences (for each of the Main.TWikiUsers). With this, discontinue use of server side include of =wikiwebs.inc= , =wikiwebtable.inc= , =weblist.inc= , =webcopyright.inc= and =webcolors.inc= files.   
    651651   * *11 Feb 2000* - TWiki:Main.PeterThoeny 
    652652      * New variable =%<nop>SCRIPTSUFFIX%= / $scriptSuffix containing an optional file extension of the TWiki Perl script. Templates have been changed to use this variable. This allows you to rename the Perl script files to have a file extension like for example ".cgi".  

  • trunk/core/data/TWiki/TWikiUpgradeGuide.txt

    r499 r526  
    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 
    … …  
    105105---+++ Apply Preferences From Old Installation 
    106106 
    107    * Transfer any customized and local settings from [[%SYSTEMWEB%.DefaultPreferences]] to the topic pointed at by {LocalSitePreferences} ([[%LOCALSITEPREFS%]]). Per default this is =Main.TWikiPreferences=. This avoids having to write over files in the distribution on a later upgrade. 
     107   * Transfer any customized and local settings from [[%SYSTEMWEB%.DefaultPreferences]] to the topic pointed at by {LocalSitePreferences} ([[%LOCALSITEPREFS%]]). Per default this is =%USERSWEB%.SitePreferences=. This avoids having to write over files in the distribution on a later upgrade. 
    108108   * If you changed any of the topics in the original TWiki distribution, you will have to transfer your changes to the new install manually. There is no simple way to do this, though a suggestion is to use 'diff' to find changed files in the =data/TWiki= of the old and new TWiki installation, and transfer the changes into the new TWiki install. If you can run a GUI on your server, you may find that using a visual diff tool like !WinMerge, meld, kdiff3, xxdiff, etc. is helpful. 
    109109   * Compare the =WebPreferences= topics in the old TWiki Installation with the default from the new TWiki installation and add any new Preferences that may be relevant. 
    … …  
    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 !%SYSTEMWEB%.DefaultPreferences or !%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 to the TWiki web add this line to %USERSWEB%.SitePreferences 
    132132 
    133133<verbatim> 

  • trunk/core/data/TestCases/TestCaseAutoInternalTags.txt

    r482 r526  
    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> 

  • trunk/core/data/TestCases/WebPreferences.txt

    r482 r526  
    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 

  • trunk/core/lib/TWiki.spec

    r484 r526  
    10141014# Examples: mail.your.company 
    10151015# <b>CAUTION</b> This setting can be overridden by a setting of SMTPMAILHOST 
    1016 # in TWikiPreferences. Make sure you delete that setting if you are using a 
    1017 # TWikiPreferences topic from a previous release of TWiki. To disable all 
     1016# in SitePreferences. Make sure you delete that setting if you are using a 
     1017# SitePreferences topic from a previous release of TWiki. To disable all 
    10181018# outgoing mail from TWiki leave both this field and the MailProgram field 
    10191019# above blank. 
    … …  
    10251025# Net::SMTP will guess it for you. Example: twiki.your.company. 
    10261026# <b>CAUTION</b> This setting can be overridden by a setting of SMTPSENDERHOST 
    1027 # in TWikiPreferences. Make sure you delete that setting if you are using a 
    1028 # TWikiPreferences topic from a previous release of TWiki. 
     1027# in SitePreferences. Make sure you delete that setting if you are using a 
     1028# SitePreferences topic from a previous release of TWiki. 
    10291029$TWiki::cfg{SMTP}{SENDERHOST} = ''; 
    10301030 
    … …  
    10571057# server. (e.g. proxy.your.company). 
    10581058# <b>CAUTION</b> This setting can be overridden by a PROXYHOST setting 
    1059 # in TWikiPreferences. Make sure you delete the setting from there if 
    1060 # you are using a TWikiPreferences topic from a previous release of TWiki. 
     1059# in SitePreferences. Make sure you delete the setting from there if 
     1060# you are using a SitePreferences topic from a previous release of TWiki. 
    10611061$TWiki::cfg{PROXY}{HOST} = ''; 
    10621062 
    … …  
    10651065# server. Set the port number here (e.g: 8080). 
    10661066# <b>CAUTION</b> This setting can be overridden by a PROXYPORT setting 
    1067 # in TWikiPreferences. Make sure you delete the setting from there if you 
    1068 # are using a TWikiPreferences topic from a previous release of TWiki. 
     1067# in SitePreferences. Make sure you delete the setting from there if you 
     1068# are using a SitePreferences topic from a previous release of TWiki. 
    10691069$TWiki::cfg{PROXY}{PORT} = ''; 
    10701070 
    … …  
    11211121# {SitePrefsTopicName}.<br /> 
    11221122# You are <b>strongly</b> recommended to keep all your local changes in 
    1123 # a {LocalSitePreferences} topic rather than changing TWikiPreferences, 
     1123# a {LocalSitePreferences} topic rather than changing DefaultPreferences, 
    11241124# as it will make upgrading a lot easier. 
    11251125$TWiki::cfg{LocalSitePreferences} = 'Main.SitePreferences'; 
Note: See TracChangeset for help on using the changeset viewer.