diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 9d2f33078..976cc08c8 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -65,6 +65,9 @@ otherwise be slow or complex pages. More details in migration.txt. The amount of the increase depends upon the complexity of the page, but now complex pages should render almost as fast as simple pages. + - Removed the JavaScript, RawHeadTags, and StyleSheet macros in favor of + adding a Head Block parameter to templates. This was needed in order to + implement content chunking. - The SMTP mail backend has been replaced with a new API that's capable of sending attachments, HTML messages, and more. This will introduce many new options for developers. diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_admin_console.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_admin_console.tmpl index 61deb780c..14f85a7e5 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_admin_console.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_admin_console.tmpl @@ -1,7 +1,5 @@ #PBtmpl0000000000000001 -^StyleSheet(^Extras;adminConsole/adminConsole.css); -^JavaScript(^Extras;adminConsole/adminConsole.js);
@@ -65,3 +63,8 @@ + +~~~ + + + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_cool_menus.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_cool_menus.tmpl index c5ee5b855..14e574696 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_cool_menus.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_cool_menus.tmpl @@ -12,7 +12,6 @@ -^JavaScript("/coolmenus/coolmenus4.js"); + diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl index 3a4e507e9..f40d0b731 100644 --- a/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl +++ b/docs/upgrades/templates-6.99.0/wgtemplate_dtree.tmpl @@ -7,8 +7,6 @@

-^StyleSheet("/Navigation/dtree/dtree.css"); -^JavaScript("/Navigation/dtree/dtree.js"); @@ -18,7 +16,7 @@
+~~~ + + + diff --git a/docs/upgrades/upgrade_6.8.8-6.99.0.pl b/docs/upgrades/upgrade_6.8.8-6.99.0.pl index 6725143b6..99324711e 100644 --- a/docs/upgrades/upgrade_6.8.8-6.99.0.pl +++ b/docs/upgrades/upgrade_6.8.8-6.99.0.pl @@ -592,6 +592,9 @@ sub updateDatabaseLinksAndSQLReport { #------------------------------------------------- sub updateTemplates { print "\tUpdating base templates for XHTML compliance, and a cleaner look.\n" unless ($quiet); + $session->config->deleteFromHash("macros","JavaScript"); + $session->config->deleteFromHash("macros","RawHeadTags"); + $session->config->deleteFromHash("macros","StyleSheet"); $session->db->write("alter table template add column headBlock text"); my $template = WebGUI::Asset->new($session, "PBtmpl0000000000000003", "WebGUI::Asset::Template"); if (defined $template) { @@ -841,6 +844,15 @@ sub templateParsers { #------------------------------------------------- sub removeFiles { print "\tRemoving old unneeded files.\n" unless ($quiet); + unlink '../../lib/WebGUI/Help/Macro_StyleSheet.pm'; + unlink '../../lib/WebGUI/Help/Macro_JavaScript.pm'; + unlink '../../lib/WebGUI/Help/Macro_RawHeadTags.pm'; + unlink '../../lib/WebGUI/i18n/English/Macro_StyleSheet.pm'; + unlink '../../lib/WebGUI/i18n/English/Macro_JavaScript.pm'; + unlink '../../lib/WebGUI/i18n/English/Macro_RawHeadTags.pm'; + unlink '../../lib/WebGUI/Macro/StyleSheet.pm'; + unlink '../../lib/WebGUI/Macro/JavaScript.pm'; + unlink '../../lib/WebGUI/Macro/RawHeadTags.pm'; unlink '../../lib/WebGUI/MessageLog.pm'; unlink '../../lib/WebGUI/Operation/MessageLog.pm'; unlink '../../lib/WebGUI/ErrorHandler.pm'; diff --git a/lib/WebGUI/Help/Macro_JavaScript.pm b/lib/WebGUI/Help/Macro_JavaScript.pm deleted file mode 100644 index bf8176098..000000000 --- a/lib/WebGUI/Help/Macro_JavaScript.pm +++ /dev/null @@ -1,20 +0,0 @@ -package WebGUI::Help::Macro_JavaScript; - -our $HELP = { - - 'java script' => { - title => 'java script title', - body => 'java script body', - fields => [ - ], - related => [ - { - tag => 'macros using', - namespace => 'Macros' - }, - ] - }, - -}; - -1; diff --git a/lib/WebGUI/Help/Macro_RawHeadTags.pm b/lib/WebGUI/Help/Macro_RawHeadTags.pm deleted file mode 100644 index 373406459..000000000 --- a/lib/WebGUI/Help/Macro_RawHeadTags.pm +++ /dev/null @@ -1,20 +0,0 @@ -package WebGUI::Help::Macro_RawHeadTags; - -our $HELP = { - - 'raw head tags' => { - title => 'raw head tags title', - body => 'raw head tags body', - fields => [ - ], - related => [ - { - tag => 'macros using', - namespace => 'Macros' - }, - ] - }, - -}; - -1; diff --git a/lib/WebGUI/Help/Macro_StyleSheet.pm b/lib/WebGUI/Help/Macro_StyleSheet.pm deleted file mode 100644 index 490f7662d..000000000 --- a/lib/WebGUI/Help/Macro_StyleSheet.pm +++ /dev/null @@ -1,20 +0,0 @@ -package WebGUI::Help::Macro_StyleSheet; - -our $HELP = { - - 'style sheet' => { - title => 'style sheet title', - body => 'style sheet body', - fields => [ - ], - related => [ - { - tag => 'macros using', - namespace => 'Macros' - }, - ] - }, - -}; - -1; diff --git a/lib/WebGUI/Macro/JavaScript.pm b/lib/WebGUI/Macro/JavaScript.pm deleted file mode 100644 index 480e2554e..000000000 --- a/lib/WebGUI/Macro/JavaScript.pm +++ /dev/null @@ -1,43 +0,0 @@ -package WebGUI::Macro::JavaScript; - -#------------------------------------------------------------------- -# WebGUI is Copyright 2001-2006 Plain Black Corporation. -#------------------------------------------------------------------- -# Please read the legal notices (docs/legal.txt) and the license -# (docs/license.txt) that came with this distribution before using -# this software. -#------------------------------------------------------------------- -# http://www.plainblack.com info@plainblack.com -#------------------------------------------------------------------- - -use strict; - -=head1 NAME - -Package WebGUI::Macro::JavaScript - -=head1 DESCRIPTION - -This Macro is a wrapper for $session->style->setScript, which puts a script -tag into the head of the current page with the contents of the javascript -found at the url that is passed in. - -=head2 process ( url ) - -=head3 url - -URL to the javascript to include in the page's header tags. - -=cut - - -#------------------------------------------------------------------- -sub process { - my $session = shift; - $session->style->setScript(shift,{type=>'text/javascript'}); - return undef; -} - -1; - - diff --git a/lib/WebGUI/Macro/RawHeadTags.pm b/lib/WebGUI/Macro/RawHeadTags.pm deleted file mode 100644 index cb3bf0df7..000000000 --- a/lib/WebGUI/Macro/RawHeadTags.pm +++ /dev/null @@ -1,42 +0,0 @@ -package WebGUI::Macro::RawHeadTags; - -#------------------------------------------------------------------- -# WebGUI is Copyright 2001-2006 Plain Black Corporation. -#------------------------------------------------------------------- -# Please read the legal notices (docs/legal.txt) and the license -# (docs/license.txt) that came with this distribution before using -# this software. -#------------------------------------------------------------------- -# http://www.plainblack.com info@plainblack.com -#------------------------------------------------------------------- - -use strict; - -=head1 NAME - -Package WebGUI::Macro::RawHeadTags - -=head1 DESCRIPTION - -Macro for adding - -=head2 process ( tags ) - -process is a wrapper for $session->style->setRawHeadTags(); - -=head3 text - -Text that will be added to the HEAD tags for this page. - -=cut - -#------------------------------------------------------------------- -sub process { - my $session = shift; - $session->style->setRawHeadTags(shift); - return ""; -} - -1; - - diff --git a/lib/WebGUI/Macro/StyleSheet.pm b/lib/WebGUI/Macro/StyleSheet.pm deleted file mode 100644 index 81f1c2ab1..000000000 --- a/lib/WebGUI/Macro/StyleSheet.pm +++ /dev/null @@ -1,45 +0,0 @@ -package WebGUI::Macro::StyleSheet; - -#------------------------------------------------------------------- -# WebGUI is Copyright 2001-2006 Plain Black Corporation. -#------------------------------------------------------------------- -# Please read the legal notices (docs/legal.txt) and the license -# (docs/license.txt) that came with this distribution before using -# this software. -#------------------------------------------------------------------- -# http://www.plainblack.com info@plainblack.com -#------------------------------------------------------------------- - -use strict; - -=head1 NAME - -Package WebGUI::Macro::StyleSheet - -=head1 DESCRIPTION - -Macro for dynamically adding references to CSS documents to use in this page. - -=head2 process ( url ) - -process is a wrapper around $session->style->setLink(). - -=head3 url - -The URL to the CSS document. - -=cut - -#------------------------------------------------------------------- -sub process { - my $session = shift; - $session->style->setLink(shift,{ - type=>'text/css', - rel=>'stylesheet' - }); - return ""; -} - -1; - - diff --git a/lib/WebGUI/i18n/English/Macro_JavaScript.pm b/lib/WebGUI/i18n/English/Macro_JavaScript.pm deleted file mode 100644 index 92d8fa08d..000000000 --- a/lib/WebGUI/i18n/English/Macro_JavaScript.pm +++ /dev/null @@ -1,26 +0,0 @@ -package WebGUI::i18n::English::Macro_JavaScript; - -our $I18N = { - - 'macroName' => { - message => q|JavaScript|, - lastUpdated => 1128839022, - }, - - 'java script title' => { - message => q|JavaScript Macro|, - lastUpdated => 1112466408, - }, - - 'java script body' => { - message => q| - -^JavaScript();
-This macro allows you to include javascript in the head section of the page. Just pass in the URL to the javascript file. -

-|, - lastUpdated => 1112466919, - }, -}; - -1; diff --git a/lib/WebGUI/i18n/English/Macro_RawHeadTags.pm b/lib/WebGUI/i18n/English/Macro_RawHeadTags.pm deleted file mode 100644 index c55d42d8b..000000000 --- a/lib/WebGUI/i18n/English/Macro_RawHeadTags.pm +++ /dev/null @@ -1,27 +0,0 @@ -package WebGUI::i18n::English::Macro_RawHeadTags; - -our $I18N = { - - 'macroName' => { - message => q|Raw Head Tags|, - lastUpdated => 1128918979, - }, - - 'raw head tags title' => { - message => q|Raw Head Tags Macro|, - lastUpdated => 1112466408, - }, - - 'raw head tags body' => { - message => q| - -^RawHeadTags("header tags");
-This macro allows you to set some arbitrary tags in the head section of the page. Just pass in the text. -

- -|, - lastUpdated => 1112466919, - }, -}; - -1; diff --git a/lib/WebGUI/i18n/English/Macro_StyleSheet.pm b/lib/WebGUI/i18n/English/Macro_StyleSheet.pm deleted file mode 100644 index 825254c44..000000000 --- a/lib/WebGUI/i18n/English/Macro_StyleSheet.pm +++ /dev/null @@ -1,27 +0,0 @@ -package WebGUI::i18n::English::Macro_StyleSheet; - -our $I18N = { - - 'macroName' => { - message => q|Style Sheet|, - lastUpdated => 1128919083, - }, - - 'style sheet title' => { - message => q|Style Sheet Macro|, - lastUpdated => 1112466408, - }, - - 'style sheet body' => { - message => q| - -^StyleSheet();
-This macro allows you to set a cascading style sheet in the head section of the page. Just pass in the URL to the CSS file. -

- -|, - lastUpdated => 1112466919, - }, -}; - -1;