From 2f24cd3f3c5563523aefa6ee461e7929ecaec50f Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 28 Apr 2006 16:59:32 +0000 Subject: [PATCH] [ 1475220 ] some 6.99 templates have double slashes --- docs/upgrades/7fixup/style1/style01.tmpl | 2 ++ docs/upgrades/7fixup/style2/style02.tmpl | 2 ++ docs/upgrades/7fixup/style3/coolmenu.tmpl | 2 +- docs/upgrades/7fixup/style3/style03.tmpl | 2 ++ docs/upgrades/templates-6.99.0/adminbar.tmpl | 4 ++-- .../wgtemplate_admin_console.tmpl | 8 +++---- .../wgtemplate_cool_menus.tmpl | 2 +- ...plate_dashboard-default-view-template.tmpl | 18 +++++++-------- .../wgtemplate_default_ems_search.tmpl | 2 +- .../wgtemplate_default_poll.tmpl | 4 ++-- .../wgtemplate_default_post_form.tmpl | 6 +---- .../wgtemplate_default_submission_form.tmpl | 6 +---- .../templates-6.99.0/wgtemplate_dtree.tmpl | 6 ++--- .../wgtemplate_faq_submission_form.tmpl | 6 +---- .../wgtemplate_job_submission_form.tmpl | 6 +---- .../wgtemplate_left_column_collateral.tmpl | 4 ++-- .../wgtemplate_link_list_submission_form.tmpl | 6 +---- .../wgtemplate_make_page_printable.tmpl | 8 +++---- ...template_matrix_default_view_template.tmpl | 10 ++++----- .../wgtemplate_style_admin_console.tmpl | 4 ++-- .../wgtemplate_webgui6_blank.tmpl | 4 ++-- lib/WebGUI/Asset/File.pm | 4 ++-- lib/WebGUI/Asset/File/Image.pm | 9 +------- lib/WebGUI/Asset/File/ZipArchive.pm | 22 ++----------------- lib/WebGUI/Asset/FilePile.pm | 4 ++-- lib/WebGUI/Asset/Post/Thread.pm | 4 ++-- lib/WebGUI/Asset/RichEdit.pm | 6 ++--- lib/WebGUI/Asset/Shortcut.pm | 5 ++--- lib/WebGUI/Asset/Wobject/DataForm.pm | 4 ++-- .../Asset/Wobject/EventManagementSystem.pm | 7 +++--- lib/WebGUI/Asset/Wobject/Layout.pm | 8 +++---- lib/WebGUI/Asset/Wobject/SQLForm.pm | 20 +++-------------- lib/WebGUI/Asset/Wobject/StockData.pm | 4 ++-- lib/WebGUI/Asset/Wobject/WeatherData.pm | 2 +- lib/WebGUI/Asset/Wobject/_NewWobject.skeleton | 2 +- lib/WebGUI/Form/Codearea.pm | 2 +- lib/WebGUI/Form/Color.pm | 2 +- lib/WebGUI/Form/Date.pm | 8 +++---- lib/WebGUI/Form/DateTime.pm | 8 +++---- lib/WebGUI/Form/Email.pm | 2 +- lib/WebGUI/Form/File.pm | 4 ++-- lib/WebGUI/Form/Integer.pm | 2 +- lib/WebGUI/Form/Phone.pm | 2 +- lib/WebGUI/Form/Textarea.pm | 2 +- lib/WebGUI/Form/TimeField.pm | 4 ++-- lib/WebGUI/Form/Url.pm | 2 +- lib/WebGUI/Form/Zipcode.pm | 2 +- lib/WebGUI/Macro/AdminBar.pm | 6 ++--- lib/WebGUI/Macro/Extras.pm | 5 +++-- lib/WebGUI/Macro/Spacer.pm | 2 +- lib/WebGUI/Session/Url.pm | 21 ++++++++++++++++++ 51 files changed, 127 insertions(+), 160 deletions(-) diff --git a/docs/upgrades/7fixup/style1/style01.tmpl b/docs/upgrades/7fixup/style1/style01.tmpl index 8b0617d3f..026db16c1 100644 --- a/docs/upgrades/7fixup/style1/style01.tmpl +++ b/docs/upgrades/7fixup/style1/style01.tmpl @@ -8,6 +8,8 @@ ^Page(title); + + diff --git a/docs/upgrades/7fixup/style2/style02.tmpl b/docs/upgrades/7fixup/style2/style02.tmpl index 605e24cfd..8cc4076b7 100644 --- a/docs/upgrades/7fixup/style2/style02.tmpl +++ b/docs/upgrades/7fixup/style2/style02.tmpl @@ -9,6 +9,8 @@ ^c; - ^Page(title); + + diff --git a/docs/upgrades/7fixup/style3/coolmenu.tmpl b/docs/upgrades/7fixup/style3/coolmenu.tmpl index fedfc9dcf..9dc794532 100644 --- a/docs/upgrades/7fixup/style3/coolmenu.tmpl +++ b/docs/upgrades/7fixup/style3/coolmenu.tmpl @@ -132,7 +132,7 @@ coolmenu.construct(); ~~~ - + - + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_dashboard-default-view-template.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_dashboard-default-view-template.tmpl index 00296c4ed..b043414f6 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_dashboard-default-view-template.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_dashboard-default-view-template.tmpl @@ -10,7 +10,7 @@
-

+

@@ -38,7 +38,7 @@

^L("17","","PBtmpl0000000000000092"); ^AdminToggle(Modify the Default User's Perspective,Leave Default User Perspective (Admin Mode)); - + + + + \ No newline at end of file + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl index c45f4f7f1..c9303248a 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl @@ -227,4 +227,4 @@ tr.evenRow td { - + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_poll.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_poll.tmpl index 50f1d2a17..b6b65adfc 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_default_poll.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_poll.tmpl @@ -31,7 +31,7 @@
- +
^Spacer(1,1);   % ()
@@ -61,4 +61,4 @@ h2 { .pollColor { background-color:gray; } - \ No newline at end of file + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_post_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_post_form.tmpl index 62b969c15..419cf5cef 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_default_post_form.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_post_form.tmpl @@ -29,10 +29,6 @@ - - - - @@ -83,4 +79,4 @@ h2 { font-family:arial; } - \ No newline at end of file + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_submission_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_submission_form.tmpl index 2b4123818..fe360dc9c 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_default_submission_form.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_submission_form.tmpl @@ -35,10 +35,6 @@ - - - - @@ -109,4 +105,4 @@ h2 font-family:arial; } - \ No newline at end of file + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl index 1dcf79ae4..49121d945 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl @@ -16,7 +16,7 @@ ~~~ - - + + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_faq_submission_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_faq_submission_form.tmpl index 9cee6ec86..9843e541d 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_faq_submission_form.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_faq_submission_form.tmpl @@ -37,10 +37,6 @@ - - - - @@ -93,4 +89,4 @@ h2 font-family:arial; } - \ No newline at end of file + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_job_submission_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_job_submission_form.tmpl index e80474ad2..e94b090f5 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_job_submission_form.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_job_submission_form.tmpl @@ -66,10 +66,6 @@ - - - - @@ -126,4 +122,4 @@ h2 font-family:arial; } - \ No newline at end of file + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_left_column_collateral.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_left_column_collateral.tmpl index d78733a12..3e5e6aba3 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_left_column_collateral.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_left_column_collateral.tmpl @@ -13,7 +13,7 @@ - - - - @@ -105,4 +101,4 @@ h2 font-family:arial; } - \ No newline at end of file + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl index 796e4d497..23ab561d7 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_make_page_printable.tmpl @@ -4,8 +4,8 @@ ^Page(title); - <tmpl_var session.setting.companyName> - - + + \ No newline at end of file + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl index 4d8a5e078..e522b4721 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_style_admin_console.tmpl @@ -3,8 +3,8 @@ WebGUI <tmpl_var session.webgui.version>-<tmpl_var session.webgui.status> Admin Console - - + + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_webgui6_blank.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_webgui6_blank.tmpl index d8fdf1afc..e851e5f70 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_webgui6_blank.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_webgui6_blank.tmpl @@ -3,8 +3,8 @@ ^Page(title); - <tmpl_var session.setting.companyName> - - + + '); @@ -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"} = ' - + diff --git a/lib/WebGUI/Asset/Wobject/SQLForm.pm b/lib/WebGUI/Asset/Wobject/SQLForm.pm index 7cc877b96..b93326b41 100644 --- a/lib/WebGUI/Asset/Wobject/SQLForm.pm +++ b/lib/WebGUI/Asset/Wobject/SQLForm.pm @@ -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; diff --git a/lib/WebGUI/Asset/Wobject/StockData.pm b/lib/WebGUI/Asset/Wobject/StockData.pm index c3c957055..cc576676b 100644 --- a/lib/WebGUI/Asset/Wobject/StockData.pm +++ b/lib/WebGUI/Asset/Wobject/StockData.pm @@ -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]); diff --git a/lib/WebGUI/Asset/Wobject/WeatherData.pm b/lib/WebGUI/Asset/Wobject/WeatherData.pm index 2ba955cd6..5327c4756 100644 --- a/lib/WebGUI/Asset/Wobject/WeatherData.pm +++ b/lib/WebGUI/Asset/Wobject/WeatherData.pm @@ -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'; } diff --git a/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton b/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton index 8e6566d61..b3f70ce95 100644 --- a/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton +++ b/lib/WebGUI/Asset/Wobject/_NewWobject.skeleton @@ -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")); diff --git a/lib/WebGUI/Form/Codearea.pm b/lib/WebGUI/Form/Codearea.pm index 7e9bc18f7..4e4faae1e 100644 --- a/lib/WebGUI/Form/Codearea.pm +++ b/lib/WebGUI/Form/Codearea.pm @@ -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; } diff --git a/lib/WebGUI/Form/Color.pm b/lib/WebGUI/Form/Color.pm index ce6e85216..d91eb1342 100644 --- a/lib/WebGUI/Form/Color.pm +++ b/lib/WebGUI/Form/Color.pm @@ -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 ''; } diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm index 5ddca3d58..9375b0771 100644 --- a/lib/WebGUI/Form/Date.pm +++ b/lib/WebGUI/Form/Date.pm @@ -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. '
-
+^Spacer(100,1);
<tmpl_var brochure.icon>
 @@ -97,4 +97,4 @@ h2 { .noBorder { border:none; } - \ No newline at end of file + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_link_list_submission_form.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_link_list_submission_form.tmpl index 8ac96430b..eee267f50 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_link_list_submission_form.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_link_list_submission_form.tmpl @@ -48,10 +48,6 @@