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

make the dynamic list of macros work again

Browse source
This commit is contained in:
Colin Kuskie 2006-06-21 03:19:58 +00:00
parent 5f93f2dc13
commit dbab69eb2f
4 changed files with 35 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/WebGUI/Help/Macros.pm
View file

@ -18,9 +18,35 @@ our $HELP = {
'macros list' => { 'macros list' => {
title => 'macros list title', title => 'macros list title',
body => 'macros list body', body => sub {
fields => [ my $session = shift;
], my $dir = join '/', $session->config->getWebguiRoot,"lib","WebGUI","Macro";
opendir (DIR,$dir) or $session->errorHandler->fatal("Can't open Macro directory: $dir!");
my @macros = map { s/Macro_//; s/\.pm//; $_; }
grep { /\.pm$/ }
readdir(DIR); ##list of namespaces
closedir(DIR);
##Build list of enabled macros, by namespace, by reversing session hash:
my %macros = reverse %{ $session->config->get("macros") };
my $macro_table =
join "\n",
map { join '', '<tr><td>', $_, '</td><td>',
($macros{$_} ? ('&#94;', $macros{$_}, '();') : '&nbsp;'),
'</td></tr>' }
@macros;
my $i18n = WebGUI::International->new($session, 'Macros');
$macro_table =
join("\n",
'<table border="1" cellpadding="3">',
'<tr><th>',$i18n->get('macro name'),
'</th><th>',
$i18n->get('macro shortcut'),
'</th></tr>',$macro_table,'</table>');
},
fields => [],
related => sub { ##Hey, you gotta pass in the session var, right? related => sub { ##Hey, you gotta pass in the session var, right?
my $session = shift; my $session = shift;
sort { $a->{tag} cmp $b->{tag} } sort { $a->{tag} cmp $b->{tag} }

7
lib/WebGUI/Operation/Help.pm
View file

@ -304,7 +304,12 @@ sub www_viewHelp {
} }
my %vars; my %vars;
$vars{uiLevelLabel} = $i18n->get('739', 'WebGUI'); $vars{uiLevelLabel} = $i18n->get('739', 'WebGUI');
$vars{body} = $i18n->get($help->{body}); if (ref $help->{body} eq 'CODE') {
$vars{body} = $help->{body}->($session);
}
else {
$vars{body} = $i18n->get($help->{body});
}
my $userUiLevel = $session->user->profileField("uiLevel"); my $userUiLevel = $session->user->profileField("uiLevel");
my $uiOverride = $session->form->process("uiOverride"); my $uiOverride = $session->form->process("uiOverride");
foreach my $row (@{ $help->{fields} }) { foreach my $row (@{ $help->{fields} }) {

41
lib/WebGUI/i18n/English/Automated_Information.pm
View file

@ -1,41 +0,0 @@
package WebGUI::i18n::English::Automated_Information;
##This module must not be preloaded, since it requires that $session
##be populated when the module is use'ed.
use WebGUI::International;
my $i18n = WebGUI::International->new($session, 'Macros');
##Get list of all macros by namespace/module name
my $dir = join '/', $self->session->config->getWebguiRoot,"lib","WebGUI","Macro";
opendir (DIR,$dir) or $self->session->errorHandler->fatal("Can't open Macro directory: $dir!");
my @macros = map { s/Macro_//; s/\.pm//; $_; }
grep { /\.pm$/ }
readdir(DIR); ##list of namespaces
closedir(DIR);
##Build list of enabled macros, by namespace by reversing session hash:
my %macros = reverse %{ $self->session->config->get("macros") };
my $macro_table =
join "\n",
map { join '', '<tr><td>', $_, '</td><td>',
($macros{$_} ? ('&#94;', $macros{$_}, '();') : '&nbsp;'),
'</td></tr>' }
@macros;
$macro_table =
join("\n",
'<table border="1" cellpadding="3">',
'<tr><th>',$i18n->get('macro name'),
'</th><th>',
$i18n->get('macro shortcut'),
'</th></tr>',$macro_table,'</table>');
our $I18N = {
'macro table' => {
message => $macro_table,
lastUpdated => 1112466408,
}
};
1;

1
lib/WebGUI/i18n/English/Macros.pm
View file

@ -19,7 +19,6 @@ our $I18N = {
'macros list body' => { 'macros list body' => {
message => q|<p>The set of available Macros is defined in the WebGUI configuration file. These Macros are available for use on your site:</p> message => q|<p>The set of available Macros is defined in the WebGUI configuration file. These Macros are available for use on your site:</p>
^International("macro table","Automated_Information");
|, |,
context => 'Content for dynamically generated macro list', context => 'Content for dynamically generated macro list',
lastUpdated => 1114134745, lastUpdated => 1114134745,