Changeset 1288

Timestamp:

12/12/08 06:09:24 (3 years ago)

Author:

SvenDowideit

Message:

Item41: remove the duplicate TAG topics - VarSCRIPTURL

Location:

trunk/core

Files:

• data/System/VarSCRIPTURL.txt (modified) (1 diff)
• data/System/VarSCRIPTURL2.txt (deleted)
• data/System/VarSCRIPTURLPATH.txt (modified) (1 diff)
• data/System/VarSCRIPTURLPATH2.txt (deleted)
• lib/Foswiki/Contrib/core/MANIFEST (modified) (1 diff)

trunk/core/data/System/VarSCRIPTURL.txt

@@ -2 +2 @@
 %META:TOPICPARENT{name="Macros"}%
 #VarSCRIPTURL
----+++ SCRIPTURL -- base URL of scripts
-   * Syntax: =%<nop>SCRIPTURL%=
-   * Expands to: =%SCRIPTURL%=
+---+++ SCRIPTURL{"script"} -- URL of script
+   * Syntax: =%<nop>SCRIPTURL%= OR =%<nop>SCRIPTURL{"script"}%=
+   * =%<nop>SCRIPTURL%= returns the base URL of scripts - expands to %SCRIPTURL%
+   * Expands to: =%SCRIPTURL{"script"}%=
+   * Example: To get the authenticated version of the current topic you can write  =%<nop>SCRIPTURL{"viewauth"}%/%<nop>WEB%/%<nop>TOPIC%= which expands to =%SCRIPTURL{"viewauth"}%/%WEB%/%INCLUDINGTOPIC%=
+   * __%X% Note:__ In most cases you should use =%<nop>SCRIPTURLPATH{"script"}%= instead, as it works with URL rewriting much better
    * __Note:__ The =edit= script should always be used in conjunction with =?t=%<nop>GMTIME{"$epoch"}%= to ensure pages about to be edited are not cached in the browser
-   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarPUBURL][PUBURL]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTNAME][SCRIPTNAME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTSUFFIX][SCRIPTSUFFIX]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTURL2][SCRIPTURL{"script"}]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTURLPATH][SCRIPTURLPATH]]
+   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarPUBURL][PUBURL]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTNAME][SCRIPTNAME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTSUFFIX][SCRIPTSUFFIX]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTURLPATH][SCRIPTURLPATH]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTURLPATH2][SCRIPTURLPATH{"script"}]]

trunk/core/data/System/VarSCRIPTURLPATH.txt

@@ -2 +2 @@
 %META:TOPICPARENT{name="Macros"}%
 #VarSCRIPTURLPATH
----+++ SCRIPTURLPATH -- base URL path of scripts
-   * As =%<nop>SCRIPTURL%=, but doesn't include the protocol and host part of the URL
-   * Syntax: =%<nop>SCRIPTURLPATH%=
-   * Expands to: =%SCRIPTURLPATH%=
+---+++ SCRIPTURLPATH{"script"} -- URL path of script
+   * As =%<nop>SCRIPTURL{"script"}%=, but doesn't include the protocol and host part of the URL
+   * Syntax: =%<nop>SCRIPTURL%= OR =%<nop>SCRIPTURLPATH{"script"}%=
+   * Expands to: =%SCRIPTURLPATH{"script"}%=
    * __Note:__ The =edit= script should always be used in conjunction with =?t=%<nop>GMTIME{"$epoch"}%= to ensure pages about to be edited are not cached in the browser
-   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarPUBURLPATH][PUBURLPATH]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTNAME][SCRIPTNAME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTSUFFIX][SCRIPTSUFFIX]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTURL][SCRIPTURL]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTURLPATH2][SCRIPTURLPATH{"script"}]]
+   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarPUBURLPATH][PUBURLPATH]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTNAME][SCRIPTNAME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTSUFFIX][SCRIPTSUFFIX]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTURL][SCRIPTURL]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSCRIPTURL2][SCRIPTURL{"script"}]]

trunk/core/lib/Foswiki/Contrib/core/MANIFEST

@@ -251 +251 @@
 data/System/VarSCRIPTSUFFIX.txt 0644
 data/System/VarSCRIPTURL.txt 0644
-data/System/VarSCRIPTURL2.txt 0644
 data/System/VarSCRIPTURLPATH.txt 0644
-data/System/VarSCRIPTURLPATH2.txt 0644
 data/System/VarSEARCH.txt 0644
 data/System/VarSERVERTIME.txt 0644