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

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

Browse source 
This reverts commit 0b4e8d5460.
This commit is contained in:
Colin Kuskie 2010-09-21 11:17:01 -07:00
parent 9ddc54be42
commit 1b9edbf545
8 changed files with 9 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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 {