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

Reapplying patches for removing dots in Account and AdminToggle macro templates.

Browse source
This commit is contained in:
Colin Kuskie 2010-09-23 17:02:34 -07:00
parent 18b8bebf6a
commit 17d9deb085
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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 {

2
t/Macro/AdminToggle.t
View file

@ -102,7 +102,7 @@ sub addTemplate {
className => 'WebGUI::Asset::Template',
url => 'admintoggle-test',
namespace => 'Macro/AdminToggle',
template => "HREF=<tmpl_var toggle.url>\nLABEL=<tmpl_var toggle.text>",
template => "HREF=<tmpl_var toggle_url>\nLABEL=<tmpl_var toggle_text>",
id => 'AdminToggleTemplate--Z',
usePacked => 0,
};

2
t/Macro/a_account.t
View file

@ -90,7 +90,7 @@ sub addTemplate {
className => 'WebGUI::Asset::Template',
url => 'a_account-test',
namespace => 'Macro/a_account',
template => "HREF=<tmpl_var account.url>\nLABEL=<tmpl_var account.text>",
template => "HREF=<tmpl_var account_url>\nLABEL=<tmpl_var account_text>",
id => 'testTemplatea_account1',
usePacked => 1,
};