Changeset 506

Timestamp:

11/10/08 02:51:45 (3 years ago)

Author:

KennethLavrsen

Message:

Item109: Continuing TWiki to Default/SitePreferences update
The Release04x02 should be close to done for preferences
More to come in trunk

Location:

branches/Release04x02

Files:

• lib/MANIFEST (modified) (3 diffs)
• lib/TWiki.pm (modified) (1 diff)
• lib/TWiki.spec (modified) (5 diffs)
• lib/TWiki/UI/Search.pm (modified) (1 diff)
• tools/TWikiKernel/MANIFEST (modified) (3 diffs)
• tools/benchmark.pl (modified) (1 diff)
• twikiplugins/BuildContrib/create_new_extension.pl (modified) (1 diff)
• twikiplugins/BuildContrib/lib/TWiki/Contrib/Build.pm (modified) (1 diff)
• twikiplugins/EmptyPlugin/lib/TWiki/Plugins/EmptyPlugin.pm (modified) (1 diff)
• twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm (modified) (1 diff)
• twikiplugins/WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin/Constants.pm (modified) (1 diff)

branches/Release04x02/lib/MANIFEST

@@ -54 +54 @@
 bin/viewfile 0555
 data/Main/ProjectContributor.txt 0644
+data/Main/SitePreferences.txt 0644
 data/Main/TWikiAdminUser.txt 0644
 data/Main/TWikiGroups.txt 0644
 data/Main/TWikiGuest.txt 0644
-data/Main/TWikiPreferences.txt 0644
 data/Main/UnknownUser.txt 0644
 data/Main/WebAtom.txt 0644
@@ -95 +95 @@
 data/TWiki/ClassMethod.txt 0644
 data/TWiki/ContributedAddOns.txt 0644
+data/TWiki/DefaultPreferences.txt 0644
 data/TWiki/DeleteOrRenameATopic.txt 0644
 data/TWiki/DeleteOrRenameAnAttachment.txt 0644
@@ -161 +162 @@
 data/TWiki/TWikiPlannedFeatures.txt 0644
 data/TWiki/TWikiPlugins.txt 0644
-data/TWiki/TWikiPreferences.txt 0644
 data/TWiki/TWikiReferenceManual.txt 0644
 data/TWiki/TWikiReleaseNotes04x00.txt 0644

branches/Release04x02/lib/TWiki.pm

@@ -1523 +1523 @@
     $this->{forms} = {};
 
-    # Push global preferences from TWiki.TWikiPreferences
+    # Push global preferences from %SYSTEMWEB%.DefaultPreferences
     $prefs->pushGlobalPreferences();
 

branches/Release04x02/lib/TWiki.spec

@@ -1014 +1014 @@
 # Examples: mail.your.company
 # <b>CAUTION</b> This setting can be overridden by a setting of SMTPMAILHOST
-# in TWikiPreferences. Make sure you delete that setting if you are using a
-# TWikiPreferences topic from a previous release of TWiki. To disable all
+# in SitePreferences. Make sure you delete that setting if you are using a
+# SitePreferences topic from a previous release of TWiki. To disable all
 # outgoing mail from TWiki leave both this field and the MailProgram field
 # above blank.
@@ -1025 +1025 @@
 # Net::SMTP will guess it for you. Example: twiki.your.company.
 # <b>CAUTION</b> This setting can be overridden by a setting of SMTPSENDERHOST
-# in TWikiPreferences. Make sure you delete that setting if you are using a
-# TWikiPreferences topic from a previous release of TWiki.
+# in SitePreferences. Make sure you delete that setting if you are using a
+# SitePreferences topic from a previous release of TWiki.
 $TWiki::cfg{SMTP}{SENDERHOST} = '';
 
@@ -1057 +1057 @@
 # server. (e.g. proxy.your.company).
 # <b>CAUTION</b> This setting can be overridden by a PROXYHOST setting
-# in TWikiPreferences. Make sure you delete the setting from there if
-# you are using a TWikiPreferences topic from a previous release of TWiki.
+# in SitePreferences. Make sure you delete the setting from there if
+# you are using a SitePreferences topic from a previous release of TWiki.
 $TWiki::cfg{PROXY}{HOST} = '';
 
@@ -1065 +1065 @@
 # server. Set the port number here (e.g: 8080).
 # <b>CAUTION</b> This setting can be overridden by a PROXYPORT setting
-# in TWikiPreferences. Make sure you delete the setting from there if you
-# are using a TWikiPreferences topic from a previous release of TWiki.
+# in SitePreferences. Make sure you delete the setting from there if you
+# are using a SitePreferences topic from a previous release of TWiki.
 $TWiki::cfg{PROXY}{PORT} = '';
 
@@ -1121 +1121 @@
 # {SitePrefsTopicName}.<br />
 # You are <b>strongly</b> recommended to keep all your local changes in
-# a {LocalSitePreferences} topic rather than changing TWikiPreferences,
+# a {LocalSitePreferences} topic rather than changing DefaultPreferences,
 # as it will make upgrading a lot easier.
 $TWiki::cfg{LocalSitePreferences} = 'Main.SitePreferences';

branches/Release04x02/lib/TWiki/UI/Search.pm

@@ -44 +44 @@
 | =topic="%WEBPREFSTOPIC%"= <br /> =topic="*Bug"= | Limit search to topics: A topic, a topic with asterisk wildcards, or a list of topics separated by comma. | All topics in a web |
 | =excludetopic="Web*"= <br /> =excludetopic="%HOMETOPIC%, <nop>WebChanges"= | Exclude topics from search: A topic, a topic with asterisk wildcards, or a list of topics separated by comma. | None |
-| =type="keyword"= <br /> =type="literal"= <br /> =type="regex"= | Do a keyword search like =soap "web service" -shampoo=; a literal search like =web service=; or RegularExpression search like =soap;web service;!shampoo= | =%<nop>SEARCHVAR- DEFAULTTYPE%= [[TWikiPreferences][preferences]] setting (%SEARCHVARDEFAULTTYPE%) |
+| =type="keyword"= <br /> =type="literal"= <br /> =type="regex"= | Do a keyword search like =soap "web service" -shampoo=; a literal search like =web service=; or RegularExpression search like =soap;web service;!shampoo= | =%<nop>SEARCHVAR- DEFAULTTYPE%= [[DefaultPreferences][preferences]] setting (%SEARCHVARDEFAULTTYPE%) |
 | =scope="topic"= <br /> =scope="text"= <br /> =scope="all"= | Search topic name (title); the text (body) of topic; or all (both) | ="text"= |
 | =order="topic"= <br /> =order="created"= <br />  =order="modified"= <br /> =order="editby"= <br /> =order=<br />&nbsp;"formfield(name)"= | Sort the results of search by the topic names, topic creation time, last modified time, last editor, or named field of TWikiForms. The sorting is done web by web; in case you want to sort across webs, create a [[FormattedSearch][formatted]] table and sort it with TablePlugin's initsort | Sort by topic name |

branches/Release04x02/tools/TWikiKernel/MANIFEST

@@ -35 +35 @@
 data/Main/NobodyGroup.txt 0660
 data/Main/ProjectContributor.txt 0660
+data/Main/SitePreferences.txt 0660
 data/Main/TWikiAdminGroup.txt 0660
 data/Main/TWikiGroupTemplate.txt 0660
 data/Main/TWikiGroups.txt 0660
 data/Main/TWikiGuest.txt 0660
-data/Main/TWikiPreferences.txt 0660
 data/Main/TWikiRegistrationAgent.txt 0660
 data/Main/TWikiUsers.txt 0660
@@ -87 +87 @@
 data/TWiki/ClassMethod.txt 0660
 data/TWiki/DakarReleaseNotes.txt 0660
+data/TWiki/DefaultPreferences.txt 0660
 data/TWiki/DeleteOrRenameATopic.txt 0660
 data/TWiki/DeleteOrRenameAnAttachment.txt 0660
@@ -151 +152 @@
 data/TWiki/TWikiPlannedFeatures.txt 0660
 data/TWiki/TWikiPlugins.txt 0660
-data/TWiki/TWikiPreferences.txt 0660
 data/TWiki/TWikiReferenceManual.txt 0660
 data/TWiki/TWikiRegistration.txt 0660

branches/Release04x02/tools/benchmark.pl

@@ -62 +62 @@
 
     $skin = "" unless $skin;
-    my $url = "$server/$install/bin/view/TWiki/TWikiPreferences";
+    my $url = "$server/$install/bin/view/TWiki/DefaultPreferences";
     print "*** Getting plugins for $install\n" if $debug;
     my $plugins = `wget -O - $url 2>&1 | grep 'Currently activated plugins:' | sed -e 's/^.*: //'`;

branches/Release04x02/twikiplugins/BuildContrib/create_new_extension.pl

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

branches/Release04x02/twikiplugins/BuildContrib/lib/TWiki/Contrib/Build.pm

@@ -2083 +2083 @@
       1 Manually edit !LocalSite.cfg to set any configuration variables.
 
-%IF{"defined 'SYSTEMWEB'" else="<div class='twikiAlert'>%X% WARNING: SYSTEMWEB is not defined in this TWiki. Please add these definitions to your %MAINWEB%.TWikiPreferences, if they are not already there:<br><pre>   * <nop>Set SYSTEMWEB = %<nop>SYSTEMWEB%<br>   * <nop>Set USERSWEB = %<nop>MAINWEB%</pre></div>"}%
+%IF{"defined 'SYSTEMWEB'" else="<div class='twikiAlert'>%X% WARNING: SYSTEMWEB is not defined in this TWiki. Please add these definitions to your %MAINWEB%.DefaultPreferences, if they are not already there:<br><pre>   * <nop>Set SYSTEMWEB = %<nop>SYSTEMWEB%<br>   * <nop>Set USERSWEB = %<nop>MAINWEB%</pre></div>"}%

branches/Release04x02/twikiplugins/EmptyPlugin/lib/TWiki/Plugins/EmptyPlugin.pm

@@ -96 +96 @@
 # is not recommended. Instead, use $TWiki::cfg entries set in LocalSite.cfg, or
 # if you want the users to be able to change settings, then use standard TWiki
-# preferences that can be defined in your Main.TWikiPreferences and overridden
+# preferences that can be defined in your %USERSWEB%.SitePreferences and overridden
 # at the web and topic level.
 $NO_PREFS_IN_TOPIC = 1;

branches/Release04x02/twikiplugins/TWikiUserMappingContrib/test/unit/TWikiUserMappingContrib/TWikiUserMappingTests.pm

@@ -57 +57 @@
     $TWiki::cfg{UsersWebName}         = $testUsersWeb;
     $TWiki::cfg{SystemWebName}        = $testSysWeb;
-    $TWiki::cfg{LocalSitePreferences} = "$testUsersWeb.TWikiPreferences";
+    $TWiki::cfg{LocalSitePreferences} = "$testUsersWeb.SitePreferences";
     $TWiki::cfg{UserMappingManager}   = 'TWiki::Users::TWikiUserMapping';
     $TWiki::cfg{Register}{AllowLoginName}            = 1;

branches/Release04x02/twikiplugins/WysiwygPlugin/lib/TWiki/Plugins/WysiwygPlugin/Constants.pm

@@ -22 +22 @@
 our (%KNOWN_COLOUR);
 
-# Colours with colour settings in TWikiPreferences. WTF does TWiki see
+# Colours with colour settings in DefaultPreferences. WTF does TWiki see
 # fit to *redefine* the standard colors? e.g. ORANGE below is *not* orange.
 # For goodness sakes!