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

[ 1475220 ] some 6.99 templates have double slashes

Browse source
This commit is contained in:
JT Smith 2006-04-28 16:59:32 +00:00
parent a1570eeb71
commit 2f24cd3f3c
51 changed files with 127 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,7 +103,7 @@ sub process {
push(@tags, {
url=>$session->url->page("op=commitVersionTag;tagId=".$workingId),
title=>$i18n->get("commit my changes"),
icon=>$session->config->get("extrasURL").'/adminConsole/small/versionTags.gif'
icon=>$session->url->extras('adminConsole/small/versionTags.gif')
});
}
my $rs = $session->db->read("select tagId, name, groupToUse from assetVersionTag where isCommitted=0 and isLocked=0 order by name");
@ -112,7 +112,7 @@ sub process {
push(@tags, {
url=>$session->url->page("op=setWorkingVersionTag;backToSite=1;tagId=".$id),
title=>($id eq $workingId) ? '<span style="color: #000080;">* '.$name.'</span>' : $name,
icon=>$session->config->get("extrasURL").'/spacer.gif'
icon=>$session->url->extras('spacer.gif')
});
}
if (scalar(@tags)) {
@ -131,7 +131,7 @@ sub process {
url=>$asset->{url}
});
}
push(@assets, {icon=>$session->config->get("extrasURL").'/spacer.gif',label=>'<hr />'});
push(@assets, {icon=>$session->url->extras('spacer.gif'),label=>'<hr />'});
foreach my $asset (@{$session->asset->getAssetAdderLinks}) {
push(@assets, {
title=>$asset->{label},

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

@ -23,14 +23,15 @@ file.
=head2 process
Returns the extrasURL. A trailing slash '/' is appended to the URL.
Returns the extrasURL. A trailing slash '/' is appended to the URL. Will also accept a path parameter.
=cut
#-------------------------------------------------------------------
sub process {
my $session = shift;
return $session->config->get("extrasURL")."/";
my $path = shift;
return $session->url->extras($path);
}
1;

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

@ -43,7 +43,7 @@ sub process {
@param = @_;
$width = $param[0] if defined $param[0];
$height = $param[1] if defined $param[1];
$output = '<img src="'.$session->config->get("extrasURL").'/spacer.gif"'.(defined $width?' width="'.$width.'"':'').(defined $height?' height="'.$height.'"':'').' style="border-style:none;" alt="[]" />';
$output = '<img src="'.$session->url->extras('spacer.gif').'"'.(defined $width?' width="'.$width.'"':'').(defined $height?' height="'.$height.'"':'').' style="border-style:none;" alt="[]" />';
return $output;
}