From fbd0fa7efaea1fa34185408ec9a92f072fdcf777 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 5 Jul 2004 21:51:39 +0000
Subject: [PATCH] fixed the context sensitive help links

---
 lib/WebGUI/Operation/Clipboard.pm       |  8 ++++----
 lib/WebGUI/Operation/Collateral.pm      |  4 ++--
 lib/WebGUI/Operation/DatabaseLink.pm    |  6 +++---
 lib/WebGUI/Operation/Group.pm           |  6 +++---
 lib/WebGUI/Operation/Navigation.pm      |  4 ++--
 lib/WebGUI/Operation/Page.pm            |  4 ++--
 lib/WebGUI/Operation/ProfileSettings.pm |  2 +-
 lib/WebGUI/Operation/Root.pm            |  2 +-
 lib/WebGUI/Operation/Settings.pm        | 12 +++++------
 lib/WebGUI/Operation/Statistics.pm      |  1 -
 lib/WebGUI/Operation/Style.pm           | 27 -------------------------
 lib/WebGUI/Operation/Template.pm        |  6 +++---
 lib/WebGUI/Operation/Theme.pm           | 13 ++++++------
 lib/WebGUI/Operation/Trash.pm           |  8 ++++----
 lib/WebGUI/Operation/User.pm            | 12 +++++------
 lib/WebGUI/Wobject.pm                   |  2 +-
 lib/WebGUI/Wobject/Article.pm           |  2 +-
 lib/WebGUI/Wobject/DataForm.pm          |  6 +++---
 lib/WebGUI/Wobject/EventsCalendar.pm    |  4 ++--
 lib/WebGUI/Wobject/FileManager.pm       |  4 ++--
 lib/WebGUI/Wobject/HttpProxy.pm         |  2 +-
 lib/WebGUI/Wobject/IndexedSearch.pm     |  3 +--
 lib/WebGUI/Wobject/MessageBoard.pm      |  4 ++--
 lib/WebGUI/Wobject/Poll.pm              |  2 +-
 lib/WebGUI/Wobject/Product.pm           | 12 +++++------
 lib/WebGUI/Wobject/SQLReport.pm         |  2 +-
 lib/WebGUI/Wobject/SiteMap.pm           |  2 +-
 lib/WebGUI/Wobject/Survey.pm            |  2 +-
 lib/WebGUI/Wobject/SyndicatedContent.pm |  2 +-
 lib/WebGUI/Wobject/USS.pm               |  2 +-
 lib/WebGUI/Wobject/WSClient.pm          |  2 +-
 lib/WebGUI/Wobject/WobjectProxy.pm      |  2 +-
 lib/WebGUI/i18n/English/DataForm.pm     | 14 ++++++-------
 33 files changed, 77 insertions(+), 107 deletions(-)

diff --git a/lib/WebGUI/Operation/Clipboard.pm b/lib/WebGUI/Operation/Clipboard.pm
index a804f71dc..e0eacd8d5 100644
--- a/lib/WebGUI/Operation/Clipboard.pm
+++ b/lib/WebGUI/Operation/Clipboard.pm
@@ -54,9 +54,9 @@ sub www_deleteClipboardItem {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
         my ($output);
 	if ($session{form}{wid} ne "") {
-        	$output .= helpIcon(14);
+        	$output .= helpIcon("wobject delete");
 	} elsif ($session{form}{pageId} ne "") {
-        	$output .= helpIcon(3);
+        	$output .= helpIcon("page delete");
 	}
         $output .= '<h1>'.WebGUI::International::get(42).'</h1>';
         $output .= WebGUI::International::get(956).'<p>';
@@ -124,7 +124,7 @@ sub www_deleteClipboardItemConfirm {
 sub www_emptyClipboard {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
         my ($output);
-	$output = helpIcon(67);
+	$output = helpIcon("clipboard empty");
         $output .= '<h1>'.WebGUI::International::get(42).'</h1>';
         $output .= WebGUI::International::get(951).'<p>';
 	if ( ($session{setting}{sharedClipboard} ne "1") && (WebGUI::Grouping::isInGroup(3)) ) {
@@ -187,7 +187,7 @@ sub www_manageClipboard {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
 
 	my ($sth, @data, @row, @sorted_row, $i, $p, $allUsers);
-	my $output = helpIcon(65);
+	my $output = helpIcon("clipboard manage");
 
 	# Add appropriate html page header
 	if ($session{setting}{sharedClipboard} eq "1") {
diff --git a/lib/WebGUI/Operation/Collateral.pm b/lib/WebGUI/Operation/Collateral.pm
index 3f5925e27..35ef0dd39 100644
--- a/lib/WebGUI/Operation/Collateral.pm
+++ b/lib/WebGUI/Operation/Collateral.pm
@@ -237,7 +237,7 @@ sub www_editCollateral {
                                 );
                 }
         } else {
-		$output .= helpIcon(20);
+		$output .= helpIcon("image add/edit");
                 $output .= '<h1>'.WebGUI::International::get(382).'</h1>';
 		if ($canEdit) {
                 	if ($collateral->{filename} ne "") {
@@ -421,7 +421,7 @@ sub www_listCollateral {
 	$p->setDataByQuery("select collateralId, name, filename, collateralType, dateUploaded, username, parameters 
 		from collateral where $constraints order by name");
 	$page = $p->getPageData;
-	$output = helpIcon(49);
+	$output = helpIcon("collateral manage");
 	$output .= '<h1>'.WebGUI::International::get(757).'</h1>';
 	$f = WebGUI::HTMLForm->new(1);
 	$f->hidden("op","listCollateral");
diff --git a/lib/WebGUI/Operation/DatabaseLink.pm b/lib/WebGUI/Operation/DatabaseLink.pm
index 92eca6853..557a5506b 100644
--- a/lib/WebGUI/Operation/DatabaseLink.pm
+++ b/lib/WebGUI/Operation/DatabaseLink.pm
@@ -57,7 +57,7 @@ sub www_copyDatabaseLink {
 sub www_deleteDatabaseLink {
         return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(3));
         my ($output);
-        $output .= helpIcon(70);
+        $output .= helpIcon("database link delete");
 	$output .= '<h1>'.WebGUI::International::get(987).'</h1>';
         $output .= WebGUI::International::get(988).'<p>';
         foreach my $using (WebGUI::DatabaseLink::whatIsUsing($session{form}{dlid})) {
@@ -93,7 +93,7 @@ sub www_editDatabaseLink {
 	} else {
                	%db = WebGUI::SQL->quickHash("select * from databaseLink where databaseLinkId=$session{form}{dlid}");
 	}
-        $output .= helpIcon(69);
+        $output .= helpIcon("database link add/edit");
 	$output .= '<h1>'.WebGUI::International::get(990).'</h1>';
 	$f = WebGUI::HTMLForm->new;
         $f->hidden("op","editDatabaseLinkSave");
@@ -124,7 +124,7 @@ sub www_editDatabaseLinkSave {
 sub www_listDatabaseLinks {
         return WebGUI::Privilege::adminOnly() unless(WebGUI::Grouping::isInGroup(3));
         my ($output, $p, $sth, %data, @row, $i);
-        $output = helpIcon(68);
+        $output = helpIcon("database links manage");
 	$output .= '<h1>'.WebGUI::International::get(996).'</h1>';
         $sth = WebGUI::SQL->read("select * from databaseLink order by title");
 	$row[$i] = '<tr><td valign="top" class="tableData"></td><td valign="top" class="tableData">'.WebGUI::International::get(1076).'</td></tr>';
diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm
index 11c498054..128869455 100644
--- a/lib/WebGUI/Operation/Group.pm
+++ b/lib/WebGUI/Operation/Group.pm
@@ -116,7 +116,7 @@ sub www_deleteGroup {
 	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output);
         return WebGUI::Privilege::vitalComponent() if ($session{form}{gid} < 26);
-        $output .= helpIcon(15);
+        $output .= helpIcon("group delete");
 	$output .= '<h1>'.WebGUI::International::get(42).'</h1>';
         $output .= WebGUI::International::get(86).'<p>';
         $output .= '<div align="center"><a href="'.WebGUI::URL::page('op=deleteGroupConfirm&gid='.$session{form}{gid}).
@@ -161,7 +161,7 @@ sub www_editGroup {
 	} else {
 		$g = WebGUI::Group->new($session{form}{gid});
 	}
-        $output .= helpIcon(17);
+        $output .= helpIcon("group add/edit");
 	$output .= '<h1>'.WebGUI::International::get(87).'</h1>';
 	$f = WebGUI::HTMLForm->new;
         $f->hidden("op","editGroupSave");
@@ -299,7 +299,7 @@ sub www_emailGroupSend {
 sub www_listGroups {
 	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $p, $sth, @data, @row, $i, $userCount);
-        $output = helpIcon(10);
+        $output = helpIcon("groups manage");
 	$output .= '<h1>'.WebGUI::International::get(89).'</h1>';
         $sth = WebGUI::SQL->read("select groupId,groupName,description from groups 
 		where isEditable=1 order by groupName");
diff --git a/lib/WebGUI/Operation/Navigation.pm b/lib/WebGUI/Operation/Navigation.pm
index dac70f0f8..adfc28da2 100644
--- a/lib/WebGUI/Operation/Navigation.pm
+++ b/lib/WebGUI/Operation/Navigation.pm
@@ -116,7 +116,7 @@ sub www_editNavigation {
 		$config->{showUnprivilegedPages} = 0;
 		$config->{'reverse'} = 0;
 	}
-	my $output = helpIcon(83).'<h1>'.WebGUI::International::get(22, 'Navigation').'</h1>';
+	my $output = helpIcon("navigation add/edit").'<h1>'.WebGUI::International::get(22, 'Navigation').'</h1>';
 	tie my (%tabs) , 'Tie::IxHash';
 	%tabs = (
 		properties=>{
@@ -276,7 +276,7 @@ sub www_editNavigationSave {
 #-------------------------------------------------------------------
 sub www_listNavigation {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(3));
-	my $output .= helpIcon(84).'<h1>'.WebGUI::International::get(34,'Navigation').'</h1>';
+	my $output .= helpIcon("navigation manage").'<h1>'.WebGUI::International::get(34,'Navigation').'</h1>';
 	my $sth = WebGUI::SQL->read("select navigationId, identifier from Navigation order by identifier");
 	my $i = 0;
 	my @row = ();
diff --git a/lib/WebGUI/Operation/Page.pm b/lib/WebGUI/Operation/Page.pm
index 48d8713c2..5eb37b3d4 100644
--- a/lib/WebGUI/Operation/Page.pm
+++ b/lib/WebGUI/Operation/Page.pm
@@ -264,7 +264,7 @@ sub www_deletePage {
 	if ($session{page}{pageId} < 1000 && $session{page}{pageId} > 0) {
 		return WebGUI::Privilege::vitalComponent();
 	} elsif (WebGUI::Page::canEdit()) {
-		$output .= helpIcon(3);
+		$output .= helpIcon("page delete");
 		$output .= '<h1>'.WebGUI::International::get(42).'</h1>';
 		$output .= WebGUI::International::get(101).'<p>';
 		$output .= '<div align="center"><a href="'.WebGUI::URL::page('op=deletePageConfirm').
@@ -348,7 +348,7 @@ sub www_editPage {
 			($childCount) = WebGUI::SQL->quickArray("select count(*) from page where parentId=$page{pageId}");
 		}
 		$page{endDate} = (addToDate(time(),10)) if ($page{endDate} < 0);
-                $output = helpIcon(1);
+                $output = helpIcon("page add/edit");
 		$output .= '<h1>'.WebGUI::International::get(102).'</h1>';
 		$f->hidden({name=>"pageId",value=>$page{pageId}});
 		$f->hidden({name=>"parentId",value=>$page{parentId}});
diff --git a/lib/WebGUI/Operation/ProfileSettings.pm b/lib/WebGUI/Operation/ProfileSettings.pm
index 432a56626..e2107d5a7 100644
--- a/lib/WebGUI/Operation/ProfileSettings.pm
+++ b/lib/WebGUI/Operation/ProfileSettings.pm
@@ -266,7 +266,7 @@ sub www_editProfileSettings {
 	my ($output, $a, %category, %field, $b);
 	tie %category, 'Tie::CPHash';
 	tie %field, 'Tie::CPHash';
-	$output = helpIcon(22);
+	$output = helpIcon("profile settings edit");
 	$output .= '<h1>'.WebGUI::International::get(308).'</h1>';
 	$a = WebGUI::SQL->read("select * from userProfileCategory order by sequenceNumber");
 	while (%category = $a->hash) {
diff --git a/lib/WebGUI/Operation/Root.pm b/lib/WebGUI/Operation/Root.pm
index 7e77d2d07..e707fc648 100644
--- a/lib/WebGUI/Operation/Root.pm
+++ b/lib/WebGUI/Operation/Root.pm
@@ -38,7 +38,7 @@ sub _submenu {
 sub www_listRoots {
         return WebGUI::Privilege::adminOnly() unless(WebGUI::Grouping::isInGroup(3));
         my ($output, $p, $sth, %data, @row, $i);
-        $output = helpIcon(28);
+        $output = helpIcon("root manage");
 	$output .= '<h1>'.WebGUI::International::get(408).'</h1>';
         $sth = WebGUI::SQL->read("select * from page where title<>'Reserved' and parentId=0 order by title");
         while (%data = $sth->hash) {
diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm
index fa77dbb7f..f724ae7d1 100644
--- a/lib/WebGUI/Operation/Settings.pm
+++ b/lib/WebGUI/Operation/Settings.pm
@@ -40,7 +40,7 @@ sub _submenu {
 sub www_editCompanyInformation {
 	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $f);
-        $output .= helpIcon(6);
+        $output .= helpIcon("company information edit");
 	$output .= '<h1>'.WebGUI::International::get(124).'</h1>';
 	$f = WebGUI::HTMLForm->new;
         $f->hidden("op","saveSettings");
@@ -59,7 +59,7 @@ sub www_editContentSettings {
 	$pages = WebGUI::SQL->buildHashRef("select pageId,menuTitle from page order by menuTitle");
         %htmlFilter = ('none'=>WebGUI::International::get(420), 'most'=>WebGUI::International::get(421), 
 		'javascript'=>WebGUI::International::get(526), 'all'=>WebGUI::International::get(419));
-        $output .= helpIcon(29);
+        $output .= helpIcon("content settings edit");
         $output .= '<h1>'.WebGUI::International::get(525).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("op","saveSettings");
@@ -92,7 +92,7 @@ sub www_editContentSettings {
 sub www_editMessagingSettings {
 	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $f);
-        $output .= helpIcon(13);
+        $output .= helpIcon("messaging settings edit");
         $output .= '<h1>'.WebGUI::International::get(133).'</h1>';
 	$f = WebGUI::HTMLForm->new;
         $f->hidden("op","saveSettings");
@@ -109,7 +109,7 @@ sub www_editMessagingSettings {
 sub www_editMiscSettings {
 	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $f);
-        $output .= helpIcon(24);
+        $output .= helpIcon("miscellaneous settings edit");
         $output .= '<h1>'.WebGUI::International::get(140).'</h1>';
 	$f = WebGUI::HTMLForm->new;
         $f->hidden("op","saveSettings");
@@ -148,7 +148,7 @@ sub www_editMiscSettings {
 sub www_editUserSettings {
    return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
    my ($output, $f, $cmd, $html);
-   $output .= helpIcon(2);
+   $output .= helpIcon("user settings edit");
    $output .= '<h1>'.WebGUI::International::get(117).'</h1>';
    $output .= WebGUI::Form::_javascriptFile("swapLayers.js");
    $output .= '<script language="JavaScript" > var active="'.$session{setting}{authMethod}.'"; </script>';
@@ -192,7 +192,7 @@ sub www_editUserSettings {
 sub www_manageSettings {
 	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output);
-        $output .= helpIcon(12);
+        $output .= helpIcon("settings manage");
         $output .= '<h1>'.WebGUI::International::get(143).'</h1>';
         $output .= '<ul>';
         $output .= '<li><a href="'.WebGUI::URL::page('op=editCompanyInformation').'">'.WebGUI::International::get(124).'</a>';
diff --git a/lib/WebGUI/Operation/Statistics.pm b/lib/WebGUI/Operation/Statistics.pm
index 6f2e09dd9..da2d6008e 100644
--- a/lib/WebGUI/Operation/Statistics.pm
+++ b/lib/WebGUI/Operation/Statistics.pm
@@ -165,7 +165,6 @@ sub www_viewStatistics {
 		$version = $cache->setByHTTP($url,43200);
 	}
 	chomp $version;
-        $output .= helpIcon(12);
         $output .= '<h1>'.WebGUI::International::get(437).'</h1>';
 	$output .= '<table>';
 	$output .= '<tr><td align="right" class="tableHeader">'.WebGUI::International::get(145).':</td><td class="tableData">'.$WebGUI::VERSION.'</td></tr>';
diff --git a/lib/WebGUI/Operation/Style.pm b/lib/WebGUI/Operation/Style.pm
index 9f6392aa4..211af8d39 100644
--- a/lib/WebGUI/Operation/Style.pm
+++ b/lib/WebGUI/Operation/Style.pm
@@ -42,32 +42,5 @@ sub www_unsetPersonalStyle {
 	return "";
 }
 
-#-------------------------------------------------------------------
-sub www_listRoots {
-        return WebGUI::Privilege::adminOnly() unless(WebGUI::Grouping::isInGroup(3));
-        my ($output, $p, $sth, %data, @row, $i);
-        $output = helpIcon(28);
-	$output .= '<h1>'.WebGUI::International::get(408).'</h1>';
-        $sth = WebGUI::SQL->read("select * from page where title<>'Reserved' and parentId=0 order by title");
-        while (%data = $sth->hash) {
-                $row[$i] = '<tr><td valign="top" class="tableData">'
-			.deleteIcon('op=deletePage',$data{urlizedTitle})
-			.editIcon('op=editPage',$data{urlizedTitle})
-			.cutIcon('op=cutPage',$data{urlizedTitle})
-			.'</td>';
-                $row[$i] .= '<td valign="top" class="tableData"><a href="'.WebGUI::URL::gateway($data{urlizedTitle}).'">'.$data{title}.'</a></td>';
-                $row[$i] .= '<td valign="top" class="tableData">'.$data{urlizedTitle}.'</td></tr>';
-                $i++;
-        }
-	$sth->finish;
-        $p = WebGUI::Paginator->new(WebGUI::URL::page('op=listRoots'));
-	$p->setDataByArrayRef(\@row);
-        $output .= '<table border=1 cellpadding=3 cellspacing=0 align="center">';
-        $output .= $p->getPage;
-        $output .= '</table>';
-        $output .= $p->getBarTraditional;
-        return _submenu($output);
-}
-
 
 1;
diff --git a/lib/WebGUI/Operation/Template.pm b/lib/WebGUI/Operation/Template.pm
index c452d08d5..31c30f0ea 100644
--- a/lib/WebGUI/Operation/Template.pm
+++ b/lib/WebGUI/Operation/Template.pm
@@ -70,7 +70,7 @@ sub www_deleteTemplate {
         if ($session{form}{tid} < 1000 && $session{form}{tid} > 0) {
 		return WebGUI::Privilege::vitalComponent();
         } elsif (WebGUI::Grouping::isInGroup(8)) {
-                $output .= helpIcon(35);
+                $output .= helpIcon("template delete");
 		$output .= '<h1>'.WebGUI::International::get(42).'</h1>';
                 $output .= WebGUI::International::get(502).'<p>';
                 $output .= '<div align="center"><a href="'.
@@ -123,7 +123,7 @@ sub www_editTemplate {
                 	%template = WebGUI::SQL->quickHash("select * from template where templateId=$session{form}{tid} and
 				namespace=".quote($session{form}{namespace}));
 		}
-                $output .= helpIcon(34);
+                $output .= helpIcon("template add/edit");
 		$output .= '<h1>'.WebGUI::International::get(507).'</h1>';
 		$f = WebGUI::HTMLForm->new;
                 $f->hidden("op","editTemplateSave");
@@ -179,7 +179,7 @@ sub www_listTemplates {
         my ($output, $sth, @data, @row, $i, $p, $where);
         if (WebGUI::Grouping::isInGroup(8)) {
 		$where = "and namespace=".quote($session{form}{namespace}) if ($session{form}{namespace});
-                $output = helpIcon(33);
+                $output = helpIcon("templates manage");
 		$output .= '<h1>'.WebGUI::International::get(506).'</h1>';
                 $sth = WebGUI::SQL->read("select templateId,name,namespace from template where isEditable=1 $where order by namespace,name");
                 while (@data = $sth->array) {
diff --git a/lib/WebGUI/Operation/Theme.pm b/lib/WebGUI/Operation/Theme.pm
index 831d0ef10..8eb5e6bd7 100644
--- a/lib/WebGUI/Operation/Theme.pm
+++ b/lib/WebGUI/Operation/Theme.pm
@@ -122,7 +122,7 @@ sub www_addThemeComponentSave {
 sub www_deleteTheme {
         return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(9));
 	return WebGUI::Privilege::vitalComponent() if ($session{form}{themeId} < 1000 && $session{form}{themeId} > 0);
-        my $output = helpIcon(64);
+        my $output = helpIcon("theme delete");
 	$output .= '<h1>'.WebGUI::International::get(42).'</h1>';
         $output .= WebGUI::International::get(907).'<p>';
         $output .= '<div align="center"><a href="'.
@@ -162,8 +162,7 @@ sub www_deleteThemeConfirm {
 sub www_deleteThemeComponent {
         return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(9));
         return WebGUI::Privilege::vitalComponent() if ($session{form}{themeId} < 1000 && $session{form}{themeId} > 0);
-        my $output = helpIcon(4);
-        $output .= '<h1>'.WebGUI::International::get(42).'</h1>';
+        my $output = '<h1>'.WebGUI::International::get(42).'</h1>';
         $output .= WebGUI::International::get(908).'<p>';
         $output .= '<div align="center"><a href="'.
                 WebGUI::URL::page('op=deleteThemeComponentConfirm&themeId='.$session{form}{themeId})
@@ -188,7 +187,7 @@ sub www_editTheme {
 	unless($session{form}{themeId} eq "new") {
                	$theme = WebGUI::SQL->quickHashRef("select * from theme where themeId=$session{form}{themeId}");
 	}
-        $output .= helpIcon(62);
+        $output .= helpIcon("theme add/edit");
 	$output .= '<h1>'.WebGUI::International::get(902).'</h1>';
 	$f = WebGUI::HTMLForm->new;
         $f->hidden("op","editThemeSave");
@@ -310,7 +309,7 @@ sub www_exportTheme {
 #-------------------------------------------------------------------
 sub www_importTheme {
         return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(9));
-	my $output = helpIcon(63);
+	my $output = helpIcon("theme import");
 	$output .= '<h1>'.WebGUI::International::get(927).'</h1>';
 	my $f = WebGUI::HTMLForm->new;
 	$f->hidden(
@@ -329,7 +328,7 @@ sub www_importTheme {
 #-------------------------------------------------------------------
 sub www_importThemeValidate {
         return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(9));
-	my $output = helpIcon(63);
+	my $output = helpIcon("theme import");
 	$output .= '<h1>'.WebGUI::International::get(927).'</h1>';
 	my $a = WebGUI::Attachment->new("","temp");
 	my $filename = $a->save("themePackage");
@@ -425,7 +424,7 @@ sub www_importThemeSave {
 sub www_listThemes {
         return WebGUI::Privilege::insufficient unless (WebGUI::Grouping::isInGroup(9));
         my (@data, @row, $i, $p);
-        my $output = helpIcon(61);
+        my $output = helpIcon("themes manage");
 	$output .= '<h1>'.WebGUI::International::get(899).'</h1>';
         my $sth = WebGUI::SQL->read("select themeId,name,original from theme order by name");
         while (@data = $sth->array) {
diff --git a/lib/WebGUI/Operation/Trash.pm b/lib/WebGUI/Operation/Trash.pm
index 6f62edd56..6024c1e37 100644
--- a/lib/WebGUI/Operation/Trash.pm
+++ b/lib/WebGUI/Operation/Trash.pm
@@ -169,9 +169,9 @@ sub www_deleteTrashItem {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
         my ($output);
 	if ($session{form}{wid} ne "") {
-        	$output .= helpIcon(14);
+        	$output .= helpIcon("wobject delete");
 	} elsif ($session{form}{pageId} ne "") {
-        	$output .= helpIcon(3);
+        	$output .= helpIcon("page delete");
 	}
         $output .= '<h1>'.WebGUI::International::get(42).'</h1>';
         $output .= WebGUI::International::get(966).'<p>';
@@ -224,7 +224,7 @@ sub www_deleteTrashItemConfirm {
 sub www_emptyTrash {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
         my ($output);
-	$output = helpIcon(46);
+	$output = helpIcon("trash empty");
         $output .= '<h1>'.WebGUI::International::get(42).'</h1>';
         $output .= WebGUI::International::get(162).'<p>';
         $output .= WebGUI::International::get(651).'<p>';
@@ -275,7 +275,7 @@ sub www_manageTrash {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(4));
 
 	my ($sth, @data, @row, @sorted_row, $i, $p, $allUsers);
-	my $output = helpIcon(66);
+	my $output = helpIcon("trash manage");
 
 	# Add appropriate html page header
 	if ($session{setting}{sharedTrash} eq "1") {
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 697866584..09f7bfef7 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -64,7 +64,7 @@ sub _submenu {
 sub www_addUser {
     my ($output, $f, $cmd, $html, %status);
     return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3) || WebGUI::Grouping::isInGroup(11));
-    $output .= helpIcon(5);
+    $output .= helpIcon("user add/edit");
 	$output .= '<h1>'.WebGUI::International::get(163).'</h1>';
 	$output .= WebGUI::Form::_javascriptFile("swapLayers.js");
 	$output .= '<script language="JavaScript" > var active="'.$session{setting}{authMethod}.'"; </script>';
@@ -182,7 +182,7 @@ sub www_deleteUser {
         if ($session{form}{uid} < 26) {
 		return WebGUI::Privilege::vitalComponent();
         } else {
-                $output .= helpIcon(7);
+                $output .= helpIcon("user delete");
 		$output .= '<h1>'.WebGUI::International::get(42).'</h1>';
                 $output .= WebGUI::International::get(167).'<p>';
                 $output .= '<div align="center"><a href="'.WebGUI::URL::page('op=deleteUserConfirm&uid='.$session{form}{uid}).
@@ -244,7 +244,7 @@ sub www_editUser {
 	$u = WebGUI::User->new($session{form}{uid});
 	$output .= WebGUI::Form::_javascriptFile("swapLayers.js");
 	$output .= '<script language="JavaScript" > var active="'.$u->authMethod.'"; </script>';
-    $output .= helpIcon(5);
+    $output .= helpIcon("user add/edit");
 	$output .= '<h1>'.WebGUI::International::get(168).'</h1>';
 	$f = WebGUI::HTMLForm->new;
     $f->hidden("op","editUserSave");
@@ -357,7 +357,7 @@ sub www_editUserGroup {
 sub www_editUserKarma {
 	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $f, $a, %user, %data, $method, $values, $category, $label, $default, $previousCategory);
-        $output = helpIcon(36);
+        $output = helpIcon("karma using");
         $output .= '<h1>'.WebGUI::International::get(558).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("op","editUserKarmaSave");
@@ -383,7 +383,7 @@ sub www_editUserProfile {
 	return WebGUI::Privilege::adminOnly() unless (WebGUI::Grouping::isInGroup(3));
         my ($output, $f, $a, %user, %data, $method, $values, $category, $label, $default, $previousCategory);
 	tie %data, 'Tie::CPHash';
-	$output = helpIcon(32);
+	$output = helpIcon("user profile edit");
         $output .= '<h1>'.WebGUI::International::get(455).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("op","editUserProfileSave");
@@ -469,7 +469,7 @@ sub www_listUsers {
 	WebGUI::Session::setScratch("userSearchKeyword",$session{form}{keyword});
 	WebGUI::Session::setScratch("userSearchStatus",$session{form}{status});
 	my ($data, $rows, $p, %status, $selectedStatus);
-	my $output = helpIcon(8);
+	my $output = helpIcon("users manage");
 	$output .= '<h1>'.WebGUI::International::get(149).'</h1>';
 	$output .= '<div align="center">';
 	tie %status, 'Tie::IxHash';
diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm
index 2a9ab8514..f845ae628 100644
--- a/lib/WebGUI/Wobject.pm
+++ b/lib/WebGUI/Wobject.pm
@@ -1190,7 +1190,7 @@ sub www_delete {
 	my $self = shift;
         my ($output);
         if ($self->canEdit) {
-                $output = helpIcon(14);
+                $output = helpIcon("wobject delete");
 		$output .= '<h1>'.WebGUI::International::get(42).'</h1>';
                 $output .= WebGUI::International::get(43);
 		$output .= '<p>';
diff --git a/lib/WebGUI/Wobject/Article.pm b/lib/WebGUI/Wobject/Article.pm
index cd65784d8..b0b71572a 100644
--- a/lib/WebGUI/Wobject/Article.pm
+++ b/lib/WebGUI/Wobject/Article.pm
@@ -101,7 +101,7 @@ sub www_edit {
 		-properties=>$properties->printRowsOnly,
 		-layout=>$layout->printRowsOnly,
 		-headingId=>12,
-		-helpId=>1
+		-helpId=>"article add/edit"
 		);
 }
 
diff --git a/lib/WebGUI/Wobject/DataForm.pm b/lib/WebGUI/Wobject/DataForm.pm
index cf7ec343f..f34bb49dd 100644
--- a/lib/WebGUI/Wobject/DataForm.pm
+++ b/lib/WebGUI/Wobject/DataForm.pm
@@ -536,7 +536,7 @@ sub www_edit {
 	return $_[0]->SUPER::www_edit(
 		-properties=>$properties->printRowsOnly,
 		-layout=>$layout->printRowsOnly,
-		-helpId=>1,
+		-helpId=>"data form add/edit",
 		-headingId=>7
 		);
 }
@@ -619,7 +619,7 @@ sub www_editField {
         	%field = WebGUI::SQL->quickHash("select * from DataForm_field where DataForm_fieldId=$session{form}{fid}");
 	}
 	$tab = WebGUI::SQL->buildHashRef("select DataForm_tabId,label from DataForm_tab where wobjectId=".$_[0]->get("wobjectId"));
-        $output = helpIcon(2,$_[0]->get("namespace"));
+        $output = helpIcon("data form fields add/edit",$_[0]->get("namespace"));
         $output .= '<h1>'.WebGUI::International::get(20,$_[0]->get("namespace")).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("wid",$_[0]->get("wobjectId"));
@@ -734,7 +734,7 @@ sub www_editTab {
 	unless ($session{form}{tid} eq "new") {	
         	%tab = WebGUI::SQL->quickHash("select * from DataForm_tab where DataForm_tabId=$session{form}{tid}");
 	}
-        $output = helpIcon(2,$_[0]->get("namespace"));
+        $output = helpIcon("data form fields add/edit",$_[0]->get("namespace"));
         $output .= '<h1>'.WebGUI::International::get(20,$_[0]->get("namespace")).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("wid",$_[0]->get("wobjectId"));
diff --git a/lib/WebGUI/Wobject/EventsCalendar.pm b/lib/WebGUI/Wobject/EventsCalendar.pm
index 4df145dfa..417d4db9d 100644
--- a/lib/WebGUI/Wobject/EventsCalendar.pm
+++ b/lib/WebGUI/Wobject/EventsCalendar.pm
@@ -223,7 +223,7 @@ sub www_edit {
 	return $_[0]->SUPER::www_edit(
 		-properties=>$properties->printRowsOnly,
 		-layout=>$layout->printRowsOnly,
-		-helpId=>1,
+		-helpId=>"events calendar add/edit",
 		-headingId=>12
 		);
 }
@@ -268,7 +268,7 @@ sub www_editEvent {
 		$f->hidden("until");
 		$special = $f->printRowsOnly;
 	}
-	$output = helpIcon(2,$_[0]->get("namespace"));
+	$output = helpIcon("event add/edit",$_[0]->get("namespace"));
         $output .= '<h1>'.WebGUI::International::get(13,$_[0]->get("namespace")).'</h1>';
 	$f = WebGUI::HTMLForm->new;
         $f->hidden("wid",$_[0]->get("wobjectId"));
diff --git a/lib/WebGUI/Wobject/FileManager.pm b/lib/WebGUI/Wobject/FileManager.pm
index e5bac18fa..41f36f676 100644
--- a/lib/WebGUI/Wobject/FileManager.pm
+++ b/lib/WebGUI/Wobject/FileManager.pm
@@ -205,7 +205,7 @@ sub www_edit {
 		-properties=>$properties->printRowsOnly,
 		-layout=>$layout->printRowsOnly,
 		-headingId=>9,
-		-helpId=>1
+		-helpId=>"file manager add/edit"
 		);
 }
 
@@ -227,7 +227,7 @@ sub www_editDownload {
 	$session{page}{useAdminStyle} = 1;
         my ($output, $file, $f);
 	$file = $_[0]->getCollateral("FileManager_file","FileManager_fileId",$session{form}{did});
-        $output .= helpIcon(2,$_[0]->get("namespace"));
+        $output .= helpIcon("file add/edit",$_[0]->get("namespace"));
         $output .= '<h1>'.WebGUI::International::get(10,$_[0]->get("namespace")).'</h1>';
 	$f = WebGUI::HTMLForm->new;
         $f->hidden("wid",$_[0]->get("wobjectId"));
diff --git a/lib/WebGUI/Wobject/HttpProxy.pm b/lib/WebGUI/Wobject/HttpProxy.pm
index b98ee3600..c808d468e 100644
--- a/lib/WebGUI/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Wobject/HttpProxy.pm
@@ -136,7 +136,7 @@ sub www_edit {
 		-properties=>$properties->printRowsOnly,
 		-layout=>$layout->printRowsOnly,
 		-privileges=>$privileges->printRowsOnly,
-		-helpId=>1,
+		-helpId=>"http proxy add/edit",
 		-headingId=>2
 		);
 }
diff --git a/lib/WebGUI/Wobject/IndexedSearch.pm b/lib/WebGUI/Wobject/IndexedSearch.pm
index 9d321718b..337a89675 100644
--- a/lib/WebGUI/Wobject/IndexedSearch.pm
+++ b/lib/WebGUI/Wobject/IndexedSearch.pm
@@ -1,5 +1,4 @@
 package WebGUI::Wobject::IndexedSearch;
-$VERSION = "1.4";
 
 #Test to see if Time::HiRes will load.
 my $hasTimeHiRes=1;
@@ -214,7 +213,7 @@ sub www_edit {
 		-layout=>$layout->printRowsOnly,
 		-privileges=>$privileges->printRowsOnly,
 		-heading=>"Edit Search",
-		-helpId=>1
+		-helpId=>"search add/edit"
 	);
 
 }
diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm
index b22b93f87..914485820 100644
--- a/lib/WebGUI/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Wobject/MessageBoard.pm
@@ -160,7 +160,7 @@ sub www_edit {
 	return $_[0]->SUPER::www_edit(
 		-properties=>$properties->printRowsOnly,
 		-headingId=>6,
-		-helpId=>1
+		-helpId=>"message board add/edit"
 		);
 }
 
@@ -194,7 +194,7 @@ sub www_editForum {
 		);
 	$f->raw(WebGUI::Forum::UI::forumProperties($forum->get("forumId")));
 	$f->submit;
-	return helpIcon(3,$_[0]->get("namespace")).'<h1>'.WebGUI::International::get(77,$_[0]->get("namespace")).'</h1>'.$f->print;
+	return helpIcon("forum add/edit",$_[0]->get("namespace")).'<h1>'.WebGUI::International::get(77,$_[0]->get("namespace")).'</h1>'.$f->print;
 }
 
 #-------------------------------------------------------------------
diff --git a/lib/WebGUI/Wobject/Poll.pm b/lib/WebGUI/Wobject/Poll.pm
index 0096c67b8..e79a37e6e 100644
--- a/lib/WebGUI/Wobject/Poll.pm
+++ b/lib/WebGUI/Wobject/Poll.pm
@@ -202,7 +202,7 @@ sub www_edit {
 		-properties=>$properties->printRowsOnly,
 		-privileges=>$privileges->printRowsOnly,
 		-headingId=>9,
-		-helpId=>1
+		-helpId=>"poll add/edit"
 		);
 	if ($_[0]->get("wobjectId") ne "new") {
 		$output .= '<p>';
diff --git a/lib/WebGUI/Wobject/Product.pm b/lib/WebGUI/Wobject/Product.pm
index 2672d78c1..2267363d4 100644
--- a/lib/WebGUI/Wobject/Product.pm
+++ b/lib/WebGUI/Wobject/Product.pm
@@ -166,7 +166,7 @@ sub www_addAccessory {
 	return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
         $session{page}{useAdminStyle} = 1;
         my ($output, $f, $accessory, @usedAccessories);
-	$output = helpIcon(4,$_[0]->get("namespace"));
+	$output = helpIcon("product accessory add/edit",$_[0]->get("namespace"));
         $output .= '<h1>'.WebGUI::International::get(16,$_[0]->get("namespace")).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("wid",$_[0]->get("wobjectId"));
@@ -203,7 +203,7 @@ sub www_addAccessorySave {
 sub www_addRelated {
 	return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit);
         my ($output, $f, $related, @usedRelated);
-	$output = helpIcon(5,$_[0]->get("namespace"));
+	$output = helpIcon("product related add/edit",$_[0]->get("namespace"));
         $output .= '<h1>'.WebGUI::International::get(19,$_[0]->get("namespace")).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("wid",$_[0]->get("wobjectId"));
@@ -341,7 +341,7 @@ sub www_edit {
 	$properties->raw($_[0]->fileProperty("warranty",15));
 	return $_[0]->SUPER::www_edit(
 		-properties=>$properties->printRowsOnly,
-		-helpId=>1,
+		-helpId=>"product add/edit",
 		-headingId=>6
 		);
 }
@@ -379,7 +379,7 @@ sub www_editBenefit {
         $session{page}{useAdminStyle} = 1;
         my ($output, $data, $f, $benefits);
 	$data = $_[0]->getCollateral("Product_benefit","Product_benefitId",$session{form}{bid});
-        $output = helpIcon(6,$_[0]->get("namespace"));
+        $output = helpIcon("product benefit add/edit",$_[0]->get("namespace"));
         $output .= '<h1>'.WebGUI::International::get(53,$_[0]->get("namespace")).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("wid",$_[0]->get("wobjectId"));
@@ -415,7 +415,7 @@ sub www_editFeature {
         $session{page}{useAdminStyle} = 1;
         my ($output, $data, $f, $features);
 	$data = $_[0]->getCollateral("Product_feature","Product_featureId",$session{form}{fid});
-	$output = helpIcon(2,$_[0]->get("namespace"));
+	$output = helpIcon("product feature add/edit",$_[0]->get("namespace"));
         $output .= '<h1>'.WebGUI::International::get(22,$_[0]->get("namespace")).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("wid",$_[0]->get("wobjectId"));
@@ -451,7 +451,7 @@ sub www_editSpecification {
         $session{page}{useAdminStyle} = 1;
         my ($output, $data, $f, $hashRef);
 	$data = $_[0]->getCollateral("Product_specification","Product_specificationId",$session{form}{sid});
-	$output = helpIcon(3,$_[0]->get("namespace"));
+	$output = helpIcon("product specification add/edit",$_[0]->get("namespace"));
         $output .= '<h1>'.WebGUI::International::get(25,$_[0]->get("namespace")).'</h1>';
         $f = WebGUI::HTMLForm->new;
         $f->hidden("wid",$_[0]->get("wobjectId"));
diff --git a/lib/WebGUI/Wobject/SQLReport.pm b/lib/WebGUI/Wobject/SQLReport.pm
index f1c4b91c9..1ca7e31e7 100644
--- a/lib/WebGUI/Wobject/SQLReport.pm
+++ b/lib/WebGUI/Wobject/SQLReport.pm
@@ -98,7 +98,7 @@ sub www_edit {
 		-properties=>$properties->printRowsOnly,
 		-privileges=>$privileges->printRowsOnly,
 		-headingId=>8,
-		-helpId=>1
+		-helpId=>"sql report add/edit"
 		);
 }
 
diff --git a/lib/WebGUI/Wobject/SiteMap.pm b/lib/WebGUI/Wobject/SiteMap.pm
index e182e0c46..bf348bf7c 100644
--- a/lib/WebGUI/Wobject/SiteMap.pm
+++ b/lib/WebGUI/Wobject/SiteMap.pm
@@ -129,7 +129,7 @@ sub www_edit {
 		-properties=>$properties->printRowsOnly,
 		-layout=>$layout->printRowsOnly,
 		-headingId=>5,
-		-helpId=>1
+		-helpId=>"site map add/edit"
 		);
 }
 
diff --git a/lib/WebGUI/Wobject/Survey.pm b/lib/WebGUI/Wobject/Survey.pm
index f0b535e03..b0d750958 100644
--- a/lib/WebGUI/Wobject/Survey.pm
+++ b/lib/WebGUI/Wobject/Survey.pm
@@ -562,7 +562,7 @@ sub www_edit {
 		-layout=>$layout->printRowsOnly,
 		-privileges=>$privileges->printRowsOnly,
 		-headingId=>2,
-		-helpId=>1
+		-helpId=>"survey add/edit"
 		);
         return $output;
 }
diff --git a/lib/WebGUI/Wobject/SyndicatedContent.pm b/lib/WebGUI/Wobject/SyndicatedContent.pm
index db70603f5..76235a939 100644
--- a/lib/WebGUI/Wobject/SyndicatedContent.pm
+++ b/lib/WebGUI/Wobject/SyndicatedContent.pm
@@ -74,7 +74,7 @@ sub www_edit {
 		-properties=>$properties->printRowsOnly,
                 -layout=>$layout->printRowsOnly,
 		-headingId=>4,
-		-helpId=>1
+		-helpId=>"syndicated content add/edit"
 		);
 }
 
diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm
index 06a7acd35..7216dc165 100644
--- a/lib/WebGUI/Wobject/USS.pm
+++ b/lib/WebGUI/Wobject/USS.pm
@@ -391,7 +391,7 @@ sub www_edit {
 		-privileges=>$privileges->printRowsOnly,
 		-properties=>$properties->printRowsOnly,
 		-headingId=>18,
-		-helpId=>1
+		-helpId=>"user submission system add/edit"
 		);
 }
 
diff --git a/lib/WebGUI/Wobject/WSClient.pm b/lib/WebGUI/Wobject/WSClient.pm
index ab5524d04..18754e79d 100644
--- a/lib/WebGUI/Wobject/WSClient.pm
+++ b/lib/WebGUI/Wobject/WSClient.pm
@@ -232,7 +232,7 @@ sub www_edit {
       -privileges => $privileges->printRowsOnly,
       -properties => $properties->printRowsOnly,
       -headingId  => 20,
-      -helpId     => 1,
+      -helpId     => "web services client add/edit",
    );
 }
 
diff --git a/lib/WebGUI/Wobject/WobjectProxy.pm b/lib/WebGUI/Wobject/WobjectProxy.pm
index 987dcf49b..199f1a437 100644
--- a/lib/WebGUI/Wobject/WobjectProxy.pm
+++ b/lib/WebGUI/Wobject/WobjectProxy.pm
@@ -114,7 +114,7 @@ sub www_edit {
                 -properties=>$properties->printRowsOnly,
                 -layout=>$layout->printRowsOnly,
                 -headingId=>2,
-                -helpId=>1
+                -helpId=>"wobject proxy add/edit"
                 );
 
 }
diff --git a/lib/WebGUI/i18n/English/DataForm.pm b/lib/WebGUI/i18n/English/DataForm.pm
index 7c76e03a4..5b9bf0d80 100644
--- a/lib/WebGUI/i18n/English/DataForm.pm
+++ b/lib/WebGUI/i18n/English/DataForm.pm
@@ -384,12 +384,12 @@ Enter the default value (if any) for the field.  For Yes/No fields, enter "yes"
 
 	'100' => {
 		message => q|Are you certain that you want to delete this tab ?|,
-		lastUpdated => 
+		lastUpdated =>1052048005 
 	},
 
 	'101' => {
 		message => q|Label|,
-		lastUpdated => 
+		lastUpdated => 1052048005
 	},
 
 	'84' => {
@@ -564,27 +564,27 @@ A conditional indicating whether this field exists for the mail subsystem of the
 
 	'102' => {
 		message => q|Subtext|,
-		lastUpdated => 
+		lastUpdated => 1052048005
 	},
 
 	'106' => {
 		message => q|Tab Template|,
-		lastUpdated => 
+		lastUpdated => 1052048005
 	},
 
 	'105' => {
 		message => q|Add a Tab|,
-		lastUpdated => 
+		lastUpdated => 1052048005
 	},
 
 	'104' => {
 		message => q|Tab|,
-		lastUpdated => 
+		lastUpdated => 1052048005
 	},
 
 	'103' => {
 		message => q|Add new Tab|,
-		lastUpdated => 
+		lastUpdated => 1052048005
 	},
 
 	'90' => {