diff --git a/lib/WebGUI/Help/a_account.pm b/lib/WebGUI/Help/a_account.pm index f6c79d777..47f79fbf6 100644 --- a/lib/WebGUI/Help/a_account.pm +++ b/lib/WebGUI/Help/a_account.pm @@ -8,7 +8,11 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'Macros' + namespace => 'Macros', + }, + { + tag => 'template language', + namespace => 'Template', }, ] }, diff --git a/lib/WebGUI/i18n/English/AOIHits.pm b/lib/WebGUI/i18n/English/AOIHits.pm index f965d7716..2cef651b4 100644 --- a/lib/WebGUI/i18n/English/AOIHits.pm +++ b/lib/WebGUI/i18n/English/AOIHits.pm @@ -14,11 +14,11 @@ our $I18N = { This macro is for displaying Areas of Interest Hits, which is based on passive profiling of which wobjects are viewed by users, on a per user basis. The macro takes two arguments, a metadata property and metadata value, and returns how many times the current user has -viewed content with that property and value.
+viewed content with that property and value.

^AOIHits(contenttype,sport); would display 99 if this user has looked at content that was tagged "contenttype = sport" 99 times. |, - lastUpdated => 1112466919, + lastUpdated => 1112567357, }, }; diff --git a/lib/WebGUI/i18n/English/AOIRank.pm b/lib/WebGUI/i18n/English/AOIRank.pm index 051e87937..01e04701e 100644 --- a/lib/WebGUI/i18n/English/AOIRank.pm +++ b/lib/WebGUI/i18n/English/AOIRank.pm @@ -11,7 +11,7 @@ our $I18N = { message => q|

-^AOIRank();
+^AOIRank(metadata property, [rank]);
This macro is for displaying Areas of Interest Rankings, which is based on passive profiling of which wobjects are viewed most frequently by users, on a per user basis. The macro takes up to two arguments, a metadata property and the rank of the metadata value to @@ -20,7 +20,7 @@ be returned. If the rank is left out, it defaults to 1, the highest rank.
^AOIRank(contenttype, 2); would return the second highest ranked value for contenttype. |, - lastUpdated => 1112466919, + lastUpdated => 1112560105, }, }; diff --git a/lib/WebGUI/i18n/English/Macros.pm b/lib/WebGUI/i18n/English/Macros.pm index 1250325ab..c066e10a9 100644 --- a/lib/WebGUI/i18n/English/Macros.pm +++ b/lib/WebGUI/i18n/English/Macros.pm @@ -7,9 +7,19 @@ our $I18N = { }, 'macros list body' => { - message => q|

These Macros are available for use on your site:

|, + message => q|

These Macros are available for use on your site. The set of available Macros is defined in the WebGUI configuration file:

|, context => 'Content for dynamically generated macro list', - lastUpdated => 1112395932, + lastUpdated => 1112560683, + }, + + 'macro enabled' => { + message => q|This macro is enabled in the WebGUI configuration file and can be used on this site.|, + lastUpdated => 1046656837, + }, + + 'macro disabled' => { + message => q|This macro is not enabled in the WebGUI configuration file and cannot be used on this site.|, + lastUpdated => 1046656837, }, 'macros using title' => { diff --git a/lib/WebGUI/i18n/English/a_account.pm b/lib/WebGUI/i18n/English/a_account.pm index 33b1012f9..b4099e687 100644 --- a/lib/WebGUI/i18n/English/a_account.pm +++ b/lib/WebGUI/i18n/English/a_account.pm @@ -3,31 +3,36 @@ package WebGUI::i18n::English::a_account; our $I18N = { 'account title' => { - message => q|Account Macro|, + message => q|My Account Macro|, lastUpdated => 1112466408, }, 'account body' => { message => q| -^a; or ^a(); - My Account Link
-A link to your account information. In addition you can change the link text by creating a macro like this ^a("Account Info");. If you specify "linkonly" in the first parameter then only the URL will be returned. Also, you can specify the name of a template in the Macro/a_account namespace as the second parameter to override the default template. -

+^a();
+^a([link text], [template name]);
+This macro creates a link to the current user's account information. The +Macro takes two optional arguments, the text that is displayed with the +link and a template from the Macro/a_account namespace to be used to +display the link and text. If the link text is set to the word +"linkonly" then only the URL will be returned.

+ The following is a list of variables available in the template:

account.url
The URL to the account page. +

account.text
The translated label for the account link, or the text that you supply to the macro.

-NOTES: You can also use the special case ^a(linkonly); to return only the URL to the account page and nothing more. Also, the .myAccountLink style sheet class is tied to this macro. +NOTES: The .myAccountLink style sheet class is tied to this macro.

- |, - lastUpdated => 1112466919, + lastUpdated => 1112560585, }, };