From 88d6ce4ac0f3b5b6d600fe23630048322a82df86 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 21 Jun 2005 04:24:25 +0000 Subject: [PATCH] retrofit for namespace support for hover help --- lib/WebGUI/Asset/Wobject/HttpProxy.pm | 11 ++- lib/WebGUI/Help/Asset.pm | 49 ++++++++---- lib/WebGUI/Help/Asset_Article.pm | 4 + lib/WebGUI/Help/Asset_Collaboration.pm | 75 ++++++++++++------ lib/WebGUI/Help/Asset_DataForm.pm | 48 +++++++++--- lib/WebGUI/Help/Asset_Event.pm | 18 +++-- lib/WebGUI/Help/Asset_File.pm | 14 ++-- lib/WebGUI/Help/Asset_FilePile.pm | 24 ++++-- lib/WebGUI/Help/Asset_Folder.pm | 13 ++-- lib/WebGUI/Help/Asset_HttpProxy.pm | 50 ++++++++++++ lib/WebGUI/Operation/Help.pm | 4 +- lib/WebGUI/i18n/English/Asset_HttpProxy.pm | 88 +++++++++++----------- lib/WebGUI/i18n/English/WebGUI.pm | 5 ++ 13 files changed, 279 insertions(+), 124 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm index 2169422c5..d4e1151af 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm @@ -100,7 +100,8 @@ sub getEditForm { my $tabform = $self->SUPER::getEditForm(); $tabform->getTab("display")->template( -value=>$self->getValue('templateId'), - -label=>WebGUI::International::get('http proxy template title',"Asset_DataForm"), + -label=>WebGUI::International::get('http proxy template title',"Asset_HttpProxy"), + -hoverHelp=>WebGUI::International::get('http proxy template title description',"Asset_HttpProxy"), -namespace=>"HttpProxy" ); my %hash; @@ -109,26 +110,31 @@ sub getEditForm { $tabform->getTab("properties")->url( -name=>"proxiedUrl", -label=>WebGUI::International::get(1,"Asset_HttpProxy"), + -hoverHelp=>WebGUI::International::get('1 description',"Asset_HttpProxy"), -value=>$self->getValue("proxiedUrl") ); $tabform->getTab("security")->yesNo( -name=>"followExternal", -label=>WebGUI::International::get(5,"Asset_HttpProxy"), + -hoverHelp=>WebGUI::International::get('5 description',"Asset_HttpProxy"), -value=>$self->getValue("followExternal") ); $tabform->getTab("security")->yesNo( -name=>"followRedirect", -label=>WebGUI::International::get(8,"Asset_HttpProxy"), + -hoverHelp=>WebGUI::International::get('8 description',"Asset_HttpProxy"), -value=>$self->getValue("followRedirect") ); $tabform->getTab("properties")->yesNo( -name=>"rewriteUrls", -label=>WebGUI::International::get(12,"Asset_HttpProxy"), + -hoverHelp=>WebGUI::International::get('12 description',"Asset_HttpProxy"), -value=>$self->getValue("rewriteUrls") ); $tabform->getTab("display")->yesNo( -name=>"removeStyle", -label=>WebGUI::International::get(6,"Asset_HttpProxy"), + -hoverHelp=>WebGUI::International::get('6 description',"Asset_HttpProxy"), -value=>$self->getValue("removeStyle") ); $tabform->getTab("display")->filterContent( @@ -139,16 +145,19 @@ sub getEditForm { -name=>"timeout", -options=>\%hash, -label=>WebGUI::International::get(4,"Asset_HttpProxy"), + -hoverHelp=>WebGUI::International::get('4 description',"Asset_HttpProxy"), -value=>[$self->getValue("timeout")] ); $tabform->getTab("display")->text( -name=>"searchFor", -label=>WebGUI::International::get(13,"Asset_HttpProxy"), + -hoverHelp=>WebGUI::International::get('13 description',"Asset_HttpProxy"), -value=>$self->getValue("searchFor") ); $tabform->getTab("display")->text( -name=>"stopAt", -label=>WebGUI::International::get(14,"Asset_HttpProxy"), + -hoverHelp=>WebGUI::International::get('14 description',"Asset_HttpProxy"), -value=>$self->getValue("stopAt") ); return $tabform; diff --git a/lib/WebGUI/Help/Asset.pm b/lib/WebGUI/Help/Asset.pm index deb518257..828a3b13e 100644 --- a/lib/WebGUI/Help/Asset.pm +++ b/lib/WebGUI/Help/Asset.pm @@ -10,71 +10,88 @@ our $HELP = { fields => [ { title => 'asset id', + namespace => 'Asset', description => 'asset id description' }, { title => '99', - description => '99 description' + description => '99 description', + namespace => 'Asset', }, { title => '411', - description => '411 description' + description => '411 description', + namespace => 'Asset', }, { title => '104', - description => '104 description' + description => '104 description', + namespace => 'Asset', }, { title => '412', - description => '412 description' + description => '412 description', + namespace => 'Asset', }, { title => '886', - description => '886 description' + description => '886 description', + namespace => 'Asset', }, { title => '940', - description => '940 description' + description => '940 description', + namespace => 'Asset', }, { title => 'encrypt page', - description => 'encrypt page description' + description => 'encrypt page description', + namespace => 'Asset', }, { title => '497', - description => '497 description' + description => '497 description', + namespace => 'Asset', }, { title => '498', - description => '498 description' + description => '498 description', + namespace => 'Asset', }, { title => '108', - description => '108 description' + description => '108 description', + namespace => 'Asset', }, { title => '872', - description => '872 description' + description => '872 description', + namespace => 'Asset', }, { title => '871', - description => '871 description' + description => '871 description', + namespace => 'Asset', }, { title => '412', - description => '412 description' + description => '412 description', + namespace => 'Asset', }, { title => 'extra head tags', - description => 'extra head tags description' + description => 'extra head tags description', + namespace => 'Asset', }, { title => 'make package', - description => 'make package description' + description => 'make package description', + namespace => 'Asset', }, { title => 'make prototype', - description => 'make prototype description' + description => 'make prototype description', + namespace => 'Asset', }, ], related => [ diff --git a/lib/WebGUI/Help/Asset_Article.pm b/lib/WebGUI/Help/Asset_Article.pm index dbf8078b6..f2bf7c4d3 100644 --- a/lib/WebGUI/Help/Asset_Article.pm +++ b/lib/WebGUI/Help/Asset_Article.pm @@ -8,18 +8,22 @@ our $HELP = { { title => '72', description => 'article template description', + namespace => 'Asset_Article', }, { title => '7', description => 'link title description', + namespace => 'Asset_Article', }, { title => '8', description => 'link url description', + namespace => 'Asset_Article', }, { title => '10', description => 'carriage return description', + namespace => 'Asset_Article', }, ], related => [ diff --git a/lib/WebGUI/Help/Asset_Collaboration.pm b/lib/WebGUI/Help/Asset_Collaboration.pm index 513f271d8..36e666a1f 100644 --- a/lib/WebGUI/Help/Asset_Collaboration.pm +++ b/lib/WebGUI/Help/Asset_Collaboration.pm @@ -7,103 +7,128 @@ our $HELP = { fields => [ { title => 'display last reply', - description => 'display last reply description' + description => 'display last reply description', + namespace => 'Asset_Collaboration', }, { title => 'system template', - description => 'system template description' + description => 'system template description', + namespace => 'Asset_Collaboration', }, { title => 'thread template', - description => 'thread template description' + description => 'thread template description', + namespace => 'Asset_Collaboration', }, { title => 'post template', - description => 'post template description' + description => 'post template description', + namespace => 'Asset_Collaboration', }, { title => 'search template', - description => 'search template description' + description => 'search template description', + namespace => 'Asset_Collaboration', }, { title => 'notification template', - description => 'notification template description' + description => 'notification template description', + namespace => 'Asset_Collaboration', }, { title => 'who moderates', - description => 'who moderates description' + description => 'who moderates description', + namespace => 'Asset_Collaboration', }, { title => 'who posts', - description => 'who posts description' + description => 'who posts description', + namespace => 'Asset_Collaboration', }, { title => 'threads/page', - description => 'threads/page description' + description => 'threads/page description', + namespace => 'Asset_Collaboration', }, { title => 'posts/page', - description => 'posts/page description' + description => 'posts/page description', + namespace => 'Asset_Collaboration', }, { title => 'karma/post', - description => 'karma/post description' + description => 'karma/post description', + namespace => 'Asset_Collaboration', }, { title => 'karma spent to rate', - description => 'karma spent to rate description' + description => 'karma spent to rate description', + namespace => 'Asset_Collaboration', }, { title => 'karma rating multiplier', - description => 'karma rating multiplier description' + description => 'karma rating multiplier description', + namespace => 'Asset_Collaboration', }, { title => 'filter code', - description => 'filter code description' + description => 'filter code description', + namespace => 'Asset_Collaboration', }, { title => 'sort by', - description => 'sort by description' + description => 'sort by description', + namespace => 'Asset_Collaboration', }, { title => 'sort order', - description => 'sort order description' + description => 'sort order description', + namespace => 'Asset_Collaboration', }, { title => 'archive after', - description => 'archive after description' + description => 'archive after description', + namespace => 'Asset_Collaboration', }, { title => 'attachments/post', - description => 'attachments/post description' + description => 'attachments/post description', + namespace => 'Asset_Collaboration', }, { title => 'editTimeout', - description => 'editTimeout description' + description => 'editTimeout description', + namespace => 'Asset_Collaboration', }, { title => 'allow replies', - description => 'allow replies description' + description => 'allow replies description', + namespace => 'Asset_Collaboration', }, { title => 'edit stamp', - description => 'edit stamp description' + description => 'edit stamp description', + namespace => 'Asset_Collaboration', }, { title => 'rich edit', - description => 'rich edit description' + description => 'rich edit description', + namespace => 'Asset_Collaboration', }, { title => 'content filter', - description => 'content filter description' + description => 'content filter description', + namespace => 'Asset_Collaboration', }, { title => 'use preview', - description => 'use preview description' + description => 'use preview description', + namespace => 'Asset_Collaboration', }, { title => 'moderate', - description => 'moderate description' + description => 'moderate description', + namespace => 'Asset_Collaboration', }, ], related => [ diff --git a/lib/WebGUI/Help/Asset_DataForm.pm b/lib/WebGUI/Help/Asset_DataForm.pm index 378c48b2d..bed628ea3 100644 --- a/lib/WebGUI/Help/Asset_DataForm.pm +++ b/lib/WebGUI/Help/Asset_DataForm.pm @@ -7,51 +7,63 @@ our $HELP = { fields => [ { title => '16', - description => '16 description' + description => '16 description', + namespace => 'Asset_DataForm', }, { title => '74', - description => '74 description' + description => '74 description', + namespace => 'Asset_DataForm', }, { title => '913', - description => '913 description' + description => '913 description', + namespace => 'Asset_DataForm', }, { title => '81', - description => '81 description' + description => '81 description', + namespace => 'Asset_DataForm', }, { title => '81', - description => '81 description' + description => '81 description', + namespace => 'Asset_DataForm', }, { title => '87', - description => '87 description' + description => '87 description', + namespace => 'Asset_DataForm', }, { title => 'defaultView', - description => 'defaultView description' + description => 'defaultView description', + namespace => 'Asset_DataForm', }, { title => '744', - description => '744 description' + description => '744 description', + namespace => 'Asset_DataForm', }, { title => '76', - description => '76 description' + description => '76 description', + namespace => 'Asset_DataForm', }, { title => '105', - description => '105 description' + description => '105 description', + namespace => 'Asset_DataForm', }, { title => '86', - description => '86 description' + description => '86 description', + namespace => 'Asset_DataForm', }, { title => '76', - description => '76 description' + description => '76 description', + namespace => 'Asset_DataForm', }, ], related => [ @@ -84,50 +96,62 @@ our $HELP = { { title => '104', description => '104 description' + namespace => 'Asset_DataForm', }, { title => '77', description => '77 description' + namespace => 'Asset_DataForm', }, { title => '102', description => '102 description' + namespace => 'Asset_DataForm', }, { title => '21', description => '21 description' + namespace => 'Asset_DataForm', }, { title => '22', description => '22 description' + namespace => 'Asset_DataForm', }, { title => '23', description => '23 description' + namespace => 'Asset_DataForm', }, { title => '8', description => '8 description' + namespace => 'Asset_DataForm', }, { title => '27', description => '27 description' + namespace => 'Asset_DataForm', }, { title => 'editField-vertical-label', description => 'editField-vertical-label description' + namespace => 'Asset_DataForm', }, { title => 'editField-extras-label', description => 'editField-extras-label description' + namespace => 'Asset_DataForm', }, { title => '24', description => '24 description' + namespace => 'Asset_DataForm', }, { title => '25', description => '25 description' + namespace => 'Asset_DataForm', }, ], related => [ diff --git a/lib/WebGUI/Help/Asset_Event.pm b/lib/WebGUI/Help/Asset_Event.pm index baca568ad..1bb37a64f 100644 --- a/lib/WebGUI/Help/Asset_Event.pm +++ b/lib/WebGUI/Help/Asset_Event.pm @@ -7,27 +7,33 @@ our $HELP = { fields => [ { title => '512', - description => 'Description description' + description => 'Description description', + namespace => 'Asset_Event', }, { title => '513', - description => 'Start Date description' + description => 'Start Date description', + namespace => 'Asset_Event', }, { title => '514', - description => 'End Date description' + description => 'End Date description', + namespace => 'Asset_Event', }, { title => '515', - description => '515 description' + description => '515 description', + namespace => 'Asset_Event', }, { title => '530', - description => '530 description' + description => '530 description', + namespace => 'Asset_Event', }, { title => '8', - description => 'Recurs every description' + description => 'Recurs every description', + namespace => 'Asset_Event', }, ], related => [ diff --git a/lib/WebGUI/Help/Asset_File.pm b/lib/WebGUI/Help/Asset_File.pm index 32656098f..15191771b 100644 --- a/lib/WebGUI/Help/Asset_File.pm +++ b/lib/WebGUI/Help/Asset_File.pm @@ -8,21 +8,23 @@ our $HELP = { fields => [ { title => 'new file', - description => 'new file description' + description => 'new file description', + namespace => 'Asset_File', }, { title => 'current file', - description => 'current file description' + description => 'current file description', + namespace => 'Asset_File', }, ], related => [ { tag => 'asset fields', - namespace => 'Asset' + namespace => 'Asset', }, { tag => 'file template', - namespace => 'Asset_File' + namespace => 'Asset_File', }, ] }, @@ -35,11 +37,11 @@ our $HELP = { related => [ { tag => 'file add/edit', - namespace => 'Asset_File' + namespace => 'Asset_File', }, { tag => 'template language', - namespace => 'Asset_Template' + namespace => 'Asset_Template', }, ] }, diff --git a/lib/WebGUI/Help/Asset_FilePile.pm b/lib/WebGUI/Help/Asset_FilePile.pm index 1cafa274d..fddf7d028 100644 --- a/lib/WebGUI/Help/Asset_FilePile.pm +++ b/lib/WebGUI/Help/Asset_FilePile.pm @@ -8,35 +8,43 @@ our $HELP = { fields => [ { title => '886', - description => '886 description' + description => '886 description', + namespace => 'Asset_FilePile', }, { title => '940', - description => '940 description' + description => '940 description', + namespace => 'Asset_FilePile', }, { title => '497', - description => '497 description' + description => '497 description', + namespace => 'Asset_FilePile', }, { title => '498', - description => '498 description' + description => '498 description', + namespace => 'Asset_FilePile', }, { title => '108', - description => '108 description' + description => '108 description', + namespace => 'Asset_FilePile', }, { title => '872', - description => '872 description' + description => '872 description', + namespace => 'Asset_FilePile', }, { title => '871', - description => '871 description' + description => '871 description', + namespace => 'Asset_FilePile', }, { title => 'upload files', - description => 'upload files description' + description => 'upload files description', + namespace => 'Asset_FilePile', }, ], related => [ diff --git a/lib/WebGUI/Help/Asset_Folder.pm b/lib/WebGUI/Help/Asset_Folder.pm index 1ba037d2e..51f2da6d1 100644 --- a/lib/WebGUI/Help/Asset_Folder.pm +++ b/lib/WebGUI/Help/Asset_Folder.pm @@ -8,21 +8,22 @@ our $HELP = { fields => [ { title => 'Template', - description => 'Template description' + description => 'Template description', + namespace => 'Asset_Folder', }, ], related => [ { tag => 'asset fields', - namespace => 'Asset' + namespace => 'Asset', }, { tag => 'wobject add/edit', - namespace => 'Wobject' + namespace => 'Wobject', }, { tag => 'folder template', - namespace => 'Asset_Folder' + namespace => 'Asset_Folder', }, ] }, @@ -35,11 +36,11 @@ our $HELP = { related => [ { tag => 'folder add/edit', - namespace => 'Asset_Folder' + namespace => 'Asset_Folder', }, { tag => 'template language', - namespace => 'Asset_Template' + namespace => 'Asset_Template', }, ] }, diff --git a/lib/WebGUI/Help/Asset_HttpProxy.pm b/lib/WebGUI/Help/Asset_HttpProxy.pm index bfbe9545f..3ba0719a5 100644 --- a/lib/WebGUI/Help/Asset_HttpProxy.pm +++ b/lib/WebGUI/Help/Asset_HttpProxy.pm @@ -5,6 +5,56 @@ our $HELP = { title => '10', body => '11', fields => [ + { + title => '1', + description => '1 description', + namespace => 'Asset_HttpProxy', + }, + { + title => '5', + description => '5 description', + namespace => 'Asset_HttpProxy', + }, + { + title => '8', + description => '8 description', + namespace => 'Asset_HttpProxy', + }, + { + title => '12', + description => '12 description', + namespace => 'Asset_HttpProxy', + }, + { + title => 'http proxy template title', + description => 'http proxy template title description', + namespace => 'Asset_HttpProxy', + }, + { + title => '6', + description => '6 description', + namespace => 'Asset_HttpProxy', + }, + { + title => '418', + description => '418 description', + namespace => 'WebGUI', + }, + { + title => '4', + description => '4 description', + namespace => 'Asset_HttpProxy', + }, + { + title => '13', + description => '13 description', + namespace => 'Asset_HttpProxy', + }, + { + title => '14', + description => '14 description', + namespace => 'Asset_HttpProxy', + }, ], related => [ { diff --git a/lib/WebGUI/Operation/Help.pm b/lib/WebGUI/Operation/Help.pm index cff737794..3fb6ea5a3 100644 --- a/lib/WebGUI/Operation/Help.pm +++ b/lib/WebGUI/Operation/Help.pm @@ -60,8 +60,8 @@ sub www_viewHelp { $vars{body} = $i18n->get($help->{body}); foreach my $row (@{ $help->{fields} }) { push @{ $vars{fields} }, - { 'title' => $i18n->get($row->{title}), - 'description' => $i18n->get($row->{description}), } + { 'title' => WebGUI::International::get($row->{title},$row->{namespace}), + 'description' => WebGUI::International::get($row->{description},$row->{namespace}), } } my $body = WebGUI::Asset::Template->new("PBtmplHelp000000000001")->process(\%vars); $ac->addSubmenuItem(WebGUI::URL::page('op=viewHelpIndex'),WebGUI::International::get(95)); diff --git a/lib/WebGUI/i18n/English/Asset_HttpProxy.pm b/lib/WebGUI/i18n/English/Asset_HttpProxy.pm index cea752ee9..cea2d4d7f 100644 --- a/lib/WebGUI/i18n/English/Asset_HttpProxy.pm +++ b/lib/WebGUI/i18n/English/Asset_HttpProxy.pm @@ -8,53 +8,12 @@ our $I18N = { '11' => { message => q|The HTTP Proxy wobject is a very powerful tool. It enables you to embed external sites and applications into your site. For example, if you have a web mail system that you wish your staff could access through the intranet, then you could use the HTTP Proxy to accomplish that. -

-URL to proxy
-The starting URL for the proxy. -

- -Allow proxying of other domains?
-If you proxy a site like Yahoo! that links to other domains, do you wish to allow the user to follow the links to those other domains, or should the proxy stop them as they try to leave the original site you specified? -

- -Follow redirects?
-Sometimes the URL to a page is actually a redirection to another page. Do you wish to follow those redirections when they occur? -

- -Rewrite URLs?
-Switch this to No if you want to deep link an external page. -

- -Template
-Use this select list to choose a template to show the output of the proxied content. -

- -Remove style?
-Do you wish to remove the stylesheet from the proxied content in favor of the stylesheet from your site? -

- -Filter Content
-Choose the level of HTML filtering you wish to apply to the proxied content. -

- -Timeout
-The amount of time (in seconds) that WebGUI should wait for a connection before giving up on an external page. -

- -Search for
-A search string used as starting point. Use this when you want to display only a part of the proxied content. Content before this point is not displayed -

- -Stop at
-A search string used as ending point. Content after this point is not displayed. -

Note: The Search for and Stop at strings are included in the content in the default template. You can change this by creating your own template.

- |, - lastUpdated => 1109715109, + lastUpdated => 1119244182, }, 'http proxy template title' => { @@ -87,6 +46,51 @@ Any text after the Stop At string. lastUpdated => 1109714266, }, + '1 description' => { + message => q|The starting URL for the proxy.|, + lastUpdated => 1119244033, + }, + + '5 description' => { + message => q|If you proxy a site like Yahoo! that links to other domains, do you wish to allow the user to follow the links to those other domains, or should the proxy stop them as they try to leave the original site you specified?|, + lastUpdated => 1119244033, + }, + + '8 description' => { + message => q|Sometimes the URL to a page is actually a redirection to another page. Do you wish to follow those redirections when they occur?|, + lastUpdated => 1119244033, + }, + + '12 description' => { + message => q|Switch this to No if you want to deep link an external page.|, + lastUpdated => 1119244033, + }, + + 'http proxy template title description' => { + message => q|Use this select list to choose a template to show the output of the proxied content.|, + lastUpdated => 1119244033, + }, + + '6 description' => { + message => q|Do you wish to remove the stylesheet from the proxied content in favor of the stylesheet from your site?|, + lastUpdated => 1119244033, + }, + + '4 description' => { + message => q|The amount of time (in seconds) that WebGUI should wait for a connection before giving up on an external page.|, + lastUpdated => 1119244033, + }, + + '13 description' => { + message => q|A search string used as starting point. Use this when you want to display only a part of the proxied content. Content before this point is not displayed|, + lastUpdated => 1119244033, + }, + + '14 description' => { + message => q|A search string used as ending point. Content after this point is not displayed.|, + lastUpdated => 1119244033, + }, + '3' => { message => q|HTTP Proxy|, lastUpdated => 1031510000 diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index e5fddbf70..94ae99212 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -292,6 +292,11 @@ The URL of the web site for this theme's designer. If you are in the business of lastUpdated => 1046604931 }, + '418 description' => { + message => q|Choose the level of HTML filtering you wish to apply to the proxied content.|, + lastUpdated => 1046604931 + }, + '933' => { message => q|Theme, Edit|, lastUpdated => 1050430737