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

Rename template variables in the Account and Admin Toggle templates to not use underscores.

Browse source
This commit is contained in:
Colin Kuskie 2010-09-20 15:20:28 -07:00
parent 3f934ed4b7
commit 0b4e8d5460
9 changed files with 93 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/WebGUI/Help/Macro_AdminToggle.pm
View file

@ -6,7 +6,16 @@ our $HELP = {
'admin toggle' => {
title => 'admin toggle title',
body => '',
variables => [ { 'name' => 'toggle.url' }, { 'name' => 'toggle.text' } ],
variables => [
{
name => 'toggle_url',
description => 'toggle.url',
},
{
name => 'toggle_text',
description => 'toggle.text',
},
],
fields => [],
related => []
},

11
lib/WebGUI/Help/Macro_a_account.pm
View file

@ -7,7 +7,16 @@ our $HELP = {
title => 'account title',
body => '',
fields => [],
variables => [ { 'name' => 'account.url' }, { 'name' => 'account.text' } ],
variables => [
{
name => 'account_url',
description => 'account.url',
},
{
name => 'account_text',
description => 'account.text',
}
],
related => []
},

8
lib/WebGUI/Macro/AdminToggle.pm
View file

@ -52,12 +52,12 @@ sub process {
my $i18n = WebGUI::International->new($session,'Macro_AdminToggle');
my %var;
if ($session->var->isAdminOn) {
$var{'toggle.url'} = $session->url->page('op=switchOffAdmin');
$var{'toggle.text'} = $turnOff || $i18n->get(517);
$var{'toggle_url'} = $session->url->page('op=switchOffAdmin');
$var{'toggle_text'} = $turnOff || $i18n->get(517);
}
else {
$var{'toggle.url'} = $session->url->page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn || $i18n->get(516);
$var{'toggle_url'} = $session->url->page('op=switchOnAdmin');
$var{'toggle_text'} = $turnOn || $i18n->get(516);
}
my $template = $templateName ? WebGUI::Asset::Template->newByUrl($session, $templateName)
: WebGUI::Asset::Template->new($session, "PBtmpl0000000000000036");

4
lib/WebGUI/Macro/a_account.pm
View file

@ -44,8 +44,8 @@ sub process {
my @param = @_;
return $session->url->page("op=auth;method=init") if ($param[0] eq "linkonly");
my $i18n = WebGUI::International->new($session,'Macro_a_account');
$var{'account.url'} = $session->url->page('op=auth;method=init');
$var{'account.text'} = $param[0] || $i18n->get(46);
$var{'account_url'} = $session->url->page('op=auth;method=init');
$var{'account_text'} = $param[0] || $i18n->get(46);
if ($param[1]) {
return WebGUI::Asset::Template->newByUrl($session,$param[1])->process(\%var);
} else {