Changeset 1284

Timestamp:

12/12/08 05:52:54 (3 years ago)

Author:

SvenDowideit

Message:

Item41: remove the duplicate TAG topics - like VarREVINFO and VarREVINFO2

Location:

trunk/core

Files:

• data/System/VarGMTIME2.txt (modified) (1 diff)
• data/System/VarREVINFO.txt (modified) (1 diff)
• data/System/VarREVINFO2.txt (deleted)
• lib/Foswiki/Contrib/core/MANIFEST (modified) (1 diff)

trunk/core/data/System/VarGMTIME2.txt

@@ -26 +26 @@
    * Example: =%<nop>GMTIME{"$day $month, $year - $hour:$min:$sec"}%= expands to =%GMTIME{"$day $month, $year - $hour:$min:$sec"}%=
    * __%X% Note:__ When used in a template topic, this macro will be expanded when the template is used to create a new topic. See TemplateTopics#TemplateTopicsVars for details.
-   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarDISPLAYTIME][DISPLAYTIME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarGMTIME][GMTIME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarREVINFO2][REVINFO]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSERVERTIME][SERVERTIME]]
-
+   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarDISPLAYTIME][DISPLAYTIME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarGMTIME][GMTIME]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarREVINFO][REVINFO]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarSERVERTIME][SERVERTIME]]

trunk/core/data/System/VarREVINFO.txt

@@ -3 +3 @@
 #VarREVINFO
 ---+++ REVINFO -- revision information of current topic
-   * Syntax: =%<nop>REVINFO%=
-   * Expands to: <code>%REVINFO%</code>
-   * Date format defined as {DefaultDateFormat} in [[%SCRIPTURLPATH{"configure"}%][configure]] 
-   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarREVINFO2][REVINFO{"format"}]]
-
+   * Syntax:
+   * Date format defined as {DefaultDateFormat} in [[%SCRIPTURLPATH{"configure"}%][configure]]
+---+++ REVINFO{"format"} -- formatted revision information of topic
+   * Syntax: =%<nop>REVINFO%= OR =%<nop>REVINFO{"format"}%=
+   * =%<nop>REVINFO%= is equivalent to =%<nop>REVINFO{format="r1.$rev - $date - $wikiusername"}%=
+      * Expands to: <code>%REVINFO%</code>
+   * Supported parameters:
+     | *Parameter:* | *Description:* | *Default:* |
+     | ="format"= | Format of revision information, see supported formatting tokens below | ="r1.$rev - $date - $wikiusername"= |
+     | =web="..."= | Name of web | Current web |
+     | =topic="..."= | Topic name | Current topic |
+     | =rev="1.5"= | Specific revision number | Latest revision |
+   * Supported formatting tokens:
+     | *Token:* | *Unit:* | *Example* |
+     | =$web= | Name of web | Current web |
+     | =$topic= | Topic name | Current topic |
+     | =$rev= | Revision number. Prefix =r1.= to get the usual =r1.5= format | =5= |
+     | =$username= | Login username of revision | =jsmith= |
+     | =$wikiname= | WikiName of revision | =JohnSmith= |
+     | =$wikiusername= | <nop>WikiName with %USERSWEB% web prefix | =%USERSWEB%.JohnSmith= |
+     | =$date= | Revision date. Actual date format defined as {DefaultDateFormat} in [[%SCRIPTURLPATH{"configure"}%][configure]] | =21 Sep 2006= |
+     | =$time= | Revision time | =23:24:25= |
+     | =$iso= | Revision date in ISO date format | =2006-09-22T06:24:25Z= |
+     | =$min=, =$sec=, etc. | Same date format qualifiers as [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarGMTIME2][GMTIME{"format"}]] | |
+   * Example: =%<nop>REVINFO{"$date - $wikiusername" rev="1.1"}%= returns revision info of first revision
+   * Related: [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarGMTIME2][GMTIME{"format"}]], [[%IF{"'%INCLUDINGTOPIC%'='Macros'" then="#"}%VarREVINFO][REVINFO]]

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

@@ -249 +249 @@
 data/System/VarREMOTEUSER.txt 0644
 data/System/VarREVINFO.txt 0644
-data/System/VarREVINFO2.txt 0644
 data/System/VarS.txt 0644
 data/System/VarSCRIPTNAME.txt 0644