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"));