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

4
lib/WebGUI/Asset/File.pm
View file

@ -188,11 +188,11 @@ sub getIcon {
my $self = shift;
my $small = shift;
if ($small && $self->get("dummy")) {
return $self->session->config->get("extrasURL").'/assets/small/file.gif';
return $self->session->url->extras('assets/small/file.gif');
} elsif ($small) {
return $self->getFileIconUrl;
}
return $self->session->config->get("extrasURL").'/assets/file.gif';
return $self->session->url->extras('assets/file.gif');
}

9
lib/WebGUI/Asset/File/Image.pm
View file

@ -67,6 +67,7 @@ sub definition {
assetName=>$i18n->get('assetName'),
tableName=>'ImageAsset',
className=>'WebGUI::Asset::File::Image',
icon=>'image.gif',
properties=>{
thumbnailSize=>{
fieldType=>'integer',
@ -145,14 +146,6 @@ sub getEditForm {
}
#-------------------------------------------------------------------
sub getIcon {
my $self = shift;
my $small = shift;
return $self->session->config->get("extrasURL").'/assets/image.gif' unless ($small);
$self->SUPER::getIcon(1);
}
#-------------------------------------------------------------------
sub getStorageLocation {

22
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -109,7 +109,8 @@ sub definition {
push(@{$definition}, {
assetName=>$i18n->get('assetName'),
tableName=>'ZipArchiveAsset',
className=>'WebGUI::Asset::File',
icon=>'ziparchive.gif',
className=>'WebGUI::Asset::File::ZipArchive',
properties=>{
showPage=>{
fieldType=>'text',
@ -167,25 +168,6 @@ sub getEditForm {
}
#-------------------------------------------------------------------
=head2 getIcon ( [small] )
Returns the icons to be associated with this asset
=head3 small
If this evaluates to True, then the smaller icon is returned.
=cut
sub getIcon {
my $self = shift;
my $small = shift;
return $self->session->config->get("extrasURL").'/assets/ziparchive.gif' unless ($small);
return $self->session->config->get("extrasURL").'/assets/small/ziparchive.gif';
}
#-------------------------------------------------------------------
=head2 prepareView ( )

4
lib/WebGUI/Asset/FilePile.pm
View file

@ -179,9 +179,9 @@ sub getIcon {
my $self = shift;
my $small = shift;
if ($small) {
return $self->session->config->get("extrasURL").'/assets/small/filePile.gif';
return $self->session->url->extras('assets/small/filePile.gif');
}
return $self->session->config->get("extrasURL").'/assets/filePile.gif';
return $self->session->url->extras('assets/filePile.gif');
}

4
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -760,8 +760,8 @@ sub view {
$var->{'subscribe.url'} = $self->getSubscribeUrl;
$var->{'unsubscribe.url'} = $self->getUnsubscribeUrl;
$var->{'thumbsUp.icon.url'} = $self->session->config->get("extrasURL").'/thumbup.gif';
$var->{'thumbsDown.icon.url'} = $self->session->config->get("extrasURL").'/thumbdown.gif';
$var->{'thumbsUp.icon.url'} = $self->session->url->extras('thumbup.gif');
$var->{'thumbsDown.icon.url'} = $self->session->url->extras('thumbdown.gif');
$var->{'isArchived'} = $self->get("status") eq "archived";
$var->{'archive.url'} = $self->getArchiveUrl;

6
lib/WebGUI/Asset/RichEdit.pm
View file

@ -504,7 +504,7 @@ sub getRichEditor {
$language = $i18n->getLanguage("English","languageAbbreviation");
}
$config{language} = $language;
$config{content_css} = $self->getValue("cssFile") || $self->session->config->get("extrasURL").'/tinymce2/defaultcontent.css';
$config{content_css} = $self->getValue("cssFile") || $self->session->url->extras('tinymce2/defaultcontent.css');
$config{width} = $self->getValue("editorWidth") if ($self->getValue("editorWidth") > 0);
$config{height} = $self->getValue("editorHeight") if ($self->getValue("editorHeight") > 0);
$config{plugins} = join(",",@plugins);
@ -516,8 +516,8 @@ sub getRichEditor {
push(@directives,$key." : '".$config{$key}."'");
}
}
$self->session->style->setScript($self->session->config->get("extrasURL")."/tinymce2/jscripts/tiny_mce/tiny_mce.js",{type=>"text/javascript"});
$self->session->style->setScript($self->session->config->get("extrasURL")."/tinymce2/jscripts/webgui.js",{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('tinymce2/jscripts/tiny_mce/tiny_mce.js'),{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras("tinymce2/jscripts/webgui.js"),{type=>"text/javascript"});
return '<script type="text/javascript">
tinyMCE.init({
'.join(",\n ",@directives).'

5
lib/WebGUI/Asset/Shortcut.pm
View file

@ -68,10 +68,9 @@ sub _drawQueryBuilder {
);
# html
$self->session->style->setScript($self->session->url->extras('wobject/Shortcut/querybuilder.js'), {type=>"text/javascript"});
$self->session->style->setLink($self->session->url->extras('wobject/Shortcut/querybuilder.css'), {type=>"text/css", rel=>"stylesheet"});
my $output;
$output .= '<script type="text/javascript" src="'.
$self->session->config->get("extrasURL").'/wobject/Shortcut/querybuilder.js"></script>';
$output .= '<link href="'.$self->session->config->get("extrasURL").
'/wobject/Shortcut/querybuilder.css" type="text/css" rel="stylesheet">';
$output .= qq|<table cellspacing="0" cellpadding="0" border="0"><tr><td colspan="5" align="right">$shortcutCriteriaField</td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright"></td></tr><tr><td></td><td></td><td></td><td></td><td class="qbtdright">$conjunctionField</td></tr>|;

4
lib/WebGUI/Asset/Wobject/DataForm.pm
View file

@ -704,8 +704,8 @@ sub viewForm {
my $self = shift;
my $passedVars = shift;
my $var;
$self->session->style->setLink($self->session->config->get("extrasURL").'/tabs/tabs.css', {"type"=>"text/css"});
$self->session->style->setScript($self->session->config->get("extrasURL").'/tabs/tabs.js', {"type"=>"text/javascript"});
$self->session->style->setLink($self->session->url->extras('tabs/tabs.css'), {"type"=>"text/css"});
$self->session->style->setScript($self->session->url->extras('tabs/tabs.js'), {"type"=>"text/javascript"});
$var->{entryId} = $self->session->form->process("entryId") if ($self->canEdit);
$var = $passedVars || $self->getRecordTemplateVars($var);
return $self->processTemplate($var,$self->get("templateId"));

7
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -1125,8 +1125,7 @@ sub resolveConflictForm {
my $self = shift;
my $event1 = shift;
my $event2 = shift;
my $extrasURL = $self->session->config->get("extrasURL");
my $deleteIcon = $extrasURL."/toolbar/bullet/delete.gif";
my $deleteIcon = $self->session->icon->getBaseURL()."delete.gif";
my %var;
my $sth = $self->session->db->read("
select productId, title, price, description
@ -2495,7 +2494,7 @@ sub www_search {
my @joined;
my $language = $i18n->getLanguage(undef,"languageAbbreviation");
$var{'calendarJS'} = '<script type="text/javascript" src="'.$self->session->config->get('extrasURL').'/calendar/calendar.js"></script><script type="text/javascript" src="'.$self->session->config->get('extrasURL').'/calendar/lang/calendar-'.$language.'.js"></script><script type="text/javascript" src="'.$self->session->config->get('extrasURL').'/calendar/calendar-setup.js"></script>';
$var{'calendarJS'} = '<script type="text/javascript" src="'.$self->session->url->extras('calendar/calendar.js').'"></script><script type="text/javascript" src="'.$self->session->url->extras('calendar/lang/calendar-'.$language.'.js').'"></script><script type="text/javascript" src="'.$self->session->url->extras('calendar/calendar-setup.js').'"></script>';
#Get the eventIds of valid prereqs if we're in prereq mode
#Put the productIds of valid prereqs into a list so we can return only valid prereq choices in our search
@ -2821,7 +2820,7 @@ sub www_search {
$p->appendTemplateVars(\%var);
$self->buildMenu(\%var);
$var{'ems.wobject.dir'} = $self->session->config->get("extrasURL")."/wobject/EventManagementSystem";
$var{'ems.wobject.dir'} = $self->session->url->extras("wobject/EventManagementSystem");
return $self->session->style->process($self->processTemplate(\%var,$self->getValue("searchTemplateId")),$self->getValue("styleTemplateId"));
}

8
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -202,12 +202,12 @@ sub prepareView {
if ($vars{showAdmin}) {
# under normal circumstances we don't put HTML stuff in our code, but this will make it much easier
# for end users to work with our templates
$self->session->style->setScript($self->session->config->get("extrasURL")."/draggable.js",{ type=>"text/javascript" });
$self->session->style->setLink($self->session->config->get("extrasURL")."/draggable.css",{ type=>"text/css", rel=>"stylesheet", media=>"all" });
$self->session->style->setScript($self->session->url->extras("draggable.js"),{ type=>"text/javascript" });
$self->session->style->setLink($self->session->url->extras("draggable.css"),{ type=>"text/css", rel=>"stylesheet", media=>"all" });
$self->session->style->setRawHeadTags('
<style type="text/css">
.dragging, .empty {
background-image: url("'.$self->session->config->get("extrasURL").'/opaque.gif");
background-image: url("'.$self->session->url->extras('opaque.gif').'");
}
</style>
');
@ -222,7 +222,7 @@ sub view {
# for end users to work with our templates
$self->{_viewVars}{"dragger.icon"} = $self->session->icon->drag();
$self->{_viewVars}{"dragger.init"} = '
<iframe id="dragSubmitter" style="display: none;" src="'.$self->session->config->get("extrasURL").'/spacer.gif"></iframe>
<iframe id="dragSubmitter" style="display: none;" src="'.$self->session->url->extras('spacer.gif').'"></iframe>
<script type="text/javascript">
dragable_init("'.$self->getUrl("func=setContentPositions;map=").'");
</script>

20
lib/WebGUI/Asset/Wobject/SQLForm.pm
View file

@ -1043,20 +1043,6 @@ sub getIndexerParams {
return $result;
}
#-------------------------------------------------------------------
=head1 getIcon
Returns the icon of the SQLForm asset.
=cut
sub getIcon {
my $self = shift;
my $small = shift;
return $self->session->config->get("extrasURL").'/assets/small/sqlform.gif' if ($small);
return $self->session->config->get("extrasURL").'/assets/sqlform.gif';
}
#-------------------------------------------------------------------
=head1 getName
@ -1730,9 +1716,9 @@ my $message = $i18n->get('change field warning');
);
# This js file contains code to handle the dynamics of this form.
$self->session->style->setScript($self->session->config->get("extrasURL").'/'.'wobject/SQLForm/SQLFormJoinSelector.js', {type => 'text/javascript'});
$self->session->style->setScript($self->session->config->get("extrasURL").'/'.'js/at/AjaxRequest.js', {type => 'text/javascript'});
$self->session->style->setScript($self->session->config->get("extrasURL").'/'.'wobject/SQLForm/SQLFormEditField.js', {type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('wobject/SQLForm/SQLFormJoinSelector.js'), {type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('js/at/AjaxRequest.js'), {type => 'text/javascript'});
$self->session->style->setScript($self->session->url->extras('wobject/SQLForm/SQLFormEditField.js'), {type => 'text/javascript'});
my $jsDatabases = '[' . join(',', map {"{key : '$_', value : '$_'}"} $dbLink->db->buildArray('show databases')) . ']';
my $jsInitJoinSelector;

4
lib/WebGUI/Asset/Wobject/StockData.pm
View file

@ -399,7 +399,7 @@ sub view {
my $self = shift;
my $var = {};
#Set some template variables
$var->{'extrasFolder'} = $self->session->config->get("extrasURL")."/wobject/StockData";
$var->{'extrasFolder'} = $self->session->url->extras("wobject/StockData");
$var->{'editUrl'} = $self->getUrl("func=editStocks");
$var->{'isVisitor'} = $self->session->user->userId eq 1;
$var->{'stock.display.url'} = $self->getUrl("func=displayStock;symbol=");
@ -448,7 +448,7 @@ sub www_displayStock {
my $var = {};
return $self->session->privilege->noAccess() unless $self->canView();
$var->{'extrasFolder'} = $self->session->config->get("extrasURL")."/wobject/StockData";
$var->{'extrasFolder'} = $self->session->url->extras("wobject/StockData");
my $symbol = $self->session->form->process("symbol");
my $data = $self->_getStocks([$symbol]);

2
lib/WebGUI/Asset/Wobject/WeatherData.pm
View file

@ -100,7 +100,7 @@ sub _getLocationData {
cityState => $1 || $location,
sky => $2 || 'N/A',
tempF => $3 || 'N/A',
iconUrl => $self->session->config->get("extrasURL").'/wobject/WeatherData/'.$self->_chooseWeatherConditionsIcon($2).'.jpg'
iconUrl => $self->session->url->extras("wobject/WeatherData/".$self->_chooseWeatherConditionsIcon($2).'.jpg')
};
$cache->set($locData, 60*60) if $locData->{sky} ne 'NULL';
}

2
lib/WebGUI/Asset/Wobject/_NewWobject.skeleton
View file

@ -154,7 +154,7 @@ sub view {
my $var = $self->get;
#This is where you will store your wobject's extras files, any javascript, css, or any other files your wobject may use.
$var->{'extrasFolder'} = $session{config}{extrasURL}."/wobject/NewWobject";
$var->{'extrasFolder'} = $session->url->extras("/wobject/NewWobject");
#This is an example of debugging code to help you diagnose problems.
#WebGUI::ErrorHandler::warn($self->get("templateId"));

2
lib/WebGUI/Form/Codearea.pm
View file

@ -100,7 +100,7 @@ Renders a code area field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/TabFix.js',{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('TabFix.js'),{type=>"text/javascript"});
$self->set("extras", $self->get('extras').' onkeypress="return TabFix_keyPress(event)" onkeydown="return TabFix_keyDown(event)"');
return $self->SUPER::toHtml;
}

2
lib/WebGUI/Form/Color.pm
View file

@ -82,7 +82,7 @@ Renders a color picker control.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/colorPicker.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('colorPicker.js'),{ type=>'text/javascript' });
return '<script type="text/javascript">initColorPicker("'.$self->get("name").'","'.($self->get("value")).'");</script>';
}

8
lib/WebGUI/Form/Date.pm
View file

@ -144,10 +144,10 @@ sub toHtml {
unless ($language) {
$language = WebGUI::International->new($self->session)->getLanguage($self,"English","languageAbbreviation");
}
$self->session->style->setScript($self->session->config->get("extrasURL").'/calendar/calendar.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->config->get("extrasURL").'/calendar/lang/calendar-'.$language.'.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->config->get("extrasURL").'/calendar/calendar-setup.js',{ type=>'text/javascript' });
$self->session->style->setLink($self->session->config->get("extrasURL").'/calendar/calendar-win2k-1.css', { rel=>"stylesheet", type=>"text/css", media=>"all" });
$self->session->style->setScript($self->session->url->extras('calendar/calendar.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('calendar/lang/calendar-'.$language.'.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('calendar/calendar-setup.js'),{ type=>'text/javascript' });
$self->session->style->setLink($self->session->url->extras('calendar/calendar-win2k-1.css'), { rel=>"stylesheet", type=>"text/css", media=>"all" });
my $mondayFirst = $self->session->user->profileField("firstDayOfWeek") ? "true" : "false";
return $self->SUPER::toHtml. '<script type="text/javascript">
Calendar.setup({

8
lib/WebGUI/Form/DateTime.pm
View file

@ -119,10 +119,10 @@ sub toHtml {
unless ($language) {
$language = $i18n->getLanguage("English","languageAbbreviation");
}
$self->session->style->setScript($self->session->config->get("extrasURL").'/calendar/calendar.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->config->get("extrasURL").'/calendar/lang/calendar-'.$language.'.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->config->get("extrasURL").'/calendar/calendar-setup.js',{ type=>'text/javascript' });
$self->session->style->setLink($self->session->config->get("extrasURL").'/calendar/calendar-win2k-1.css', { rel=>"stylesheet", type=>"text/css", media=>"all" });
$self->session->style->setScript($self->session->url->extras('calendar/calendar.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('calendar/lang/calendar-'.$language.'.js'),{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('calendar/calendar-setup.js'),{ type=>'text/javascript' });
$self->session->style->setLink($self->session->url->extras('calendar/calendar-win2k-1.css'), { rel=>"stylesheet", type=>"text/css", media=>"all" });
my $mondayFirst = $self->session->user->profileField("firstDayOfWeek") ? "true" : "false";
return WebGUI::Form::Text->new($self->session,
name=>$self->get("name"),

2
lib/WebGUI/Form/Email.pm
View file

@ -96,7 +96,7 @@ Renders an email address field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/emailCheck.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('emailCheck.js'),{ type=>'text/javascript' });
$self->{_params}{extras} .= ' onchange="emailCheck(this.value)" ';
return $self->SUPER::toHtml;
}

4
lib/WebGUI/Form/File.pm
View file

@ -190,7 +190,7 @@ sub toHtml {
my @files = $storage->getFiles if (defined $storage);
my $maxFiles = $self->get('maxAttachments') - scalar(@files);
if ($maxFiles > 0) {
$self->session->style->setScript($self->session->config->get("extrasURL").'/FileUploadControl.js',{type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras('FileUploadControl.js'),{type=>"text/javascript"});
$uploadControl = '<script type="text/javascript">
var fileIcons = new Array();
';
@ -201,7 +201,7 @@ sub toHtml {
unless ($file eq "." || $file eq "..") {
my $ext = $file;
$ext =~ s/(.*?)\.gif/$1/;
$uploadControl .= 'fileIcons["'.$ext.'"] = "'.$self->session->config->get("extrasURL").'/fileIcons/'.$file.'";'."\n";
$uploadControl .= 'fileIcons["'.$ext.'"] = "'.$self->session->url->extras('fileIcons/'.$file).'";'."\n";
}
}
$uploadControl .= sprintf q!var uploader = new FileUploadControl("%s", fileIcons, "%s","%d");

2
lib/WebGUI/Form/Integer.pm
View file

@ -116,7 +116,7 @@ Renders an integer field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789-\')"');
return $self->SUPER::toHtml;
}

2
lib/WebGUI/Form/Phone.pm
View file

@ -95,7 +95,7 @@ Renders a phone number field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'x0123456789-()+ \')" ');
return $self->SUPER::toHtml;
}

2
lib/WebGUI/Form/Textarea.pm
View file

@ -109,7 +109,7 @@ sub toHtml {
my $resize = undef;
if ($self->get("resizeable")) {
my $i18n = WebGUI::International->new($self->session, "Form_Textarea");
$self->session->style->setScript($self->session->config->get("extrasURL")."/resizeable_textarea.js", {type=>"text/javascript"});
$self->session->style->setScript($self->session->url->extras("resizeable_textarea.js"), {type=>"text/javascript"});
$resize = '<img src="'.$self->session->icon->getBaseURL().'/drag.gif" title="'.$i18n->get("drag to resize").'" alt="'.$i18n->get("drag to resize").'" class="draggable" onmousedown="tar_drag_start(event, \''.$self->get('id').'\');" />';
}
my $value = $self->fixMacros($self->fixTags($self->fixSpecialCharacters($self->get("value"))));

4
lib/WebGUI/Form/TimeField.pm
View file

@ -109,12 +109,12 @@ sub toHtml {
my $self = shift;
my $value = $self->session->datetime->secondsToTime($self->get("value"));
my $i18n = WebGUI::International->new($self->session);
$self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789:\')"');
return $self->SUPER::toHtml
.WebGUI::Form::Button->new($self->session,
id=>$self->get('id'),
extras=>'style="font-size: 8pt;" onclick="window.timeField = this.form.'.$self->get("name").';clockSet = window.open(\''.$self->session->config->get("extrasURL"). '/timeChooser.html\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"',
extras=>'style="font-size: 8pt;" onclick="window.timeField = this.form.'.$self->get("name").';clockSet = window.open(\''.$self->session->url->extras('timeChooser.html').'\',\'timeChooser\',\'WIDTH=230,HEIGHT=100\');return false"',
value=>$i18n->get(970)
)->toHtml;
}

2
lib/WebGUI/Form/Url.pm
View file

@ -107,7 +107,7 @@ Renders a URL field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/addHTTP.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('addHTTP.js'),{ type=>'text/javascript' });
$self->set("extras", $self->get('extras') . ' onblur="addHTTP(this.form.'.$self->get("name").')"');
return $self->SUPER::toHtml;
}

2
lib/WebGUI/Form/Zipcode.pm
View file

@ -103,7 +103,7 @@ Renders a zip code field.
sub toHtml {
my $self = shift;
$self->session->style->setScript($self->session->config->get("extrasURL").'/inputCheck.js',{ type=>'text/javascript' });
$self->session->style->setScript($self->session->url->extras('inputCheck.js'),{ type=>'text/javascript' });
$self->set("extras", $self->get('extras') . ' onkeyup="doInputCheck(this.form.'.$self->get("name").',\'0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ- \')"');
return $self->SUPER::toHtml;
}

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;
}

21
lib/WebGUI/Session/Url.pm
View file

@ -38,6 +38,7 @@ This package provides URL writing functionality. It is important that all WebGUI
$string = $url->append($base, $pairs);
$string = $url->escape($string);
$string = $url->extras($path);
$string = $url->gateway($pageUrl, $pairs);
$string = $url->getRequestedUrl;
$string = $url->getSiteURL;
@ -122,6 +123,26 @@ sub escape {
}
#-------------------------------------------------------------------
=head2 extras ( path )
Combinds the base extrasURL defined in the config file with a specfied path.
=head3 path
The path to the thing in the extras folder that you're referencing. Note that the preceding / is not necessary.
=cut
sub extras {
my $self = shift;
my $path = shift;
my $url = $self->session->config->get("extrasURL").'/'.$path;
$url =~ s/\/+/\//g;
return $url;
}
#-------------------------------------------------------------------
=head2 gateway ( pageURL [ , pairs ] )