fixed the context sensitive help links

This commit is contained in:
JT Smith 2004-07-05 21:51:39 +00:00
parent 3375889a61
commit fbd0fa7efa
33 changed files with 77 additions and 107 deletions

View file

@ -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") {

View file

@ -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");

View file

@ -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>';

View file

@ -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");

View file

@ -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 = ();

View file

@ -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}});

View file

@ -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) {

View file

@ -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) {

View file

@ -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>';

View file

@ -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>';

View file

@ -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;

View file

@ -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) {

View file

@ -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) {

View file

@ -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") {

View file

@ -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';