diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 00cdb9540..ef016ea6c 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -723,8 +723,8 @@ sub getIcon { my $small = shift; my $definition = $self->definition($self->session); my $icon = $definition->[0]{icon} || "assets.gif"; - return $self->session->config->get("extrasURL").'/assets/small/'.$icon if ($small); - return $self->session->config->get("extrasURL").'/assets/'.$icon; + return $self->session->url->extras('assets/small/'.$icon) if ($small); + return $self->session->url->extras('assets/'.$icon); } #------------------------------------------------------------------- @@ -909,8 +909,8 @@ sub getToolbar { $toolbar .= $self->session->icon->cut('func=cut',$self->get("url")) .$self->session->icon->copy('func=copy',$self->get("url")); $toolbar .= $self->session->icon->shortcut('func=createShortcut',$self->get("url")) unless ($self->get("className") =~ /Shortcut/); - $self->session->style->setLink($self->session->config->get("extrasURL").'/contextMenu/contextMenu.css', {rel=>"stylesheet",type=>"text/css"}); - $self->session->style->setScript($self->session->config->get("extrasURL").'/contextMenu/contextMenu.js', {type=>"text/javascript"}); + $self->session->style->setLink($self->session->url->extras('contextMenu/contextMenu.css'), {rel=>"stylesheet",type=>"text/css"}); + $self->session->style->setScript($self->session->url->extras('contextMenu/contextMenu.js'), {type=>"text/javascript"}); my $lock = ""; if (!$self->isLocked) { $lock = 'contextMenu.addLink("'.$self->getUrl("func=lock").'","'.$i18n->get("lock").'");'; @@ -1107,11 +1107,11 @@ sub manageAssets { my $locked; my $edit; if ($child->isLocked) { - $locked = 'locked'; + $locked = 'locked'; $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+" if ($child->canEditIfLocked); } else { $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+"; - $locked = 'unlocked'; + $locked = 'unlocked'; } my $lockLink = ", 'getUrl("func=manageRevisions")."\">".$locked."'"; my $plus = "'    '+"; @@ -1280,11 +1280,11 @@ sub manageAssetsSearch { my $locked; my $edit; if ($child->isLocked) { - $locked = 'locked'; + $locked = 'locked'; $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+" if ($child->canEditIfLocked); } else { $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+"; - $locked = 'unlocked'; + $locked = 'unlocked'; } my $lockLink = ", 'getUrl("func=manageRevisions")."\">".$locked."'"; $output .= "assetManager.AddLine('" @@ -1950,10 +1950,10 @@ Main page to manage/search assets. Renders an AdminConsole with a list of assets sub www_manageAssets { my $self = shift; return $self->session->privilege->insufficient() unless $self->canEdit; - $self->session->style->setLink($self->session->config->get("extrasURL").'/contextMenu/contextMenu.css', {rel=>"stylesheet",type=>"text/css"}); - $self->session->style->setScript($self->session->config->get("extrasURL").'/contextMenu/contextMenu.js', {type=>"text/javascript"}); - $self->session->style->setLink($self->session->config->get("extrasURL").'/assetManager/assetManager.css', {rel=>"stylesheet",type=>"text/css"}); - $self->session->style->setScript($self->session->config->get("extrasURL").'/assetManager/assetManager.js', {type=>"text/javascript"}); + $self->session->style->setLink($self->session->url->extras('contextMenu/contextMenu.css'), {rel=>"stylesheet",type=>"text/css"}); + $self->session->style->setScript($self->session->url->extras('contextMenu/contextMenu.js'), {type=>"text/javascript"}); + $self->session->style->setLink($self->session->url->extras('assetManager/assetManager.css'), {rel=>"stylesheet",type=>"text/css"}); + $self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'), {type=>"text/javascript"}); if ($self->session->form->get("search")) { $self->session->scratch->set("manageAssetsSearchToggle",1); } elsif ($self->session->form->get("manage")) { diff --git a/lib/WebGUI/Asset/Wobject/SQLForm.pm b/lib/WebGUI/Asset/Wobject/SQLForm.pm index b93326b41..8afe58087 100644 --- a/lib/WebGUI/Asset/Wobject/SQLForm.pm +++ b/lib/WebGUI/Asset/Wobject/SQLForm.pm @@ -3550,7 +3550,7 @@ my $cmd = "WebGUI::Form::$searchElement".'($self->session, $parameters)'; $var->{searchFormSubmit} = WebGUI::Form::submit($self->session, {value => $i18n->get('s search button')}); $var->{searchFormFooter} = WebGUI::Form::formFooter($self->session); - $var->{searchFormJavascript} = ''; + $var->{searchFormJavascript} = ''; $var->{searchFormJavascript} .= ''; $form .= ''.$var->{searchFormSubmit}.''; @@ -3764,7 +3764,7 @@ my @recordLoop; if ($row{__deleted}) { $recordControls = WebGUI::Form::checkbox($self->session, {name=>'rid', value=>$row{__recordId}}); $recordControls .= ''. - ''; } else { $recordControls = $self->session->icon->delete('func=deleteRecord'.';rid='.$row{__recordId},$self->get("url"), @@ -3776,7 +3776,7 @@ my @recordLoop; } $record{'record.controls'} .= ''. - ''; if ($searchInTrash) { diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm index 8500b4fdc..8c387f63b 100644 --- a/lib/WebGUI/AssetClipboard.pm +++ b/lib/WebGUI/AssetClipboard.pm @@ -320,8 +320,8 @@ sub www_manageClipboard { 'onclick="return window.confirm(\''.$i18n->get(951,"WebGUI").'\')"',"Asset"); $limit = 1; } -$self->session->style->setLink($self->session->config->get("extrasURL").'/assetManager/assetManager.css', {rel=>"stylesheet",type=>"text/css"}); - $self->session->style->setScript($self->session->config->get("extrasURL").'/assetManager/assetManager.js', {type=>"text/javascript"}); +$self->session->style->setLink($self->session->url->extras('assetManager/assetManager.css'), {rel=>"stylesheet",type=>"text/css"}); + $self->session->style->setScript($self->session->url->extras('assetManager/assetManager.js'), {type=>"text/javascript"}); my $output = "