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

use assetIds instead of urls for default templates

Browse source
This commit is contained in:
Colin Kuskie 2005-05-02 22:27:26 +00:00
parent e115a195b6
commit d0984032a3
8 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -32,7 +32,11 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn;
}
return WebGUI::Asset::Template->newByUrl($templateName || "default_admin_toggle_macro")->process(\%var);
if ($templateName) {
return WebGUI::Asset::Template->newByUrl($templateName)->process(\%var);
} else {
return WebGUI::Asset::Template->new("PBtmpl0000000000000036")->process(\%var);
}
}
return "";
}

5
lib/WebGUI/Macro/EditableToggle.pm
View file

@ -32,7 +32,10 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=switchOnAdmin');
$var{'toggle.text'} = $turnOn;
}
return WebGUI::Asset::Template->newByUrl($param[2] || "default_editable_toggle_macro")->process(\%var);
if ($param[2]) {
return WebGUI::Asset::Template->newByUrl($param[2])->process(\%var);
} else {
return WebGUI::Asset::Template->new("PBtmpl0000000000000038")->process(\%var);
}
return "";
}

6
lib/WebGUI/Macro/GroupAdd.pm
View file

@ -31,7 +31,11 @@ sub process {
my %var = ();
$var{'group.url'} = WebGUI::URL::page("op=autoAddToGroup&groupId=".$g->groupId);
$var{'group.text'} = $param[1];
return WebGUI::Asset::Template->newByUrl($param[2]||"default_group_add_macro")->process(\%var);
if ($param[2]) {
return WebGUI::Asset::Template->newByUrl($param[2])->process(\%var);
} else {
return WebGUI::Asset::Template->new("PBtmpl0000000000000040")->process(\%var);
}
}

6
lib/WebGUI/Macro/GroupDelete.pm
View file

@ -31,7 +31,11 @@ sub process {
my %var = ();
$var{'group.url'} = WebGUI::URL::page("op=autoDeleteFromGroup&groupId=".$g->groupId);
$var{'group.text'} = $param[1];
return WebGUI::Asset::Template->newByUrl($param[2] || "default_group_delete_macro")->process(\%var);
if ($param[2]) {
return WebGUI::Asset::Template->newByUrl($param[2])->process(\%var);
} else {
return WebGUI::Asset::Template->new("PBtmpl0000000000000041")->process(\%var);
}
}

6
lib/WebGUI/Macro/H_homeLink.pm
View file

@ -35,7 +35,11 @@ sub process {
} else {
$var{'homeLink.text'} = WebGUI::International::get(47,'Macro_H_homelink');
}
$temp = WebGUI::Asset::Template->newByUrl($param[1] || "default_homelink")->process(\%var);
if ($param[1]) {
$temp = WebGUI::Asset::Template->newByUrl($param[1])->process(\%var);
} else {
$temp = WebGUI::Asset::Template->new("PBtmpl0000000000000042")->process(\%var);
}
}
return $temp;
}

2
lib/WebGUI/Macro/L_loginBox.pm
View file

@ -26,7 +26,7 @@ sub _createURL {
#-------------------------------------------------------------------
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $templateId = $param[2] || "PBtmpl0000000000000092";
my $templateId = $param[2] || "PBtmpl0000000000000044";
my %var;
$var{'user.isVisitor'} = ($session{user}{userId} eq "1");
$var{'customText'} = $param[1];

6
lib/WebGUI/Macro/LoginToggle.pm
View file

@ -32,7 +32,11 @@ sub process {
$var{'toggle.url'} = WebGUI::URL::page('op=auth&method=logout');
$var{'toggle.text'} = $logout;
}
return WebGUI::Asset::Template->new($param[2] || "default_logintoggle")->process(\%var);
if ($param[2]) {
return WebGUI::Asset::Template->newByUrl($param[2])->process(\%var);
} else {
return WebGUI::Asset::Template->new("PBtmpl0000000000000043")->process(\%var);
}
}

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

@ -24,7 +24,11 @@ sub process {
return WebGUI::URL::page("op=auth&method=init") if ($param[0] eq "linkonly");
$var{'account.url'} = WebGUI::URL::page('op=auth&method=init');
$var{'account.text'} = $param[0] || WebGUI::International::get(46.'Macro_a_account');
return WebGUI::Asset::Template->newByUrl($param[1]||"default_account_macro")->process(\%var);
if ($param[1]) {
return WebGUI::Asset::Template->newByUrl($param[1])->process(\%var);
} else {
return WebGUI::Asset::Template->new("PBtmpl0000000000000037")->process(\%var);
}
}