diff --git a/lib/WebGUI/Help/AOIHits.pm b/lib/WebGUI/Help/AOIHits.pm index f364dd480..fe005339c 100644 --- a/lib/WebGUI/Help/AOIHits.pm +++ b/lib/WebGUI/Help/AOIHits.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/AOIRank.pm b/lib/WebGUI/Help/AOIRank.pm index 143d41746..3f1dec43e 100644 --- a/lib/WebGUI/Help/AOIRank.pm +++ b/lib/WebGUI/Help/AOIRank.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/AdminBar.pm b/lib/WebGUI/Help/AdminBar.pm index e4a94b2ac..c4dc3cfc3 100644 --- a/lib/WebGUI/Help/AdminBar.pm +++ b/lib/WebGUI/Help/AdminBar.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/AdminText.pm b/lib/WebGUI/Help/AdminText.pm index f5111168c..38febb8d9 100644 --- a/lib/WebGUI/Help/AdminText.pm +++ b/lib/WebGUI/Help/AdminText.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/AdminToggle.pm b/lib/WebGUI/Help/AdminToggle.pm index 9511d64f8..0c378267b 100644 --- a/lib/WebGUI/Help/AdminToggle.pm +++ b/lib/WebGUI/Help/AdminToggle.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Asset.pm b/lib/WebGUI/Help/Asset.pm index 31b27bfb6..3cf517341 100644 --- a/lib/WebGUI/Help/Asset.pm +++ b/lib/WebGUI/Help/Asset.pm @@ -20,8 +20,12 @@ our $HELP = { namespace => 'Asset' }, { - tag => 'user macros', - namespace => 'WebGUI' + tag => 'aoi hits', + namespace => 'AOIHits' + }, + { + tag => 'aoi rank', + namespace => 'AOIRank' }, { tag => 'wobject add/edit', @@ -37,10 +41,14 @@ our $HELP = { tag => 'metadata manage', namespace => 'Asset' }, - { - tag => 'user macros', - namespace => 'WebGUI' - }, + { + tag => 'aoi hits', + namespace => 'AOIHits' + }, + { + tag => 'aoi rank', + namespace => 'AOIRank' + }, { tag => 'wobject add/edit', namespace => 'Wobject', diff --git a/lib/WebGUI/Help/AssetProxy.pm b/lib/WebGUI/Help/AssetProxy.pm index 96cbd67ed..d9b2e04d0 100644 --- a/lib/WebGUI/Help/AssetProxy.pm +++ b/lib/WebGUI/Help/AssetProxy.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/At_username.pm b/lib/WebGUI/Help/At_username.pm index c92ed227f..756b7c750 100644 --- a/lib/WebGUI/Help/At_username.pm +++ b/lib/WebGUI/Help/At_username.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/CanEditText.pm b/lib/WebGUI/Help/CanEditText.pm index 0ee340bfb..71e7e5f97 100644 --- a/lib/WebGUI/Help/CanEditText.pm +++ b/lib/WebGUI/Help/CanEditText.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/D_date.pm b/lib/WebGUI/Help/D_date.pm index 88d0e7f11..0234ebeee 100644 --- a/lib/WebGUI/Help/D_date.pm +++ b/lib/WebGUI/Help/D_date.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/EditableToggle.pm b/lib/WebGUI/Help/EditableToggle.pm index c508ea58c..47ea0d5ea 100644 --- a/lib/WebGUI/Help/EditableToggle.pm +++ b/lib/WebGUI/Help/EditableToggle.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Env.pm b/lib/WebGUI/Help/Env.pm index a107e0ef9..67030d9d1 100644 --- a/lib/WebGUI/Help/Env.pm +++ b/lib/WebGUI/Help/Env.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Execute.pm b/lib/WebGUI/Help/Execute.pm index 57260873b..3a2460d96 100644 --- a/lib/WebGUI/Help/Execute.pm +++ b/lib/WebGUI/Help/Execute.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Extras.pm b/lib/WebGUI/Help/Extras.pm index d00d44e5f..67451c0da 100644 --- a/lib/WebGUI/Help/Extras.pm +++ b/lib/WebGUI/Help/Extras.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/FileUrl.pm b/lib/WebGUI/Help/FileUrl.pm index 26b452f6d..c505b573f 100644 --- a/lib/WebGUI/Help/FileUrl.pm +++ b/lib/WebGUI/Help/FileUrl.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/FormParam.pm b/lib/WebGUI/Help/FormParam.pm index f92a5340e..a60cb56a4 100644 --- a/lib/WebGUI/Help/FormParam.pm +++ b/lib/WebGUI/Help/FormParam.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/GroupAdd.pm b/lib/WebGUI/Help/GroupAdd.pm index c0541125e..e6d30731d 100644 --- a/lib/WebGUI/Help/GroupAdd.pm +++ b/lib/WebGUI/Help/GroupAdd.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/GroupDelete.pm b/lib/WebGUI/Help/GroupDelete.pm index 8fa13697e..23aaba461 100644 --- a/lib/WebGUI/Help/GroupDelete.pm +++ b/lib/WebGUI/Help/GroupDelete.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/GroupText.pm b/lib/WebGUI/Help/GroupText.pm index e9b68b194..e5505b428 100644 --- a/lib/WebGUI/Help/GroupText.pm +++ b/lib/WebGUI/Help/GroupText.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/H_homeLink.pm b/lib/WebGUI/Help/H_homeLink.pm index 3c3c5e7ea..fbb4043d4 100644 --- a/lib/WebGUI/Help/H_homeLink.pm +++ b/lib/WebGUI/Help/H_homeLink.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Hash_userId.pm b/lib/WebGUI/Help/Hash_userId.pm index f04cd11ef..5ba57d100 100644 --- a/lib/WebGUI/Help/Hash_userId.pm +++ b/lib/WebGUI/Help/Hash_userId.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/If.pm b/lib/WebGUI/Help/If.pm index b63117fde..ad50dbe68 100644 --- a/lib/WebGUI/Help/If.pm +++ b/lib/WebGUI/Help/If.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Include.pm b/lib/WebGUI/Help/Include.pm index 5819b8fdd..85aabb7dd 100644 --- a/lib/WebGUI/Help/Include.pm +++ b/lib/WebGUI/Help/Include.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/International.pm b/lib/WebGUI/Help/International.pm index 694fcdcb4..409630522 100644 --- a/lib/WebGUI/Help/International.pm +++ b/lib/WebGUI/Help/International.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/JavaScript.pm b/lib/WebGUI/Help/JavaScript.pm index 68d3c1752..9dc04ed99 100644 --- a/lib/WebGUI/Help/JavaScript.pm +++ b/lib/WebGUI/Help/JavaScript.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/L_loginBox.pm b/lib/WebGUI/Help/L_loginBox.pm index 1f84982b5..0266e023f 100644 --- a/lib/WebGUI/Help/L_loginBox.pm +++ b/lib/WebGUI/Help/L_loginBox.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/LastModified.pm b/lib/WebGUI/Help/LastModified.pm index 2a16cc3e1..9c7bdfcee 100644 --- a/lib/WebGUI/Help/LastModified.pm +++ b/lib/WebGUI/Help/LastModified.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, { tag => 'date', diff --git a/lib/WebGUI/Help/LoginToggle.pm b/lib/WebGUI/Help/LoginToggle.pm index 7609196a6..ee604df5c 100644 --- a/lib/WebGUI/Help/LoginToggle.pm +++ b/lib/WebGUI/Help/LoginToggle.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Macros.pm b/lib/WebGUI/Help/Macros.pm index 9a7d72ca3..c0c0f17e5 100644 --- a/lib/WebGUI/Help/Macros.pm +++ b/lib/WebGUI/Help/Macros.pm @@ -1,10 +1,20 @@ package WebGUI::Help::Macros; use WebGUI::Session; -use Data::Dumper; our $HELP = { + 'macros using' => { + title => 'macros using title', + body => 'macros using body', + related => [ + { + tag => "macros list", + namespace => "Macros", + }, + ], + }, + 'macros list' => { title => 'macros list title', body => 'macros list body', diff --git a/lib/WebGUI/Help/Navigation.pm b/lib/WebGUI/Help/Navigation.pm index 8afc11251..18c59bdd3 100644 --- a/lib/WebGUI/Help/Navigation.pm +++ b/lib/WebGUI/Help/Navigation.pm @@ -5,10 +5,6 @@ our $HELP = { title => '1098', body => '1093', related => [ - { - tag => 'navigation macros', - namespace => 'WebGUI' - }, { tag => 'navigation template', namespace => 'Navigation' @@ -27,10 +23,6 @@ our $HELP = { title => '1096', body => '1097', related => [ - { - tag => 'navigation macros', - namespace => 'WebGUI' - }, { tag => 'navigation add/edit', namespace => 'Navigation' @@ -49,10 +41,6 @@ our $HELP = { title => '1094', body => '1095', related => [ - { - tag => 'navigation macros', - namespace => 'WebGUI' - }, { tag => 'navigation template', namespace => 'Navigation' diff --git a/lib/WebGUI/Help/Page.pm b/lib/WebGUI/Help/Page.pm index 00d866f7c..15948349b 100644 --- a/lib/WebGUI/Help/Page.pm +++ b/lib/WebGUI/Help/Page.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/PageTitle.pm b/lib/WebGUI/Help/PageTitle.pm index aaddfdaac..088904ae2 100644 --- a/lib/WebGUI/Help/PageTitle.pm +++ b/lib/WebGUI/Help/PageTitle.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/PageUrl.pm b/lib/WebGUI/Help/PageUrl.pm index 7a7386ebc..839fd3fa1 100644 --- a/lib/WebGUI/Help/PageUrl.pm +++ b/lib/WebGUI/Help/PageUrl.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Quote.pm b/lib/WebGUI/Help/Quote.pm index c2230c078..8cc4f4f93 100644 --- a/lib/WebGUI/Help/Quote.pm +++ b/lib/WebGUI/Help/Quote.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/RandomAssetProxy.pm b/lib/WebGUI/Help/RandomAssetProxy.pm index 56dbb3f3d..0587c7b96 100644 --- a/lib/WebGUI/Help/RandomAssetProxy.pm +++ b/lib/WebGUI/Help/RandomAssetProxy.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/RawHeadTags.pm b/lib/WebGUI/Help/RawHeadTags.pm index c120b43c4..8cad5d316 100644 --- a/lib/WebGUI/Help/RawHeadTags.pm +++ b/lib/WebGUI/Help/RawHeadTags.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/RootTitle.pm b/lib/WebGUI/Help/RootTitle.pm index e5e159fe9..87d4d53c8 100644 --- a/lib/WebGUI/Help/RootTitle.pm +++ b/lib/WebGUI/Help/RootTitle.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/SQL.pm b/lib/WebGUI/Help/SQL.pm index 3f8220dac..59af1eefa 100644 --- a/lib/WebGUI/Help/SQL.pm +++ b/lib/WebGUI/Help/SQL.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Slash_gatewayUrl.pm b/lib/WebGUI/Help/Slash_gatewayUrl.pm index 7244a3ea4..29c26b569 100644 --- a/lib/WebGUI/Help/Slash_gatewayUrl.pm +++ b/lib/WebGUI/Help/Slash_gatewayUrl.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Spacer.pm b/lib/WebGUI/Help/Spacer.pm index 04247186e..34e340b00 100644 --- a/lib/WebGUI/Help/Spacer.pm +++ b/lib/WebGUI/Help/Spacer.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/Splat_random.pm b/lib/WebGUI/Help/Splat_random.pm index 024d7da98..ae91ab3c4 100644 --- a/lib/WebGUI/Help/Splat_random.pm +++ b/lib/WebGUI/Help/Splat_random.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/StyleSheet.pm b/lib/WebGUI/Help/StyleSheet.pm index 38107be87..22dbc51ed 100644 --- a/lib/WebGUI/Help/StyleSheet.pm +++ b/lib/WebGUI/Help/StyleSheet.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/URLEncode.pm b/lib/WebGUI/Help/URLEncode.pm index 85946cf62..65b93f3ae 100644 --- a/lib/WebGUI/Help/URLEncode.pm +++ b/lib/WebGUI/Help/URLEncode.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/User.pm b/lib/WebGUI/Help/User.pm index e2bc16279..c7066c0c2 100644 --- a/lib/WebGUI/Help/User.pm +++ b/lib/WebGUI/Help/User.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros', }, ] }, diff --git a/lib/WebGUI/Help/WebGUI.pm b/lib/WebGUI/Help/WebGUI.pm index b16625a53..0ce70b599 100644 --- a/lib/WebGUI/Help/WebGUI.pm +++ b/lib/WebGUI/Help/WebGUI.pm @@ -29,16 +29,6 @@ our $HELP = { } ] }, - 'search engine using' => { - title => '675', - body => '630', - related => [ - { - tag => 'style macros', - namespace => 'WebGUI' - } - ] - }, 'trash empty' => { title => '696', body => '651', @@ -58,10 +48,6 @@ our $HELP = { title => '1073', body => '1074', related => [ - { - tag => 'style macros', - namespace => 'WebGUI' - }, { tag => 'style sheets using', namespace => 'WebGUI' @@ -231,32 +217,6 @@ our $HELP = { ] }, - 'macros using' => { - title => '669', - body => '624', - related => [ - { - tag => 'asset macros', - namespace => 'Asset' - }, - { - tag => 'navigation macros', - namespace => 'WebGUI' - }, - { - tag => 'programmer macros', - namespace => 'WebGUI' - }, - { - tag => 'style macros', - namespace => 'WebGUI' - }, - { - tag => 'user macros', - namespace => 'WebGUI' - } - ] - }, 'trash manage' => { title => '960', body => '961', @@ -303,55 +263,6 @@ our $HELP = { }, ] }, - - 'programmer macros' => { - title => '839', - body => '840', - related => [ - { - tag => 'macros using', - namespace => 'WebGUI' - } - ] - }, - 'navigation macros' => { - title => '841', - body => '842', - related => [ - { - tag => 'macros using', - namespace => 'WebGUI' - }, - { - tag => 'navigation template', - namespace => 'Navigation' - }, - ] - }, - 'user macros' => { - title => '843', - body => '844', - related => [ - { - tag => 'macros using', - namespace => 'WebGUI' - } - ] - }, - 'style macros' => { - title => '845', - body => '846', - related => [ - { - tag => 'macros using', - namespace => 'WebGUI' - }, - { - tag => 'style template', - namespace => 'WebGUI' - } - ] - }, 'clipboard empty' => { title => '968', body => '969', diff --git a/lib/WebGUI/Help/Wobject.pm b/lib/WebGUI/Help/Wobject.pm index 70c26e32c..5574bb15e 100644 --- a/lib/WebGUI/Help/Wobject.pm +++ b/lib/WebGUI/Help/Wobject.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, { tag => 'style sheets using', diff --git a/lib/WebGUI/Help/a_account.pm b/lib/WebGUI/Help/a_account.pm index 1a43167c5..f6c79d777 100644 --- a/lib/WebGUI/Help/a_account.pm +++ b/lib/WebGUI/Help/a_account.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/c_companyName.pm b/lib/WebGUI/Help/c_companyName.pm index 34cf31d25..0e340db52 100644 --- a/lib/WebGUI/Help/c_companyName.pm +++ b/lib/WebGUI/Help/c_companyName.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/e_companyEmail.pm b/lib/WebGUI/Help/e_companyEmail.pm index c44ff12b8..f8b51a3f6 100644 --- a/lib/WebGUI/Help/e_companyEmail.pm +++ b/lib/WebGUI/Help/e_companyEmail.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/r_printable.pm b/lib/WebGUI/Help/r_printable.pm index bb1bdbcf2..8cb7919f7 100644 --- a/lib/WebGUI/Help/r_printable.pm +++ b/lib/WebGUI/Help/r_printable.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/Help/u_companyUrl.pm b/lib/WebGUI/Help/u_companyUrl.pm index 8f8c4ce76..90e26c289 100644 --- a/lib/WebGUI/Help/u_companyUrl.pm +++ b/lib/WebGUI/Help/u_companyUrl.pm @@ -8,7 +8,7 @@ our $HELP = { related => [ { tag => 'macros using', - namespace => 'WebGUI' + namespace => 'Macros' }, ] }, diff --git a/lib/WebGUI/i18n/English/Macros.pm b/lib/WebGUI/i18n/English/Macros.pm index 582af8881..1250325ab 100644 --- a/lib/WebGUI/i18n/English/Macros.pm +++ b/lib/WebGUI/i18n/English/Macros.pm @@ -12,6 +12,23 @@ our $I18N = { lastUpdated => 1112395932, }, + 'macros using title' => { + message => q|Macros, Using|, + lastUpdated => 1046656837 + }, + + 'macros using body' => { + message => q|WebGUI macros are used to create dynamic content within otherwise static content. For instance, you may wish to show which user is logged in on every page, or you may wish to have a dynamically built menu or crumb trail. +

+ +Macros always begin with a caret (^) and follow with at least one other character and ended with a semicolon (;). Some macros can be extended/configured by taking the format of ^x("config text");. When providing multiple arguments to a macro, they should be separated by only commas:
+^x("First argument",2); +

+ +|, + lastUpdated => 1101885876, + }, + }; 1; diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index dca3d8d39..fb0d5f877 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -107,184 +107,6 @@ our $I18N = { lastUpdated => 1031514049 }, - '846' => { - message => q|These macros are mainly useful in maintaining styles in WebGUI. -

- -^AdminBar;
-^AdminBar(custom template ID);
-Places the administrative tool bar on the page. Omitting this macro will prevent you from adding content, pasting -content from the clipboard, accessing the help system and other administrative functions. -

-The macro takes up to one optional argument, an alternate template in the Macro/AdminBar namespace for generating the AdminBar. The following variables are available in the template: - -

-packages.label
-The internationalized label for adding packages. - -

-packages.canAdd
-A boolean indicating whether the current user can add packages. - -

-addContent.label
-The internationalized label for adding content. - -

-contenttypes_loop
-The loop containing different types of content to add - -

-

-contenttype.label
-The internationalized label for this content type. - -

-contenttype.url
-The URL for adding an instance of this content type. - -

- -

-addpage.label
-The internationalized label for adding a page. - -

-addpage.url
-The URL for adding a page. - -

-clipboard.label
-The internationalized label for the clipboard. - -

-clipboard_loop
-The loop containing a list of items in the clipboard. - -

-

-clipboard.label
-The label for this item in the clipboard. - -

-clipboard.url
-The URL for pasting this clipboard item onto the current page. - -

- -

-admin.label
-The internationalized label for administrative functions. - -

-admin_loop
-The loop containing a list of administrative functions, such as turning off admin mode or -validating the current page. - -

-

-admin.label
-The label for this item in the clipboard. - -

-admin.url
-The URL for executing this admin function. - -

- -

- The .adminBar style sheet class is tied to the default template for this macro. - -^c; - Company Name
-The name of your company specified in the settings by your Administrator. -

- - -^e; - Company Email Address
-The email address for your company specified in the settings by your Administrator. -

- -^Extras;
-Returns the path to the WebGUI "extras" folder, which contains things like WebGUI icons. -

- -^JavaScript();
-This macro allows you to set a javascript in the head section of the page. Just pass in the URL to the javascript file. -

- -^LastModified;
-^LastModified("text","date format");
-Displays the date that the current page was last modified based upon the wobjects on the page. By default, the date is displayed based upon the user's date preferences. Optionally, it can take two parameters. The first is text to display before the date. The second is a date format string (see the date macro, ^D;, for details. -

-Example: ^LastModified("Updated: ","%c %D, %y"); -

- - -^PageTitle;
-Displays the title of the current page. -

- -NOTE: If you begin using admin functions or the in-depth functions of any wobject, the page title will become a link that will quickly bring you back to the page. -

- -^r; - Make Page Printable
-^r(link text)
-^r("",custom style name)
-^r("",custom style name,custom template name)
-Creates a link to alter the style from a page to make it printable. - -

- -The macro takes up to three arguments. The first argument allows you to replace the default internationalized link text like this ^r("Print Me!");. If this argument is the string "linkonly", then only the URL to make the page printable will be returned and nothing more. If you wish to use the internationalized label but need to use multiple arguments to change the printable style or template, then use the empty string. - -

- -Normally, the default style to make the page printable is the "Make Page Printable" style. The second argument specifies that a different style than the default be used to make the page printable: ^r("Print!","WebGUI");. - -

- -The third argument allows a different template be used to generate the HTML code for presenting the link and text, by specifying the name of the template. The following variables are available in the template: - -

-printable.url
-The URL to make the page printable. -

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

- -NOTES:The .makePrintableLink style sheet class is tied to the default template for this macro. -

- - -^RootTitle;
-Returns the title of the root of the current page. For instance, the main root in WebGUI is the "Home" page. Many advanced sites have many roots and thus need a way to display to the user which root they are in. -

- -^StyleSheet();
-This macro allows you to set a cascading style sheet in the head section of the page. Just pass in the URL to the CSS file. -

- -^Spacer("width","height");
-Create a spacer in your layout. Great for creating blocks of color with divs and tables. It takes two parameters, width and height. -

-Example: ^Spacer("100","50"); -

- -^RawHeadTags("header tags");
-This macro allows you to set some arbitrary tags in the head section of the page. Just pass in the text. -

- -^u; - Company URL
-The URL for your company specified in the settings by your Administrator. -

- - -|, - lastUpdated => 1103785706, - }, - '1021' => { message => q|Rate Message|, lastUpdated => 1065356764 @@ -380,11 +202,6 @@ The URL of the web site for this theme's designer. If you are in the business of lastUpdated => 1052850265 }, - '675' => { - message => q|Search Engine, Using|, - lastUpdated => 1038888957 - }, - '540' => { message => q|Karma Per Login|, lastUpdated => 1031514049 @@ -1077,190 +894,6 @@ As with any delete operation, you are prompted to be sure you wish to proceed wi lastUpdated => 1065966219 }, - '844' => { - message => q|These macros have to do with users and logins. -

- -^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. -

-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. -

- - -^AdminText();
-Displays a small text message to a user who is in admin mode. Example: ^AdminText("You are in admin mode!"); -

- -^AdminToggle; or ^AdminToggle();
-Places a link on the page which is only visible to content managers and administrators. The link toggles on/off admin mode. You can optionally specify other messages to display like this: ^AdminToggle("Edit On","Edit Off"); This macro optionally takes a third parameter that allows you to specify an alternate template name in the Macro/AdminToggle namespace. -

-The following variables are available in the template: -

-toggle.url
-The URL to activate or deactivate Admin mode. -

-toggle.text
-The Internationalized label for turning on or off Admin (depending on the state of the macro), or the text that you supply to the macro. -

- - -^AOIHits();
-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.
-^AOIHits(contenttype,sport); would display 99 if this user has looked at content that was tagged "contenttype = sport" 99 times. - -

-^AOIRank();
-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 -be returned. If the rank is left out, it defaults to 1, the highest rank.
-^AOIRank(contenttype); would display "sport" if the current user has looked at content tagged "contenttype = sport" the most.
-^AOIRank(contenttype, 2); would return the second highest ranked value for contenttype. -

- -^CanEditText();
-Display a message to a user that can edit the current page. -

-Example: ^CanEditText(^AdminToggle;); -

- -^EditableToggle; or ^EditableToggle();
-Exactly the same as AdminToggle, except that the toggle is only displayed if the user has the rights to edit the current page. This macro takes up to three parameters. The first is a label for "Turn Admin On", the second is a label for "Turn Admin Off", and the third is the name of a template in the Macro/EditableToggle namespace to replace the default template. -

-The following variables are available in the template: -

-toggle.url
-The URL to activate or deactivate Admin mode. -

-toggle.text
-The Internationalized label for turning on or off Admin (depending on the state of the macro), or the text that you supply to the macro. -

- -

- - -^GroupAdd();
-Using this macro you can allow users to add themselves to a group. The first parameter is the name of the group this user should be added to. The second parameter is a text string for the user to click on to add themselves to this group. The third parameter allows you to specify the name of a template in the Macro/GroupAdd namespace to replace the default template. These variables are available in the template: -

-group.url
-The URL with the action to add the user to the group. -

-group.text
-The supplied text string for the user to click on. - -

-NOTE: If the user is not logged in, or or already belongs to the group, or the group is not set to allow auto adds, then no link will be displayed. -

- - -^GroupDelete();
-Using this macro you can allow users to delete themselves from a group. The first parameter is the name of the group this user should be deleted from. The second parameter is a text string for the user to click on to delete themselves from this group. The third parameter allows you to specify the name of a template in the Macro/GroupDelete namespace to replace the default template. These variables are available in the template: -

-group.url
-The URL with the action to add the user to the group. -

-group.text
-The supplied text string for the user to click on. - - -

-NOTE: If the user is not logged in or the user does not belong to the group, or the group is not set to allow auto deletes, then no link will be displayed. -

- -^GroupText();
-Displays a small text message to the user if they belong to the specified group. And you can specify an alternate message to those who are not in the group. -

-Example: ^GroupText("Visitors","You need an account to do anything cool on this site!","We value our registered users!"); -

-^L; or ^L(); - Login Box
-A small login form. This macro takes up to three parameters. The first is used to set the width of the login box: ^L(20);. The second sets the message displayed after the user is logged in: ^L(20,"Hi ^a(^@;);. Click %here% if you wanna log out!");. Text between percent signs (%) is replaced by a link to the logout operation. The third parameter is the ID of a template in the Macro/L_loginBox namespace to replace the default template. The variables below are -available in the template. Not all of them are required, but variables that will cause the macro to output code that doesn't function properly (like not actually log someone in) are marked with an asterisk '*' -

-user.isVisitor
-True if the user is a visitor. -

-customText
-The user defined text to display if the user is logged in. -

-hello.label
-Internationalized welcome message. -

-customText
-The text supplied to the macro to display if the user is logged in. -

-account.display.url
-URL to display the account. -

-logout.label
-Internationalized logout message. -

-* form.header
-Form header. -

-username.label
-Internationalized label for "username". -

-* username.form
-Form element for the username. -

-password.label
-Internationalized label for "password". -

-* password.form
-Form element for the password. -

-* form.login
-Action to perform when logging in. -

-account.create.url
-URL to create an account. -

-account.create.label
-Internationalized label for "create an account" -

-* form.footer
-Form footer. -

- -NOTE: The .loginBox style sheet class is tied to this macro. -

- -^LoginToggle; or ^LoginToggle();
-Displays a "Login" or "Logout" message depending upon whether the user is logged in or not. You can optionally specify other labels like this: ^LoginToggle("Click here to log in.","Click here to log out.");. You can also use the special case ^LoginToggle(linkonly); to return only the URL with no label. -

-toggle.url
-The URL to login or logout. -

-toggle.text
-The Internationalized label for logging in or logging out (depending on the state of the macro), or the text that you supply to the macro. -

- -^@; - Username
-The username of the currently logged in user. -

- - -^#; - User ID
-The user id of the currently logged in user. -

- -|, - lastUpdated => 1101775299 - }, - '329' => { message => q|Work Address|, lastUpdated => 1031514049 @@ -1835,11 +1468,6 @@ The password you use to connect to the DSN. lastUpdated => 1031514049 }, - '843' => { - message => q|User Macros|, - lastUpdated => 1046656765 - }, - '815' => { message => q|The file you tried to upload is too large.|, lastUpdated => 1038023800 @@ -2386,48 +2014,6 @@ You also cannot import a theme from a version of WebGUI that is newer than the o lastUpdated => 1031514049 }, - '842' => { - message => q|

These macros are used to create navigation on the site.

-

^H; or ^H(); - Home Link
A link to the home page of this site. In addition you can change the link text by creating a macro like this ^H("Go Home");. -

NOTES: You can also use the special case ^H(linkonly); to return only the URL to the home page and nothing more. Also, the .homeLink style sheet class is tied to this macro. And you can specify a second parameter that with the name of a template in the Macro/H_homeLink namespace that will override the default template. The following variables are available for use in the template:

-

-homeLink.url
-The URL to the home page. -

-homeLink.text
-The translated label for the link to the home page or the text that you supply to the macro. -

-

^/; - System URL
The URL to the gateway script (example: /index.pl/). -

^PageUrl; - Page URL
The URL to the current page (example: /index.pl/pagename). -

^Navigation(crumbTrail);
A dynamically generated crumb trail to the current page. -

NOTE: The .crumbTrail style sheet class is tied to this macro.

-

^Navigation(FlexMenu);
This menu macro creates a top-level menu that expands as the user selects each menu item.

-

^Navigation(currentMenuVertical);
A vertical menu containing the sub-pages at the current level. By default it tracks 1 level deep.

-

^Navigation(currentMenuHorizontal);
A horizontal menu containing the sub-pages at the current level.

-

^Navigation(PreviousDropMenu);
Create a drop down menu containing the sub-pages at the previous level in the page tree.

-

^Navigation(previousMenuVertical);
A vertical menu containing the sub-pages at the previous level. By default it will show only the first level.

-

^Navigation(previousMenuHorizontal);
A horizontal menu containing the sub-pages at the previous level.

-

^Navigation(rootmenu);
Creates a horizontal menu of the various roots on your system (except for the WebGUI system roots).

-

^Navigation(SpecificDropMenu);
Create a drop down menu starting at a specific point in your navigation tree. The default start page is "home".

-

^Navigation(SpecificSubMenuVertical);
Allows you to get the submenu of any page, starting with the page you specified. The default start page is "home" and it will show the first level.

-

^Navigation(SpecificSubMenuHorizontal);
Allows you to get the submenu of any page, starting with the page you specified. The default start page is "home" and it will show the first level.

-

^Navigation(TopLevelMenuVertical);
A vertical menu containing the main pages of the site (aka the sub-pages from the home page). By default it will show only the first level.

-

^Navigation(TopLevelMenuHorizontal);
A vertical menu containing the main pages of the site (aka the sub-pages from the home page).

-

^Navigation(RootTab);
Create a tab navigation system from the roots on your site (except WebGUI's system roots) similar to the tabs used in the tab forms (editing wobjects or pages).

-

NOTE: Has two special style sheet classes: .rootTabOn and .rootTabOff}. -

Example:
<style> .rootTabOn { line-height: 17px; font-size: 16px; spacing: 3px; border: 1px solid black; border-bottom-width: 0px; background-color: #333333; z-index: 10000; padding: 3px 9px 5px 9px; color: white; } .rootTabOn A, .rootTabOn A:visited { color: white; font-weight: bold; text-decoration: none; } .rootTabOff { line-height: 15px; font-size: 14px; border: 1px solid black; border-bottom-width: 0px; background-color: #c8c8c8; z-index: 1000; padding: 2px 9px 2px 9px; } .rootTabOff A, .rootTabOff A:visited { color: black; text-decoration: underline; } .rootTabOff A:hover { font-weight: bold; } </style> ^RootTab;

-

^Navigation(TopDropMenu);
Create a drop down menu of your top level navigation.

-

^Navigation(dtree);
Create a dynamic tree menu.

-

^Navigation(coolmenu);
Create a DHTML driven menu.

-

^Navigation(Synopsis);
This macro allows you to get the submenu of a page along with the synopsis of each link.

-

NOTES: The .synopsis_sub, .synopsis_summary, and .synopsis_title style sheet classes are tied to this macro.

-

It should be noted that many of these macros can also make use of these style sheet classes:

-

.selectedMenuItem
Use this class to highlight the current page in any of the menu macros. -

.verticalMenu
The vertical menu (if you use a vertical menu macro). -

.horizontalMenu
The horizontal menu (if you use a horizontal menu macro).

|, - lastUpdated => 1104545184, - }, - '511' => { message => q|Threaded|, lastUpdated => 1031514049 @@ -2969,11 +2555,6 @@ div.tabs { lastUpdated => 1044218026 }, - '841' => { - message => q|Navigation Macros|, - lastUpdated => 1096434024 - }, - '1044' => { message => q|Search Template|, lastUpdated => 1066394621 @@ -3377,16 +2958,6 @@ The headings of columns on things like message boards and user contributions. lastUpdated => 1058092984 }, - '630' => { - message => q|WebGUI has a small, but sturdy real-time search engine built-in. If you wish to use the internal search engine, you can use the ^?; macro, or by adding ?op=search to the end of any URL, or feel free to build your own form to access it. -

-Many people need a search engine to index their WebGUI site, plus many others. Or they have more advanced needs than what WebGUI's search engine allows. In those cases we recommend MnoGo Search or ht://Dig. -

- -|, - lastUpdated => 1038888957 - }, - '497' => { message => q|Start Date|, lastUpdated => 1031514049 @@ -3617,18 +3188,6 @@ As with any delete operation, you are prompted to be sure you wish to proceed wi lastUpdated => 1036971696 }, - '624' => { - message => q|WebGUI macros are used to create dynamic content within otherwise static content. For instance, you may wish to show which user is logged in on every page, or you may wish to have a dynamically built menu or crumb trail. -

- -Macros always begin with a caret (^) and follow with at least one other character and ended with a semicolon (;). Some macros can be extended/configured by taking the format of ^x("config text");. When providing multiple arguments to a macro, they should be separated by only commas:
-^x("First argument",2); -

- -|, - lastUpdated => 1101885876, - }, - '823' => { message => q|Go to the new page.|, lastUpdated => 1038706332 @@ -3669,11 +3228,6 @@ Macros always begin with a caret (^) and follow with at least one other char lastUpdated => 1037579487 }, - '845' => { - message => q|Style Macros|, - lastUpdated => 1078243435 - }, - '924' => { message => q|Import a theme.|, lastUpdated => 1050262993 @@ -3780,11 +3334,6 @@ You can search users based on username and email address. You can do partial sea lastUpdated => 1066394455 }, - '669' => { - message => q|Macros, Using|, - lastUpdated => 1046656837 - }, - '1082' => { message => q|Clipboard|, lastUpdated => 1076866475 @@ -4028,11 +3577,6 @@ Privileges and styles assigned to pages in the package will not be copied when t lastUpdated => 1066418669 }, - '839' => { - message => q|Programmer Macros|, - lastUpdated => 1078570360 - }, - '88' => { message => q|Users In Group|, lastUpdated => 1031514049 @@ -4176,108 +3720,6 @@ What group should be alerted when a new user registers? lastUpdated => 1050264954 }, - '840' => { - message => q|These macros are designed to provide programming-like functionality. They are powerful when used appropriately, and dangerous when used carelessly. Take care when using these macros. - -

-NOTE: These macros are included in WebGUI in order to provide very powerful display mechanisms. Though they could be used to write simple web applications, this is not their intended use, nor is it supported or condoned by Plain Black. If you find yourself trying to do something like that, just write a macro. =) By default these macros are disabled to protect the security of your site and server, and only your administrator can enable them. - -

- -^D; or ^D(); - Date
-The current date and time. -

- -You can configure the date by using date formatting symbols. For instance, if you created a macro like this ^D("%c %D, %y"); it would output September 26, 2001. The following are the available date formatting symbols: -

- -
%%%
%y4 digit year
%Y2 digit year
%m2 digit month
%Mvariable digit month
%cmonth name
%d2 digit day of month
%Dvariable digit day of month
%wday of week name
%h2 digit base 12 hour
%Hvariable digit base 12 hour
%j2 digit base 24 hour
%Jvariable digit base 24 hour
%plower case am/pm
%Pupper case AM/PM
%zuser preference date format
%Zuser preference time format
-

-You can also pass in an epoch date into this macro as a secondary parameter. If no date is specified then today's date and time will be used. - -

-^Env()
-Can be used to display a web server environment variable on a page. The environment variables available on each server are different, but you can find out which ones your web server has by going to: http://www.yourwebguisite.com/env.pl -

- -The macro should be specified like this ^Env("REMOTE_ADDR"); -

- -^Execute();
-Allows a content manager or administrator to execute an external program. Takes the format of ^Execute("/this/file.sh");. -

- - -^FormParam();
-This macro is mainly used in generating dynamic queries in SQL Reports. Using this macro you can pull the value of any form field simply by specifying the name of the form field, like this: ^FormParam("phoneNumber"); -

- - -^If();
-A simple conditional statement (IF/THEN/ELSE) to control layout and messages. -

-Examples:
-Display Happy New Year on 1st January: - ^If('^D("%m%d");' eq '0101' , Happy New Year); -

-Display a message to people on your subnet (192.168.1.*):
-^If('^Env("REMOTE_ADDR");' =~ /^192.168.1/,"Hi co-worker","Hi Stranger"); -

-Display a message to Windows users:
- ^If('^URLEncode("^Env("HTTP_USER_AGENT");");' =~ /windows/i,"Hey... Linux is free !"); -

-Display a message if a user is behind a proxy:
- ^If('^Env("HTTP_VIA");' ne "", You're behind a proxy !, Proxy-free is the best...); -

-Display Good Morning/Afternoon/Evening:
- ^If(^D("%J");<=12,Good Morning,^If(^D("%J");<=18,Good Afternoon,Good evening);); -

- -^Include();
-Allows a content manager or administrator to include a file from the local filesystem. -

-Example: ^Include("/this/file.html"); -

- -^International();
-Pull a translated message from the internationalization system. -

-Example: ^International(45,"Article"); -

- - -^Quote();
-Use this to escape a string before using it in a database query. -

- - -^Page();
-This can be used to retrieve information about the current page. For instance it could be used to get the page URL like this ^Page("urlizedTitle"); or to get the menu title like this ^Page("menuTitle");. -

- -^SQL();
-A one line SQL report. Sometimes you just need to pull something back from the database quickly. This macro is also useful in extending the SQL Report wobject. It uses the numeric macros (^0; ^1; ^2; etc) to position data and can also use the ^^rownum; macro just like the SQL Report wobject. Examples:

- ^SQL("select count(*) from users","There are ^0; users on this system."); -

-^SQL("select userId,username from users order by username","<a href='^/;?op=viewProfile&uid=^0;'>^1;</a><br>"); -

-^URLEncode();
-This macro is mainly useful in SQL reports, but it could be useful elsewhere as well. It takes the input of a string and URL Encodes it so that the string can be passed through a URL. It's syntax looks like this: ^URLEncode("Is this my string?"); -

- - -^User();
-This macro will allow you to display any information from a user's account or profile. For instance, if you wanted to display a user's email address you'd create this macro: ^User("email"); -

- -^*; or ^*(); - Random Number
-A randomly generated number. This is often used on images (such as banner ads) that you want to ensure do not cache. In addition, you may configure this macro like this ^*(100); to create a random number between 0 and 100. -

- -|, - lastUpdated => 1101775527, - }, - '146' => { message => q|Active Sessions|, lastUpdated => 1031514049