Item110: replace occurences of TWIKIWEB with SYSTEMWEB

git-svn-id: http://svn.foswiki.org/trunk/InlineEditPlugin@464 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Nov 8, 2008 · b6b62ed · b6b62ed
1 parent 2b01341
commit b6b62ed
Show file tree

Hide file tree

Showing 28 changed files with 77 additions and 77 deletions.
diff --git a/data/JSTests/JsTestRequestTopicStateMissingTopic.txt b/data/JSTests/JsTestRequestTopicStateMissingTopic.txt
@@ -1,5 +1,5 @@
 %META:TOPICINFO{author="SvenDowideit" date="1166451660" format="1.1" reprev="1.1" version="1.1"}%
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var stateJSON;
 function localAjaxSuccess(o) {
@@ -19,6 +19,6 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
diff --git a/data/JSTests/JsTestRequestTopicStateMissingTopic.txt,v b/data/JSTests/JsTestRequestTopicStateMissingTopic.txt,v
@@ -22,7 +22,7 @@ log
 @
 text
 @%META:TOPICINFO{author="SvenDowideit" date="1166451660" format="1.1" reprev="1.1" version="1.1"}%
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var stateJSON;
 function localAjaxSuccess(o) {
@@ -42,7 +42,7 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
 @
diff --git a/data/JSTests/JsTestRequestTopicStateOK.txt b/data/JSTests/JsTestRequestTopicStateOK.txt
@@ -1,5 +1,5 @@
 %META:TOPICINFO{author="SvenDowideit" date="1166451067" format="1.1" reprev="1.2" version="1.2"}%
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var stateJSON;
 function localAjaxSuccess(o) {
@@ -18,8 +18,8 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
 
 %META:TOPICMOVED{by="SvenDowideit" date="1166450656" from="Sandbox.JsUnitTest" to="Sandbox.JsTestRequestTopicStateOK"}%
diff --git a/data/JSTests/JsTestRequestTopicStateOK.txt,v b/data/JSTests/JsTestRequestTopicStateOK.txt,v
@@ -27,7 +27,7 @@ log
 @
 text
 @%META:TOPICINFO{author="SvenDowideit" date="1166451067" format="1.1" reprev="1.2" version="1.2"}%
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var stateJSON;
 function localAjaxSuccess(o) {
@@ -46,9 +46,9 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
 
 %META:TOPICMOVED{by="SvenDowideit" date="1166450656" from="Sandbox.JsUnitTest" to="Sandbox.JsTestRequestTopicStateOK"}%
 @
@@ -65,7 +65,7 @@ a1 3
 ---++ JsUnit tests for TWiki?
 
 a2 1
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/sample_script_to_test.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/sample_script_to_test.js"></script>
 d4 14
 a17 4
 function testGetTopicInfo() {

diff --git a/data/JSTests/JsTestSuite.txt b/data/JSTests/JsTestSuite.txt
@@ -1,9 +1,9 @@
 %META:TOPICINFO{author="SvenDowideit" date="1166519834" format="1.1" version="1.3"}%
 Run all the Unit tests in order
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run JsTestSuite with TestRuner]]*
 
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 function suite() {
             var testSuite = new top.jsUnitTestSuite();

diff --git a/data/JSTests/JsTestSuite.txt,v b/data/JSTests/JsTestSuite.txt,v
@@ -34,9 +34,9 @@ text
 @%META:TOPICINFO{author="SvenDowideit" date="1166519834" format="1.1" version="1.3"}%
 Run all the Unit tests in order
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run JsTestSuite with TestRuner]]*
 
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 function suite() {
             var testSuite = new top.jsUnitTestSuite();

diff --git a/data/JSTests/SaveFullTopicText.txt b/data/JSTests/SaveFullTopicText.txt
@@ -1,5 +1,5 @@
 %META:TOPICINFO{author="SvenDowideit" date="1166589534" format="1.1" reprev="1.4" version="1.4"}%
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var toSaveTML = "\n---++ Topic Title\n   * bullet1\n   * bullet2\n\nsection 2 with a *little* bold text\n\n|q|w|e|\n|123|234|345|\n|987|987|876|\n\n";
 var stateJSON;
@@ -46,6 +46,6 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
diff --git a/data/JSTests/SaveFullTopicText.txt,v b/data/JSTests/SaveFullTopicText.txt,v
@@ -37,7 +37,7 @@ log
 @
 text
 @%META:TOPICINFO{author="SvenDowideit" date="1166589534" format="1.1" reprev="1.4" version="1.4"}%
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var toSaveTML = "\n---++ Topic Title\n   * bullet1\n   * bullet2\n\nsection 2 with a *little* bold text\n\n|q|w|e|\n|123|234|345|\n|987|987|876|\n\n";
 var stateJSON;
@@ -84,9 +84,9 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
 @
 
 

diff --git a/data/JSTests/SaveOneSection.txt b/data/JSTests/SaveOneSection.txt
@@ -9,7 +9,7 @@ TODO: add retentive tests for matching revisions (and later try to track last re
 
 TODO: this test will fail until the reply contains the changed section, or that it is able to request the before Tml and modify it to compare..
 
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var toSaveTML = "\n\nnew section2 - should be after bullets and before table\n";
 var stateJSON;
@@ -65,6 +65,6 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
diff --git a/data/JSTests/SaveOneSection.txt,v b/data/JSTests/SaveOneSection.txt,v
@@ -47,7 +47,7 @@ TODO: add retentive tests for matching revisions (and later try to track last re
 
 TODO: this test will fail until the reply contains the changed section, or that it is able to request the before Tml and modify it to compare..
 
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var toSaveTML = "\n\nnew section2 - should be after bullets and before table\n";
 var stateJSON;
@@ -103,9 +103,9 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
 @
 
 

diff --git a/data/JSTests/TemplateJsTest.txt b/data/JSTests/TemplateJsTest.txt
@@ -1,6 +1,6 @@
 %META:TOPICINFO{author="SvenDowideit" date="1166477220" format="1.1" version="1.1"}%
 
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var stateJSON;
 function localAjaxSuccess(o) {
@@ -20,6 +20,6 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
diff --git a/data/JSTests/TemplateJsTest.txt,v b/data/JSTests/TemplateJsTest.txt,v
@@ -24,7 +24,7 @@ log
 text
 @%META:TOPICINFO{author="SvenDowideit" date="1166477220" format="1.1" version="1.1"}%
 
-<script language="javascript" src="%PUBURL%/%TWIKIWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
+<script language="javascript" src="%PUBURL%/%SYSTEMWEB%/JSUnitContrib/app/jsUnitCore.js"></script>
 <script language="javascript">
 var stateJSON;
 function localAjaxSuccess(o) {
@@ -44,7 +44,7 @@ function testAjaxResult() {
 }
 </script>
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run test with TestRuner]]*
 
-*[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+*[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
 @
diff --git a/data/JSTests/WebAtom.txt b/data/JSTests/WebAtom.txt
@@ -1,6 +1,6 @@
 %META:TOPICINFO{author="TWikiContributor" date="1138082878" format="1.0" version="$Rev: 8264 $"}%
 <title>%WIKITOOLNAME%'s <nop>%WEB% web</title>
 <subtitle>%MAKETEXT{"The [_1] web of TWiki. TWiki is a Web-Based Collaboration Platform for the Enterprise." args="<nop>%WEB%"}%</subtitle>
-%INCLUDE{"%TWIKIWEB%.WebAtomBase"}% <!--
+%INCLUDE{"%SYSTEMWEB%.WebAtomBase"}% <!--
    * Set SKIN = rssatom
 -->
diff --git a/data/JSTests/WebChanges.txt b/data/JSTests/WebChanges.txt
@@ -1,2 +1,2 @@
 %META:TOPICINFO{author="TWikiContributor" date="1163619832" format="1.0" version="$Rev: 11985 $"}%
-%INCLUDE{"%TWIKIWEB%.%TOPIC%"}%
+%INCLUDE{"%SYSTEMWEB%.%TOPIC%"}%
diff --git a/data/JSTests/WebHome.txt b/data/JSTests/WebHome.txt
@@ -2,7 +2,7 @@
 ---+!! %MAKETEXT{"Welcome to the [_1] web" args="<nop>%WEB%"}%
 
 ---++ %MAKETEXT{"Available Information"}%
-   * *[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+   * *[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
 
 <form action='%SCRIPTURLPATH{"edit"}%/%WEB%/'> 
 %ICON{"newtopic"}% %MAKETEXT{"Create a new Test by name:"}% %MAKETEXT{"(Use a topic name in TWiki.WikiNotation)"}% <br /> 

diff --git a/data/JSTests/WebHome.txt,v b/data/JSTests/WebHome.txt,v
@@ -35,7 +35,7 @@ text
 ---+!! %MAKETEXT{"Welcome to the [_1] web" args="<nop>%WEB%"}%
 
 ---++ %MAKETEXT{"Available Information"}%
-   * *[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
+   * *[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/JsTestSuite][Run JsTestSuite with TestRuner]]*
 
 <form action='%SCRIPTURLPATH{"edit"}%/%WEB%/'> 
 %ICON{"newtopic"}% %MAKETEXT{"Create a new Test by name:"}% %MAKETEXT{"(Use a topic name in TWiki.WikiNotation)"}% <br /> 
@@ -71,7 +71,7 @@ a1 1
 %META:TOPICINFO{author="SvenDowideit" date="1166477273" format="1.1" reprev="1.2" version="1.2"}%
 d5 1
 a5 1
-   * *[[%PUBURL%/%TWIKIWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run JsTestSuite with TestRuner]]*
+   * *[[%PUBURL%/%SYSTEMWEB%/JSUnitContrib/testRunner.html?testpage=%SCRIPTURL{"view"}%/%WEB%/%TOPIC%][Run JsTestSuite with TestRuner]]*
 @
 
 

diff --git a/data/JSTests/WebIndex.txt b/data/JSTests/WebIndex.txt
@@ -1,2 +1,2 @@
 %META:TOPICINFO{author="TWikiContributor" date="1163619832" format="1.0" version="$Rev: 11985 $"}%
-%INCLUDE{"%TWIKIWEB%.%TOPIC%"}%
+%INCLUDE{"%SYSTEMWEB%.%TOPIC%"}%
diff --git a/data/JSTests/WebLeftBar.txt b/data/JSTests/WebLeftBar.txt
@@ -1,5 +1,5 @@
 %META:TOPICINFO{author="TWikiContributor" date="1112002813" format="1.0" version="$Rev: 10700 $"}%
-%INCLUDE{"%IF{"context can_login" then="%TWIKIWEB%.WebLeftBarLogin" else="<nop>"}%" warn="off"}%
+%INCLUDE{"%IF{"context can_login" then="%SYSTEMWEB%.WebLeftBarLogin" else="<nop>"}%" warn="off"}%
    * <b>[[%INCLUDINGWEB%.%HOMETOPIC%][ %ICON{"home"}% <nop>%MAKETEXT{"[_1] Web" args="%INCLUDINGWEB%"}%]]</b>
    * [[%SCRIPTURLPATH{"view"}%/%BASEWEB%/WebTopicCreator?parent=%BASETOPIC%][ %ICON{"newtopic"}% %MAKETEXT{"Create New Topic"}%]]
    * [[WebTopicList][ %ICON{"index"}% %MAKETEXT{"Index"}%]]
@@ -10,4 +10,4 @@
    * [[WebPreferences][ %ICON{"wrench"}% %MAKETEXT{"Preferences"}%]]
 
 ---
-%INCLUDE{ "%TWIKIWEB%.WebLeftBarWebsList" }%
+%INCLUDE{ "%SYSTEMWEB%.WebLeftBarWebsList" }%
diff --git a/data/JSTests/WebNotify.txt b/data/JSTests/WebNotify.txt
@@ -1,9 +1,9 @@
 %META:TOPICINFO{author="TWikiContributor" date="1112002813" format="1.0" version="$Rev: 6708 $"}%
-%MAKETEXT{"This is a subscription service to be automatically notified by e-mail when topics change in this [_1] 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 [_2] in alphabetical order to this list:" args="*<nop>%WEB%*,%TWIKIWEB%.WikiName"}%
+%MAKETEXT{"This is a subscription service to be automatically notified by e-mail when topics change in this [_1] 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 [_2] in alphabetical order to this list:" args="*<nop>%WEB%*,%SYSTEMWEB%.WikiName"}%
 
 	* Main.TWikiGuest - example@your.company
 
-%INCLUDE{"%TWIKIWEB%.WebChangesAlert"}%
+%INCLUDE{"%SYSTEMWEB%.WebChangesAlert"}%
 
-__%MAKETEXT{"Related topics:"}%__ %TWIKIWEB%.WebChangesAlert, %MAINWEB%.%WIKIUSERSTOPIC%, %TWIKIWEB%.TWikiRegistration
+__%MAKETEXT{"Related topics:"}%__ %SYSTEMWEB%.WebChangesAlert, %MAINWEB%.%WIKIUSERSTOPIC%, %SYSTEMWEB%.TWikiRegistration