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 17:26:21 +00:00
parent d77c6ed89f
commit 199b150f90
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/AdminConsole.pm
View file

@ -69,8 +69,8 @@ sub _formatFunction {
my $i18n = WebGUI::International->new($self->session); my $i18n = WebGUI::International->new($self->session);
return { return {
title=>$i18n->get($function->{title}{id}, $function->{title}{namespace}), title=>$i18n->get($function->{title}{id}, $function->{title}{namespace}),
icon=>$self->session->config->get("extrasURL")."/adminConsole/".$function->{icon}, icon=>$self->session->url->extras("/adminConsole/".$function->{icon}),
'icon.small'=>$self->session->config->get("extrasURL")."/adminConsole/small/".$function->{icon}, 'icon.small'=>$self->session->url->extras("adminConsole/small/".$function->{icon}),
url=>$url, url=>$url,
canUse=>$self->session->user->isInGroup($function->{group}), canUse=>$self->session->user->isInGroup($function->{group}),
isCurrentOpFunc=>($self->session->form->process("op") eq $function->{op} || $self->session->form->process("func") eq $function->{func}) isCurrentOpFunc=>($self->session->form->process("op") eq $function->{op} || $self->session->form->process("func") eq $function->{func})
@ -123,7 +123,7 @@ sub getAdminConsoleParams {
return { 'title' => $i18n->get("admin console","AdminConsole"), return { 'title' => $i18n->get("admin console","AdminConsole"),
url => $self->session->url->page("op=adminConsole"), url => $self->session->url->page("op=adminConsole"),
canUse => $self->session->user->isInGroup("12"), canUse => $self->session->user->isInGroup("12"),
icon => $self->session->config->get("extrasURL")."/adminConsole/adminConsole.gif" icon => $self->session->url->extras("adminConsole/adminConsole.gif")
}; };
} }

2
lib/WebGUI/Asset/Template/Parser.pm
View file

@ -37,7 +37,7 @@ sub addSessionVars {
# of 6.8.5. Further use of session template vars is deprecated. # of 6.8.5. Further use of session template vars is deprecated.
$vars->{"session.user.username"} = $self->session->user->username; $vars->{"session.user.username"} = $self->session->user->username;
$vars->{"session.user.firstDayOfWeek"} = $self->session->user->profileField("firstDayOfWeek"); $vars->{"session.user.firstDayOfWeek"} = $self->session->user->profileField("firstDayOfWeek");
$vars->{"session.config.extrasurl"} = $self->session->config->get("extrasURL"); $vars->{"session.config.extrasurl"} = $self->session->url->extras();
$vars->{"session.var.adminOn"} = $self->session->var->isAdminOn; $vars->{"session.var.adminOn"} = $self->session->var->isAdminOn;
$vars->{"session.setting.companyName"} = $self->session->setting->get("companyName"); $vars->{"session.setting.companyName"} = $self->session->setting->get("companyName");
$vars->{"session.setting.anonymousRegistration"} = $self->session->setting->get("anonymousRegistration"); $vars->{"session.setting.anonymousRegistration"} = $self->session->setting->get("anonymousRegistration");

2
lib/WebGUI/Session/Icon.pm
View file

@ -62,7 +62,7 @@ Returns the base URL for this user's toolbar icon set.
sub getBaseURL { sub getBaseURL {
my $self = shift; my $self = shift;
my $url = $self->session->config->get("extrasURL").'/toolbar/'; my $url = $self->session->url->extras('toolbar/');
if ($self->session->user->profileField("toolbar") ne "useLanguageDefault") { if ($self->session->user->profileField("toolbar") ne "useLanguageDefault") {
$url .= $self->session->user->profileField("toolbar"); $url .= $self->session->user->profileField("toolbar");
} else { } else {

4
lib/WebGUI/i18n/English/Macro_Extras.pm
View file

@ -15,11 +15,11 @@ our $I18N = {
'extras body' => { 'extras body' => {
message => q| message => q|
<b>&#94;Extras;</b><br> <b>&#94;Extras; or &#94;Extras(path/to/something/in/extras/folder);</b><br>
Returns the path to the WebGUI "extras" folder, which contains things like WebGUI icons. Returns the path to the WebGUI "extras" folder, which contains things like WebGUI icons.
<p> <p>
|, |,
lastUpdated => 1112466755, lastUpdated => 1146245155,
}, },
}; };