From c323789d647cfd11a91fd9436ca2cd1f56225e43 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 3 Mar 2006 05:28:53 +0000 Subject: [PATCH] Fix number of tests in Utility.t Add help for dashboard and fix labels. Remove startDate, endDate from Asset help. Update Help template to show UI levels as data rather than content. --- docs/upgrades/upgrade_6.8.7-6.99.0.pl | 25 +++++++++++++ lib/WebGUI/Asset/Wobject/Dashboard.pm | 4 +- lib/WebGUI/Help/Asset.pm | 10 ----- lib/WebGUI/Help/Asset_Dashboard.pm | 21 +++++++++++ lib/WebGUI/i18n/English/Asset_Dashboard.pm | 43 +++++----------------- t/Utility.t | 2 +- 6 files changed, 59 insertions(+), 46 deletions(-) diff --git a/docs/upgrades/upgrade_6.8.7-6.99.0.pl b/docs/upgrades/upgrade_6.8.7-6.99.0.pl index 874a9c6c3..8376d99da 100644 --- a/docs/upgrades/upgrade_6.8.7-6.99.0.pl +++ b/docs/upgrades/upgrade_6.8.7-6.99.0.pl @@ -36,6 +36,7 @@ addDisabletoRichEditor(); addNavigationMimeType(); addIndexes(); addDatabaseCache(); +updateHelpTemplate(); finish($session); # this line required @@ -567,6 +568,30 @@ sub ip2cidr { } +#------------------------------------------------- +sub updateHelpTemplate { + print "\tUpdating Help template.\n" unless ($quiet); + my $template = <

+ + +
+ + +
+
+ +
: + +
+ +
+ +EOT + my $asset = WebGUI::Asset->new($session,"PBtmplHelp000000000001","WebGUI::Asset::Template"); + $asset->addRevision({template=>$template})->commit; +} + # ---- DO NOT EDIT BELOW THIS LINE ---- #------------------------------------------------- diff --git a/lib/WebGUI/Asset/Wobject/Dashboard.pm b/lib/WebGUI/Asset/Wobject/Dashboard.pm index 00f408204..53643567b 100644 --- a/lib/WebGUI/Asset/Wobject/Dashboard.pm +++ b/lib/WebGUI/Asset/Wobject/Dashboard.pm @@ -126,8 +126,8 @@ sub getEditForm { -name=>"assetsToHide", -value=>\@assetsToHide, -options=>\%childIds, - -label=>$i18n->get('assets to hide', 'Asset_Layout'), - -hoverHelp=>$i18n->get('assets to hide description', 'Asset_Layout'), + -label=>$i18n->get('assets to hide'), + -hoverHelp=>$i18n->get('assets to hide description'), -vertical=>1, -uiLevel=>9 ); diff --git a/lib/WebGUI/Help/Asset.pm b/lib/WebGUI/Help/Asset.pm index 7884dfd4b..ac5e6b67e 100644 --- a/lib/WebGUI/Help/Asset.pm +++ b/lib/WebGUI/Help/Asset.pm @@ -47,16 +47,6 @@ our $HELP = { description => 'encrypt page description', namespace => 'Asset', }, - { - title => '497', - description => '497 description', - namespace => 'Asset', - }, - { - title => '498', - description => '498 description', - namespace => 'Asset', - }, { title => '108', description => '108 description', diff --git a/lib/WebGUI/Help/Asset_Dashboard.pm b/lib/WebGUI/Help/Asset_Dashboard.pm index 98fc98165..da7d036ee 100644 --- a/lib/WebGUI/Help/Asset_Dashboard.pm +++ b/lib/WebGUI/Help/Asset_Dashboard.pm @@ -5,6 +5,27 @@ our $HELP = { title => 'dashboard add/edit title', body => 'dashboard add/edit body', fields => [ + { + title => 'dashboard template field label', + description => 'dashboard template description', + namespace => 'Asset_Dashboard', + }, + { + title => 'dashboard adminsGroupId field label', + description => 'dashboard adminsGroupId description', + namespace => 'Asset_Dashboard', + }, + { + title => 'dashboard usersGroupId field label', + description => 'dashboard usersGroupId description', + namespace => 'Asset_Dashboard', + }, + { + title => 'assets to hide', + description => 'assets to hide description', + namespace => 'Asset_Dashboard', + uiLevel => 9, + }, ], related => [ { diff --git a/lib/WebGUI/i18n/English/Asset_Dashboard.pm b/lib/WebGUI/i18n/English/Asset_Dashboard.pm index 306821723..d5f002aaa 100644 --- a/lib/WebGUI/i18n/English/Asset_Dashboard.pm +++ b/lib/WebGUI/i18n/English/Asset_Dashboard.pm @@ -33,36 +33,6 @@ our $I18N = { message => q|Dashboard Template|, lastUpdated => 1133619940 }, - 'dashboard template field label' => { - message => q|Dashboard Template|, - lastUpdated => 1133619940 - }, - 'dashboard template field label' => { - message => q|Dashboard Template|, - lastUpdated => 1133619940 - }, - 'dashboard template field label' => { - message => q|Dashboard Template|, - lastUpdated => 1133619940 - }, - 'dashboard template field label' => { - message => q|Dashboard Template|, - lastUpdated => 1133619940 - }, - 'dashboard template field label' => { - message => q|Dashboard Template|, - lastUpdated => 1133619940 - }, - 'dashboard template field label' => { - message => q|Dashboard Template|, - lastUpdated => 1133619940 - }, - 'dashboard template field label' => { - message => q|Dashboard Template|, - lastUpdated => 1133619940 - }, - - 'dashboard add/edit title' => { message => q|Dashboard Add/Edit|, @@ -76,11 +46,18 @@ our $I18N = { message => q|Dashboard Template|, lastUpdated => 1133619940 }, - 'dashboard template field label' => { - message => q|Dashboard Template|, - lastUpdated => 1133619940 + + 'assets to hide' => { + message => q|Assets To Hide.|, + lastUpdated => 1118942468 }, + 'assets to hide description' => { + message => q|This list contains one checkbox for each child Asset of the Page Layout. Select the +checkbox for any Asset that you do not want displayed in the Page Layout Asset. +

|, + lastUpdated => 1119410080, + }, }; diff --git a/t/Utility.t b/t/Utility.t index 655d419fc..af0b3cc79 100644 --- a/t/Utility.t +++ b/t/Utility.t @@ -16,7 +16,7 @@ use lib "$FindBin::Bin/lib"; use WebGUI::Test; use WebGUI::Session; -use Test::More tests => 22; # increment this value for each test you create +use Test::More tests => 21; # increment this value for each test you create my $session = WebGUI::Test->session;