oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

removed help links that are referring to help that has been moved to the wiki

Browse source
This commit is contained in:
JT Smith 2007-07-26 04:53:14 +00:00
parent bde1a7a941
commit f6cab15bd0
32 changed files with 30 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/AdminConsole.pm
View file

@ -537,6 +537,8 @@ sub render {
Sets the _helpUrl to the urlized page.
B<NOTE:> This method is depricated and may be removed from a future version.
=head3 id
If not provided, this method does nothing.

1
lib/WebGUI/Asset/File.pm
View file

@ -424,7 +424,6 @@ sub www_edit {
-hoverHelp=>$i18n->get('file template description','Asset_File'),
-namespace=>"FileAsset"
);
$self->getAdminConsole->setHelp("file add/edit", "Asset_File");
return $self->getAdminConsole->render($tabform->print,$self->addEditLabel);
}

2
lib/WebGUI/Asset/File/Image.pm
View file

@ -288,7 +288,6 @@ sub www_edit {
-hoverHelp=>$i18n->get('image template description'),
-defaultValue=>"PBtmpl0000000000000088"
);
$self->getAdminConsole->setHelp("image add/edit","Asset_Image");
return $self->getAdminConsole->render($tabform->print,$i18n->get("edit image"));
}
@ -331,7 +330,6 @@ sub www_resize {
);
$f->submit;
my $image = '<div align="center"><img src="'.$self->getStorageLocation->getUrl($self->get("filename")).'" style="border-style:none;" alt="'.$self->get("filename").'" /></div>';
$self->getAdminConsole->setHelp("image resize","Asset_Image");
return $self->getAdminConsole->render($f->print.$image,$i18n->get("resize image"));
}

1
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -242,7 +242,6 @@ sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("zip archive add/edit", "Asset_ZipArchive");
my $i18n = WebGUI::International->new($self->session, 'Asset_Wobject');
my $addEdit = ($self->session->form->process("func") eq 'add') ? $i18n->get('add') : $i18n->get('edit');
return $self->getAdminConsole->render($self->getEditForm->print, $self->addEditLabel);

1
lib/WebGUI/Asset/FilePile.pm
View file

@ -129,7 +129,6 @@ sub edit {
-hoverHelp=>$i18n->get("upload files description"),
-maxAttachments=>100
);
$self->getAdminConsole->setHelp("file pile add/edit","Asset_FilePile");
return $self->getAdminConsole->render($tabform->print,$i18n->get("add pile"));
}

1
lib/WebGUI/Asset/Redirect.pm
View file

@ -85,7 +85,6 @@ sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("redirect add/edit", "Asset_Redirect");
return $self->getAdminConsole->render($self->getEditForm->print, $self->addEditLabel);
}

2
lib/WebGUI/Asset/Shortcut.pm
View file

@ -127,7 +127,6 @@ sub _submenu {
my $title = shift;
my $help = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"shortcutmanager");
$ac->setHelp($help) if ($help);
$ac->setIcon($self->getIcon);
my $i18n = WebGUI::International->new($self->session,"Asset_Shortcut");
$ac->addSubmenuItem($self->getUrl('func=edit'), $i18n->get("Back to Edit Shortcut"));
@ -689,7 +688,6 @@ sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("shortcut add/edit","Asset_Shortcut");
my $i18n = WebGUI::International->new($self->session,"Asset_Shortcut");
$self->getAdminConsole->addSubmenuItem($self->getUrl("func=manageOverrides"),$i18n->get("Manage Shortcut Overrides"));
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get(2));

1
lib/WebGUI/Asset/Snippet.pm
View file

@ -177,7 +177,6 @@ sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("snippet add/edit","Asset_Snippet");
return $self->getAdminConsole->render($self->getEditForm->print,$self->addEditLabel);
}

1
lib/WebGUI/Asset/Template.pm
View file

@ -355,7 +355,6 @@ sub www_edit {
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $i18n = WebGUI::International->new($self->session, "Asset_Template");
$self->getAdminConsole->setHelp("template add/edit","Asset_Template");
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=styleWizard'),$i18n->get("style wizard")) if ($self->get("namespace") eq "style");
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('edit template'));
}

1
lib/WebGUI/Asset/Wobject.pm
View file

@ -492,7 +492,6 @@ sub www_edit {
my $tag2 = $tag;
$tag =~ s/([a-z])([A-Z])/$1 $2/g; #Separate studly caps
$tag =~ s/([A-Z]+(?![a-z]))/$1 /g; #Separate acronyms
$self->getAdminConsole->setHelp(lc($tag)." add/edit", "Asset_".$tag2);
return $self->getAdminConsole->render($self->getEditForm->print, $self->addEditLabel);
}

1
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -1431,7 +1431,6 @@ sub www_edit {
return $session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("Calendar add/edit", "Calendar");
return $self->getAdminConsole->render(
$self->getEditForm->print,

2
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -979,7 +979,6 @@ sub www_editField {
}
$f->submit;
my $ac = $self->getAdminConsole;
$ac->setHelp("data form fields add/edit","Asset_DataForm");
return $ac->render($f->print,$i18n->get('20'));
}
@ -1061,7 +1060,6 @@ sub www_editTab {
}
$f->submit;
my $ac = $self->getAdminConsole;
$ac->setHelp("data form fields add/edit","Asset_DataForm");
return $ac->render($f->print,$i18n->get('103')) if $tid eq "new";
return $ac->render($f->print,$i18n->get('102'));
}

8
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -163,7 +163,6 @@ sub _acWrapper {
my $title = shift;
my $i18n = WebGUI::International->new($self->session,'Asset_EventManagementSystem');
my $ac = $self->getAdminConsole;
$ac->setHelp('add/edit event','Asset_EventManagementSystem')
unless $ac->getHelp;
$ac->addSubmenuItem($self->getUrl('func=search'),$i18n->get("manage events"));
$ac->addSubmenuItem($self->getUrl('func=manageEventMetadata'), $i18n->get('manage event metadata'));
@ -1743,7 +1742,6 @@ sub www_edit {
my $tag2 = $tag;
$tag =~ s/([a-z])([A-Z])/$1 $2/g; #Separate studly caps
$tag =~ s/([A-Z]+(?![a-z]))/$1 /g; #Separate acronyms
$self->getAdminConsole->setHelp(lc($tag)." add/edit", "Asset_".$tag2);
my $i18n = WebGUI::International->new($self->session,'Asset_Wobject');
my $i18n2 = WebGUI::International->new($self->session,'Asset_EventManagementSystem');
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=manageEventMetadata'), $i18n->get('manage event metadata', 'Asset_EventManagementSystem'));
@ -2034,7 +2032,6 @@ changePassType();
$f->submit;
my $output = $f->print;
$self->getAdminConsole->setHelp('add/edit event','Asset_EventManagementSystem');
my $addEdit = ($pid eq "new" or !$pid) ? $i18n->get('add', 'Asset_Wobject') : $i18n->get('edit', 'Asset_Wobject');
return $self->_acWrapper($output, $addEdit.' '.$i18n->get('event'));
}
@ -2627,7 +2624,6 @@ sub www_importEvents {
$f->fieldSetEnd;
$f->submit(-value=>$i18n->get('import events'));
$self->getAdminConsole->setHelp('import events','Asset_EventManagementSystem');
return $self->_acWrapper($page_header.'<p/>'.$f->print, $i18n->get('import events'));
}
@ -3440,7 +3436,6 @@ sub www_editEventMetaDataField {
$hash{$category->getId} = $category->getLabel;
}
$f->submit;
$self->getAdminConsole->setHelp('edit event metadata field','Asset_EventManagementSystem');
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=editEventMetaDataField;fieldId=new'), $i18n2->get("add new event metadata field"));
return $self->_acWrapper($f->print, $i18n2->get("add/edit event metadata field"));
}
@ -4490,7 +4485,6 @@ function resetToInitial() {
);
$f->submit;
$f->raw($self->www_viewPurchase('noStyle',$badgeId));
$self->getAdminConsole->setHelp('edit registrant','Asset_EventManagementSystem');
return $self->_acWrapper($f->print, $i18n->get("edit registrant"));
}
@ -4610,7 +4604,6 @@ sub www_manageDiscountPasses {
"&nbsp;&nbsp;".$data->{name}."&nbsp;&nbsp;(".$data->{type}."&nbsp;".$data->{amount}."&nbsp;)</div>";
}
}
$self->getAdminConsole->setHelp('manage discount passes', 'Asset_EventManagementSystem');
$self->getAdminConsole->addSubmenuItem($self->getUrl('func=editDiscountPass;passId=new'), $i18n->get('add discount pass'));
return $self->_acWrapper($output, $i18n->get("manage discount passes"));
}
@ -4674,7 +4667,6 @@ sub www_editDiscountPass {
value=>$data->{amount} || '0.00'
);
$f->submit;
$self->getAdminConsole->setHelp('edit discount pass', 'Asset_EventManagementSystem');
return $self->_acWrapper($f->print, $i18n->get("edit discount pass"));
}

1
lib/WebGUI/Asset/Wobject/InOutBoard.pm
View file

@ -292,7 +292,6 @@ sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("in out board add/edit","Asset_InOutBoard");
return $self->getAdminConsole->render($self->getEditForm->print, $self->addEditLabel);
}

6
lib/WebGUI/Asset/Wobject/SQLForm.pm
View file

@ -1928,7 +1928,6 @@ my $js = "<script type=\"text/javascript\">\n";
$output = '<h2>'.$i18n->get('ef errors occurred').'</h2><ul><li>'.join('</li><li>', @{$errors}).'</li></ul><br />' if ($errors);
$output .= $tabForm->print . $js;
$self->getAdminConsole->setHelp("edit field", "Asset_SQLForm");
return $self->getAdminConsoleWithSubmenu->render($output, $i18n->get('edit field title'));
}
@ -2287,7 +2286,6 @@ sub www_editFieldType {
})
);
$self->getAdminConsole->setHelp("edit field type", "Asset_SQLForm");
return $self->getAdminConsoleWithSubmenu->render($f->print, $i18n->get('edit field type title'));
}
@ -2898,7 +2896,6 @@ sub www_editRegex {
})
);
$self->getAdminConsole->setHelp("edit regex", "Asset_SQLForm");
return $self->getAdminConsoleWithSubmenu->render($f->print, $i18n->get('edit regex title'));
}
@ -2987,7 +2984,6 @@ sub www_listFields {
$output .= '<br /><a href="'.$self->getUrl('func=editField;fid=new').'">'.$i18n->get('lf add field').'</a>';
$self->getAdminConsole->setHelp("manage fields", "Asset_SQLForm");
return $self->getAdminConsoleWithSubmenu->render($output, $i18n->get('manage fields title'));
}
@ -3065,7 +3061,6 @@ my $currentRow = '<tr align="left" bgcolor="#bbbbbb">';
$output .= '</table>';
$output .= '<a href="'.$self->getUrl('func=editFieldType;ftid=new').'">'.$i18n->get('lft add field type').'</a>';
$self->getAdminConsole->setHelp("manage field types", "Asset_SQLForm");
return $self->getAdminConsoleWithSubmenu->render($output,$i18n->get('manage field types title'));
}
@ -3143,7 +3138,6 @@ my $currentRow = '<tr align="left" bgcolor="#bbbbbb">';
$output .= '</table>';
$output .= '<a href="'.$self->getUrl('func=editRegex;regexId=new').'">'.$i18n->get('lr add regex').'</a>';
$self->getAdminConsole->setHelp("manage regexes", "Asset_SQLForm");
return $self->getAdminConsoleWithSubmenu->render($output,$i18n->get('manage regexes title'));
}

19
lib/WebGUI/Asset/Wobject/StockData.pm
View file

@ -226,25 +226,6 @@ sub _getStockSources {
#-------------------------------------------------------------------
=head2 _submenu
Renders the admin console view
=cut
sub _submenu {
my $self = shift;
my $workarea = shift;
my $title = shift;
my $help = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"editstocks");
$ac->setHelp($help) if ($help);
$ac->setIcon($self->getIcon);
return $ac->render($workarea, $title);
}
#-------------------------------------------------------------------
=head2 _trim ( str )
Trims whitespace form front and end of a string

2
lib/WebGUI/Asset/Wobject/Survey.pm
View file

@ -881,7 +881,6 @@ sub www_editAnswer {
}
$f->submit;
# $self->getAdminConsole->setHelp("answer add/edit","Asset_Survey");
return $self->getAdminConsole->render($f->print, $i18n->get(18));
}
@ -1024,7 +1023,6 @@ sub www_editQuestion {
}
$sth->finish;
}
$self->getAdminConsole->setHelp("question add/edit","Asset_Survey");
return $self->getAdminConsole->render($output, $i18n->get(17));
}

2
lib/WebGUI/Asset/Wobject/TimeTracking.pm
View file

@ -385,7 +385,6 @@ sub www_editProject {
$f->submit();
my $ac = $self->getAdminConsole;
my $newProjectUrl = $self->getUrl('func=editProject;projectId=new');
$ac->setHelp('edit projects', 'Asset_TimeTracking');
$ac->addSubmenuItem($newProjectUrl,$i18n->get("add project label"));
return $ac->render($f->print,$i18n->get("edit project screen label"));
@ -567,7 +566,6 @@ sub www_manageProjects {
my $ac = $self->getAdminConsole;
$ac->addSubmenuItem($newProjectUrl,$i18n->get("add project label"));
$ac->setHelp('manage projects', 'Asset_TimeTracking');
return $ac->render($output,$i18n->get("manage projects screen label"));
}

1
lib/WebGUI/Asset/Wobject/_NewWobject.skeleton
View file

@ -180,7 +180,6 @@ adminConsole views.
# return $self->session->privilege->insufficient() unless $self->canEdit;
# return $self->session->privilege->locked() unless $self->canEditIfLocked;
# my $i18n = WebGUI::International->new($self->session, "Asset_NewWobject");
# $self->getAdminConsole->setHelp("new wobject add/edit", "Asset_NewWobject");
# return $self->getAdminConsole->render($self->getEditForm->print, $i18n->get("edit title"));
#}

1
lib/WebGUI/Asset/_NewAsset.skeleton
View file

@ -240,7 +240,6 @@ sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
$self->getAdminConsole->setHelp("New Asset add/edit", "New Asset");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('edit asset',"Asset_NewAsset"));
}

3
lib/WebGUI/Operation/AdSpace.pm
View file

@ -211,7 +211,6 @@ sub www_editAd {
);
$f->fieldSetEnd;
$f->submit;
$ac->setHelp('edit ad', 'AdSpace');
$ac->render($f->print, $i18n->get("edit advertisement"));
}
@ -333,7 +332,6 @@ sub www_editAdSpace {
}
$ads .= '<div style="clear: both;"></div>';
}
$ac->setHelp('edit ad space', 'AdSpace');
$ac->render($code.$f->print.$ads, $i18n->get("edit ad space"));
}
@ -390,7 +388,6 @@ sub www_manageAdSpaces {
}
$output .= '<div style="clear: both;"></div>';
$ac->addSubmenuItem($session->url->page("op=editAdSpace"), $i18n->get("add ad space"));
$ac->setHelp('manage ad spaces', 'AdSpace');
return $ac->render($output);
}

12
lib/WebGUI/Operation/Commerce.pm
View file

@ -39,10 +39,6 @@ A scalar of HTML that defines the current workarea.
The i18n key of the title of this workarea.
=head3 help
The i18n key of the help link for this workarea.
=cut
sub _submenu {
@ -52,11 +48,7 @@ sub _submenu {
my $workarea = shift;
my $title = shift;
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new($session,"commerce");
if ($help) {
$ac->setHelp($help, 'Commerce');
}
$ac->addSubmenuItem($session->url->page('op=editCommerceSettings'), $i18n->get('manage commerce settings'));
$ac->addSubmenuItem($session->url->page('op=listTransactions'), $i18n->get('list transactions'));
$ac->addSubmenuItem($session->url->page('op=listPendingTransactions'), $i18n->get('list pending transactions'));
@ -795,7 +787,7 @@ sub www_editCommerceSettings {
$session->style->setScript($session->url->extras('swapLayers.js'),{type=>"text/javascript"});
return _submenu($session,$tabform->print, 'edit commerce settings title', 'commerce manage');
return _submenu($session,$tabform->print, 'edit commerce settings title');
}
#-------------------------------------------------------------------
@ -883,7 +875,7 @@ sub www_listPendingTransactions {
$output .= '</table>';
$output .= $p->getBarTraditional($session->form->process("pn"));
_submenu($session,$output, 'list pending transactions', 'list pending transactions');
_submenu($session,$output, 'list pending transactions');
}
#-------------------------------------------------------------------

4
lib/WebGUI/Operation/Graphics.pm
View file

@ -15,11 +15,7 @@ sub _submenu {
my $workarea = shift;
my $title = shift;
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new($session,"graphics");
if ($help) {
$ac->setHelp($help, 'Commerce');
}
$ac->addSubmenuItem($session->url->page('op=listPalettes'), $i18n->get('manage palettes'));
$ac->addSubmenuItem($session->url->page('op=listFonts'), $i18n->get('manage fonts'));
$ac->addSubmenuItem($session->url->page('op=editPalette;pid=new'), $i18n->get('add palette'));

12
lib/WebGUI/Operation/Group.pm
View file

@ -39,11 +39,7 @@ sub _submenu {
my $title = shift;
my $i18n = WebGUI::International->new($session);
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new($session,"groups");
if ($help) {
$ac->setHelp($help);
}
if ($session->user->isInGroup(3)) {
$ac->addSubmenuItem($session->url->page('op=editGroup;gid=new'), $i18n->get(90));
}
@ -412,7 +408,7 @@ sub www_editGroup {
);
$f->submit;
$output .= $f->print;
return _submenu($session,$output,'87',"group add/edit");
return _submenu($session,$output,'87');
}
#-------------------------------------------------------------------
@ -488,7 +484,7 @@ sub www_editGrouping {
-value=>$group->userIsAdmin($session->form->process("uid"))
);
$f->submit;
return _submenu($session,$f->print,'370','grouping edit');
return _submenu($session,$f->print,'370');
}
#-------------------------------------------------------------------
@ -574,7 +570,7 @@ sub www_listGroups {
}
$output .= '</table>';
$output .= $p->getBarTraditional;
return _submenu($session,$output,'',"groups manage");
return _submenu($session,$output);
} elsif ($session->user->isInGroup(11)) {
my ($output, $p, $sth, @data, @row, $i, $userCount);
my @editableGroups = $session->db->buildArray("select groupId from groupings where userId=".$session->db->quote($session->user->userId)." and groupAdmin=1");
@ -638,7 +634,7 @@ sub www_manageGroupsInGroup {
my $output = $f->print;
$output .= '<p />';
$output .= walkGroups($session, $session->form->process("gid"));
return _submenu($session,$output,'813', 'manage groups in group');
return _submenu($session,$output,'813');
}
#-------------------------------------------------------------------

13
lib/WebGUI/Operation/LDAPLink.pm
View file

@ -32,7 +32,7 @@ in group Admin (3) are allowed to execute subroutines in this package.
#-------------------------------------------------------------------
=head2 _submenu ( $session, $workarea, $title, $help )
=head2 _submenu ( $session, $workarea, $title )
Utility routine for creating the AdminConsole for LDAPLink functions.
@ -49,11 +49,6 @@ The content to display to the user.
The title of the Admin Console. This should be an entry in the i18n
table in the WebGUI namespace.
=head3 $help
An entry in the Help system in the WebGUI namespace. This will be shown
as a link to the user.
=cut
sub _submenu {
@ -62,11 +57,7 @@ sub _submenu {
my $title = shift;
my $i18n = WebGUI::International->new($session,"AuthLDAP");
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new($session,"ldapconnections");
if ($help) {
$ac->setHelp($help,"AuthLDAP");
}
my $returnUrl = "";
if($session->form->process("returnUrl")) {
$returnUrl = ";returnUrl=".$session->url->escape($session->form->process("returnUrl"));
@ -293,7 +284,7 @@ sub www_editLDAPLink {
$f->submit;
$output .= $f->print;
return _submenu($session,$output,"LDAPLink_990","ldap connection add/edit");
return _submenu($session,$output,"LDAPLink_990");
}
#-------------------------------------------------------------------

24
lib/WebGUI/Operation/ProductManager.pm
View file

@ -28,10 +28,6 @@ A scalar of HTML that defines the current workarea.
The i18n key of the title of this workarea.
=head3 help
The i18n key of the help link for this workarea.
=cut
sub _submenu {
@ -41,11 +37,7 @@ sub _submenu {
my $workarea = shift;
my $title = shift;
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new($session,"productManager");
if ($help) {
$ac->setHelp($help, 'ProductManager');
}
my $productId = $session->form->process("productId") || $session->scratch->get('managingProduct');
undef $productId if ($productId eq 'new');
@ -249,7 +241,7 @@ sub www_editProduct {
return _submenu($session,$f->print, 'edit product', 'edit product', 'ProductManager');
return _submenu($session,$f->print, 'edit product');
}
#-------------------------------------------------------------------
@ -355,7 +347,7 @@ sub www_editProductParameter {
);
$f->submit;
return _submenu($session,$f->print, 'edit parameter', 'edit parameter', 'ProductManager');
return _submenu($session,$f->print, 'edit parameter');
}
#-------------------------------------------------------------------
@ -481,7 +473,7 @@ sub www_editProductParameterOption {
);
$f->submit;
return _submenu($session,$f->print, 'edit option', 'edit option', 'ProductManager');
return _submenu($session,$f->print, 'edit option');
}
#-------------------------------------------------------------------
@ -585,7 +577,7 @@ sub www_editProductVariant {
);
$f->submit;
return _submenu($session,$f->print, 'edit variant', 'edit variant', 'ProductManager');
return _submenu($session,$f->print, 'edit variant');
}
#-------------------------------------------------------------------
@ -660,7 +652,7 @@ sub www_editSkuTemplate {
$f->submit;
$output .= $f->print;
return _submenu($session,$output, 'edit sku composition label', 'edit sku template', 'ProductManager');
return _submenu($session,$output, 'edit sku composition label');
}
#-------------------------------------------------------------------
@ -724,7 +716,7 @@ sub www_listProducts {
}
$output .= '</table>';
return _submenu($session,$output, 'list products', 'list products', 'ProductManager');
return _submenu($session,$output, 'list products');
}
#-------------------------------------------------------------------
@ -798,7 +790,7 @@ sub www_listProductVariants {
$output .= WebGUI::Form::submit($session,);
$output .= WebGUI::Form::formFooter($session,);
return _submenu($session,$output, 'list variants label', 'list variants', 'ProductManager');
return _submenu($session,$output, 'list variants label');
}
#-------------------------------------------------------------------
@ -891,7 +883,7 @@ sub www_manageProduct {
$output .= '<br />';
}
return _submenu($session,$output, 'manage product', 'manage product', 'ProductManager');
return _submenu($session,$output, 'manage product');
}
1;

17
lib/WebGUI/Operation/ProfileSettings.pm
View file

@ -32,7 +32,7 @@ profile and managing them.
Only users in group Admin (3) are allowed to call subroutines in this package.
=head2 _submenu ( $session, $workarea, $title, $help )
=head2 _submenu ( $session, $workarea, $title )
Utility routine for creating the AdminConsole for ProfileSetting functions.
@ -49,11 +49,6 @@ The content to display to the user.
The title of the Admin Console. This should be an entry in the i18n
table in the WebGUI namespace.
=head3 $help
An entry in the Help system in the WebGUI namespace. This will be shown
as a link to the user.
=cut
#-------------------------------------------------------------------
@ -61,14 +56,10 @@ sub _submenu {
my $session = shift;
my $workarea = shift;
my $title = shift;
my $help = shift;
my $namespace = shift;
my $i18n = WebGUI::International->new($session,"WebGUIProfile");
$title = $i18n->get($title,$namespace) if ($title);
my $ac = WebGUI::AdminConsole->new($session,"userProfiling");
if ($help) {
$ac->setHelp($help,"WebGUIProfile");
}
$ac->addSubmenuItem($session->url->page("op=editProfileCategory;cid=new"), $i18n->get(490));
$ac->addSubmenuItem($session->url->page("op=editProfileField;fid=new"), $i18n->get(491));
if ((($session->form->process("op") eq "editProfileField" && $session->form->process("fid") ne "new") || $session->form->process("op") eq "deleteProfileFieldConfirm") && $session->form->process("cid") eq "") {
@ -174,7 +165,7 @@ sub www_editProfileCategory {
-hoverHelp=>$i18n->get('897 description'),
);
$f->submit;
return _submenu($session,$f->print,'468','user profile category add/edit','WebGUIProfile');
return _submenu($session,$f->print,'468','WebGUIProfile');
}
=head2 www_editProfileCategorySave ( $session )
@ -333,7 +324,7 @@ sub www_editProfileField {
-value=>$data->{profileCategoryId}
);
$f->submit;
return _submenu($session,$f->print,'471','profile settings edit',"WebGUIProfile");
return _submenu($session,$f->print,'471',"WebGUIProfile");
}
=head2 www_editProfileFieldSave ( $session )
@ -409,7 +400,7 @@ sub www_editProfileSettings {
$output .= ' '.$field->getLabel.'<br />';
}
}
return _submenu($session,$output,undef,"profile settings edit",'WebGUIProfile');
return _submenu($session,$output,undef,'WebGUIProfile');
}
=head2 www_moveProfileCategoryDown ( $session )

13
lib/WebGUI/Operation/Replacements.pm
View file

@ -25,7 +25,7 @@ Package WebGUI::Operation::Replacements
Operation handler for conditional editing of submitted WebGUI content, similar to
a search and replace function in word processors.
=head2 _submenu ( $session, $workarea, $title, $help )
=head2 _submenu ( $session, $workarea, $title )
Utility routine for creating the AdminConsole for Replacement functions.
@ -42,11 +42,6 @@ The content to display to the user.
The title of the Admin Console. This should be an entry in the i18n
table in the WebGUI namespace.
=head3 $help
An entry in the Help system in the WebGUI namespace. This will be shown
as a link to the user.
=cut
#-------------------------------------------------------------------
@ -56,11 +51,7 @@ sub _submenu {
my $title = shift;
my $i18n = WebGUI::International->new($session);
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new($session,"contentFilters");
if ($help) {
$ac->setHelp($help);
}
$ac->addSubmenuItem($session->url->page("op=editReplacement;replacementId=new"), $i18n->get(1047));
$ac->addSubmenuItem($session->url->page("op=listReplacements"), $i18n->get("content filters"));
return $ac->render($workarea, $title);
@ -125,7 +116,7 @@ sub www_editReplacement {
-value=>$data->{replaceWith}
);
$f->submit;
return _submenu($session,$f->print,"1052",'replacements edit');
return _submenu($session,$f->print,"1052");
}
=head2 www_editReplacementSave ( $session )

1
lib/WebGUI/Operation/Settings.pm
View file

@ -512,7 +512,6 @@ sub www_editSettings {
$output .= $tabform->print;
my $ac = WebGUI::AdminConsole->new($session,"settings");
$ac->setHelp("settings");
return $ac->render($output);
}

20
lib/WebGUI/Operation/Subscription.pm
View file

@ -65,10 +65,6 @@ A scalar of HTML that defines the current workarea.
The i18n key of the title of this workarea.
=head3 help
The i18n key of the help link for this workarea.
=cut
#-------------------------------------------------------------------
@ -79,11 +75,7 @@ sub _submenu {
my $workarea = shift;
my $title = shift;
$title = $i18n->get($title) if ($title);
my $help = shift;
my $ac = WebGUI::AdminConsole->new($session,"subscriptions");
if ($help) {
$ac->setHelp($help, 'Subscription');
}
$ac->addSubmenuItem($session->url->page('op=editSubscription;sid=new'), $i18n->get('add subscription'));
$ac->addSubmenuItem($session->url->page('op=createSubscriptionCodeBatch'), $i18n->get('generate batch'));
$ac->addSubmenuItem($session->url->page('op=listSubscriptionCodes'), $i18n->get('manage codes'));
@ -163,7 +155,7 @@ sub www_createSubscriptionCodeBatch {
);
$f->submit;
return _submenu($session,$errorMessage.$f->print, 'create batch menu', 'create batch');
return _submenu($session,$errorMessage.$f->print, 'create batch menu');
}
=head2 www_createSubscriptionCodeBatchSave ( $session )
@ -378,7 +370,7 @@ sub www_editSubscription {
);
}
$f->submit;
return _submenu($session,$f->print, 'edit subscription title', 'subscription add/edit');
return _submenu($session,$f->print, 'edit subscription title');
}
=head2 www_editSubscriptionSave ( $session )
@ -446,7 +438,7 @@ sub www_listSubscriptionCodeBatches {
$output = $i18n->get('no subscription code batches') unless (@{$batches});
return _submenu($session,$output, 'manage batches', 'manage batch');
return _submenu($session,$output, 'manage batches');
}
=head2 www_listSubscriptionCodes ( $session )
@ -510,7 +502,7 @@ sub www_listSubscriptionCodes {
$ops = ';bid='.$session->form->process("bid").';selection=b';
$delete = '<a href="'.$session->url->page('op=deleteSubscriptionCodeBatch'.$ops).'">'.$i18n->get('delete codes').'</a>';
} else {
return _submenu($session,$output, 'listSubscriptionCodes title', 'subscription codes manage');
return _submenu($session,$output, 'listSubscriptionCodes title');
}
$p = WebGUI::Paginator->new($session,$session->url->page('op=listSubscriptionCodes'.$ops));
@ -539,7 +531,7 @@ sub www_listSubscriptionCodes {
$output .= '</table>';
$output .= $p->getBarTraditional($session->form->process("pn"));
return _submenu($session,$output, 'listSubscriptionCodes title', 'subscription codes manage');
return _submenu($session,$output, 'listSubscriptionCodes title');
}
=head2 www_listSubscriptions ( $session )
@ -579,7 +571,7 @@ sub www_listSubscriptions {
$output = $i18n->get('no subscriptions') unless (@{$subscriptions});
return _submenu($session,$output, 'manage subscriptions', 'subscription manage');
return _submenu($session,$output, 'manage subscriptions');
}
=head2 www_purchaseSubscription ( $session )

5
lib/WebGUI/Operation/VersionTag.pm
View file

@ -136,7 +136,6 @@ sub www_editVersionTag {
);
}
$f->submit;
$ac->setHelp('edit version tag', 'VersionTag');
return $ac->render($f->print,$i18n->get("edit version tag"));
}
@ -216,7 +215,6 @@ sub www_commitVersionTag {
);
$f->submit;
my $ac = WebGUI::AdminConsole->new($session,"versions");
$ac->setHelp('commit version tag', 'VersionTag');
return $ac->render($f->print);
}
}
@ -300,7 +298,6 @@ sub www_manageCommittedVersions {
}
$output .= '</table>';
$output .= $paginator->getBarTraditional();
$ac->setHelp('manage committed versions', 'VersionTag');
return $ac->render($output,$i18n->get("committed versions"));
}
@ -334,7 +331,6 @@ sub www_managePendingVersions {
}
$sth->finish;
$output .= '</table>';
$ac->setHelp('manage pending versions', 'VersionTag');
return $ac->render($output,$i18n->get("pending versions"));
}
@ -356,7 +352,6 @@ sub www_manageVersions {
return $session->privilege->insufficient() unless ($session->user->isInGroup(12));
my $ac = WebGUI::AdminConsole->new($session,"versions");
my $i18n = WebGUI::International->new($session,"VersionTag");
$ac->setHelp("versions manage", "VersionTag");
$ac->addSubmenuItem($session->url->page('op=editVersionTag'), $i18n->get("add a version tag"));
$ac->addSubmenuItem($session->url->page('op=managePendingVersions'), $i18n->get("manage pending versions")) if ($session->user->isInGroup(3));
$ac->addSubmenuItem($session->url->page('op=manageCommittedVersions'), $i18n->get("manage committed versions")) if ($session->user->isInGroup(3));

5
lib/WebGUI/Operation/Workflow.pm
View file

@ -104,7 +104,6 @@ sub www_addWorkflow {
$f->submit;
my $ac = WebGUI::AdminConsole->new($session,"workflow");
$ac->addSubmenuItem($session->url->page("op=manageWorkflows"), $i18n->get("manage workflows"));
$ac->setHelp('add a new workflow', 'Workflow');
return $ac->render($f->print, 'add a new workflow');
}
@ -265,7 +264,6 @@ sub www_editWorkflow {
my $ac = WebGUI::AdminConsole->new($session,"workflow");
$ac->addSubmenuItem($session->url->page("op=addWorkflow"), $i18n->get("add a new workflow"));
$ac->addSubmenuItem($session->url->page("op=manageWorkflows"), $i18n->get("manage workflows"));
$ac->setHelp('edit workflow','Workflow');
return $ac->render($f->print.$addmenu.$steps, 'edit workflow');
}
@ -285,7 +283,6 @@ sub www_editWorkflowPriority {
my $i18n = WebGUI::International->new($session, 'Workflow');
my $ac = WebGUI::AdminConsole->new($session,"workflow");
$ac->addSubmenuItem($session->url->page("op=showRunningWorkflows"), $i18n->get('show running workflows'));
$ac->setHelp('manage workflows', 'Workflow');
# make sure the input is good
my $instanceId = $session->form->get('instanceId') || '';
@ -425,7 +422,6 @@ sub www_manageWorkflows {
my $ac = WebGUI::AdminConsole->new($session,"workflow");
$ac->addSubmenuItem($session->url->page("op=addWorkflow"), $i18n->get("add a new workflow"));
$ac->addSubmenuItem($session->url->page("op=showRunningWorkflows"), $i18n->get("show running workflows"));
$ac->setHelp('manage workflows', 'Workflow');
return $ac->render($output, 'manage workflows');
}
@ -612,7 +608,6 @@ ENDCODE
$ac->addSubmenuItem($session->url->page("op=addWorkflow"), $i18n->get("add a new workflow"));
$ac->addSubmenuItem($session->url->page("op=manageWorkflows"), $i18n->get("manage workflows"));
$ac->setHelp('show running workflows', 'Workflow');
return $ac->render($output, 'show running workflows');
}