diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_center_image.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_center_image.tmpl
index d97ac637f..7647b9c6d 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_center_image.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_center_image.tmpl
@@ -1,2 +1,51 @@
#PBtmpl0000000000000084
-
·
·
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+·
+
+·
+
+
+
+
+
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_classifieds.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_classifieds.tmpl
index dd8cb02a2..2f44829ad 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_classifieds.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_classifieds.tmpl
@@ -1,4 +1,70 @@
#PBtmpl0000000000000128
-
•
•
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ •
+
+
+
+
+
+
+
+ •
+
+
+
+
+
+
+
+
+
+
+
+
()
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_default_article.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_default_article.tmpl
index 4bf99312c..d722032e7 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_default_article.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_default_article.tmpl
@@ -1,2 +1,57 @@
#PBtmpl0000000000000002
-
·
·
|
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+·
+
+·
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_default_forum.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_default_forum.tmpl
index c3e8d0b01..6268d68e4 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_default_forum.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_default_forum.tmpl
@@ -1,2 +1,105 @@
#PBtmpl0000000000000026
-
^RawHeadTags();
•
•
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ •
+
+
+
+
+
+
+
+ •
+
+
+
+
+
+
+
+ |
+
+ |
+ |
+ |
+ |
+ |
+ |
+
+ |
+
+
+
+
+
+ |
+
+ |
+
+ |
+
+ |
+
+ |
+ |
+ |
+ @ |
+
+
+
+ by
+
+
+
+
+
+ on @
+ |
+
+
+
+
+
+
+
+
+~~~
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_default_thread.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_default_thread.tmpl
index d61edef15..e7e4c44e5 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_default_thread.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_default_thread.tmpl
@@ -1,2 +1,224 @@
#PBtmpl0000000000000032
-
^RawHeadTags();
:
:
[ 1, 2, 3, 4, 5 ]
: [ | ]
:
:
:
[ 1, 2, 3, 4, 5 ]
: [ | ]
:
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
:
+ :
+
+ [ 1, 2, 3, 4, 5 ]
+
+
+
+ : [ | ]
+
+
+ :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
:
+ :
+
+ [ 1, 2, 3, 4, 5 ]
+
+
+
+ : [ | ]
+
+
+ :
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ •
+
+
+
+
+
+
+
+ •
+
+
+
+
+
+
+
+ |
+
+ |
+ |
+ |
+
+
+
+
+ |
+
+ () |
+ |
+
+ |
+
+ |
+
+
+
+
+
+
+
+
+~~~
+
+
+
-^RawHeadTags(
);
•
•
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_faq.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_faq.tmpl
index 153c4896e..94f0aabd5 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_faq.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_faq.tmpl
@@ -1,2 +1,67 @@
#PBtmpl0000000000000080
-
[]
[]
[]
[]
[top]
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ []
+
+
+
+ []
+
+ []
+
+
+
+ []
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ []
+
+
+
+ (
)
+
+
+ [top]
+
+
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_guest_book.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_guest_book.tmpl
index 9e3bd632b..19bb9f823 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_guest_book.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_guest_book.tmpl
@@ -1,2 +1,45 @@
#PBtmpl0000000000000133
-
[]
[]
[]
[]
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ []
+
+
+
+ []
+
+ []
+
+
+
+ []
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_item.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_item.tmpl
index d242c06ca..87e14639f 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_item.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_item.tmpl
@@ -1,2 +1,25 @@
#PBtmpl0000000000000123
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+ -
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_item_with_pop_up_links.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_item_with_pop_up_links.tmpl
index 9bf47d0d9..3a16f2e41 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_item_with_pop_up_links.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_item_with_pop_up_links.tmpl
@@ -1,2 +1,25 @@
#PBtmpl0000000000000129
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+ -
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_job_listing.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_job_listing.tmpl
index 9dbda1060..96374fc61 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_job_listing.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_job_listing.tmpl
@@ -1,5 +1,87 @@
#PBtmpl0000000000000077
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ •
+
+
+
+
+
+
+
+ •
+
+
+
+
+
+
+
+ |
+
+ |
+ |
+ |
+ |
+
+
+
+
+
+ |
+
+ () |
+ |
+ |
+ |
+
+
+
+
+
+
+
+~~~
+
+
+
-^RawHeadTags(
);
-
•
•
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_left_align_image.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_left_align_image.tmpl
index a560d400b..eda252b1b 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_left_align_image.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_left_align_image.tmpl
@@ -1,2 +1,57 @@
#PBtmpl0000000000000103
-
·
·
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+·
+
+·
+
+
+
+
+
+
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_link_list.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_link_list.tmpl
index 281a2b295..f8d92ceaa 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_link_list.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_link_list.tmpl
@@ -1,2 +1,64 @@
#PBtmpl0000000000000083
-
[]
[]
[]
[]
target="_blank">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ []
+
+
+
+ []
+
+ []
+
+
+
+ []
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ []
+
+
+
+ (
)
+
+ target="_blank">
+
+ -
+
+
+
+
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_linked_image_with_caption.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_linked_image_with_caption.tmpl
index 345ac60d2..2b430f6d3 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_linked_image_with_caption.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_linked_image_with_caption.tmpl
@@ -1,2 +1,61 @@
#PBtmpl0000000000000115
-
·
·
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+
+
+
+
+
+·
+
+·
+
+
+
+
+
+
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_news.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_news.tmpl
index 3d9579696..0f79ab731 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_news.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_news.tmpl
@@ -5,21 +5,6 @@
-^RawHeadTags();
-
@@ -140,3 +125,20 @@
+~~~
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_ordered_list.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_ordered_list.tmpl
index fb2868ba7..8d395cbf1 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_ordered_list.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_ordered_list.tmpl
@@ -1,2 +1,64 @@
#PBtmpl0000000000000101
-
[]
[]
[]
[]
-
[]
[]
()
target="_blank">
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ []
+
+
+
+ []
+
+ []
+
+
+
+ []
+
+
+
+
+
+ -
+
+
+ []
+
+
+
+
+
+
+
+
+ []
+
+
+
+ ()
+
+ target="_blank">
+
+ -
+
+
+
+
+
+
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_photo_gallery.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_photo_gallery.tmpl
index f221631d4..7107eda85 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_photo_gallery.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_photo_gallery.tmpl
@@ -1,9 +1,68 @@
#PBtmpl0000000000000121
-
•
•
+
-^RawHeadTags();
\ No newline at end of file
+}
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_right_column.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_right_column.tmpl
index ece82f406..b6fd2f145 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_right_column.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_right_column.tmpl
@@ -5,21 +5,6 @@
-^RawHeadTags();
-
@@ -86,4 +71,20 @@
+~~~
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_side_by_side.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_side_by_side.tmpl
index d5557eca5..f129dbc2a 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_side_by_side.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_side_by_side.tmpl
@@ -5,22 +5,6 @@
-^RawHeadTags();
@@ -88,3 +72,21 @@
+~~~
+
+
diff --git a/docs/upgrades/templates-6.9.0/wgtemplate_three_over_1.tmpl b/docs/upgrades/templates-6.9.0/wgtemplate_three_over_1.tmpl
index 2e89d9a37..99aca349d 100755
--- a/docs/upgrades/templates-6.9.0/wgtemplate_three_over_1.tmpl
+++ b/docs/upgrades/templates-6.9.0/wgtemplate_three_over_1.tmpl
@@ -5,25 +5,6 @@
-^RawHeadTags();
-
@@ -142,3 +123,24 @@
+~~~
+
+
+
diff --git a/docs/upgrades/upgrade_6.8.5-6.9.0.pl b/docs/upgrades/upgrade_6.8.5-6.9.0.pl
index 763a1d832..2fa397c57 100644
--- a/docs/upgrades/upgrade_6.8.5-6.9.0.pl
+++ b/docs/upgrades/upgrade_6.8.5-6.9.0.pl
@@ -25,9 +25,64 @@ removeFiles();
addSearchEngine();
addEMSTemplates();
addEMSTables();
+updateTemplates();
finish($session); # this line required
+#-------------------------------------------------
+sub updateTemplates {
+ print "\tUpdating base templates for XHTML compliance, and a cleaner look.\n" unless ($quiet);
+ $session->db->write("alter table template add column headBlock text");
+ opendir(DIR,"templates-6.9.0");
+ my @files = readdir(DIR);
+ closedir(DIR);
+ my $importNode = WebGUI::Asset->getImportNode($session);
+ my $folder = $importNode->addChild({
+ className=>"WebGUI::Asset::Wobject::Folder",
+ title => "6.9.0 New Templates",
+ menuTitle => "6.9.0 New Templates",
+ url=> "6_9_0_new_templates",
+ groupIdView=>"12"
+ });
+ $folder->commit;
+ foreach my $file (@files) {
+ next unless ($file =~ /\.tmpl$/);
+ open(FILE,""WebGUI::Asset::Template");
+ while (my $line = ) {
+ if ($first) {
+ $line =~ m/^\#(.*)$/;
+ $properties{id} = $1;
+ $first = 0;
+ } elsif ($line =~ m/^\#create$/) {
+ $create = 1;
+ } elsif ($line =~ m/^\#(.*):(.*)$/) {
+ $properties{$1} = $2;
+ } elsif ($line =~ m/^~~~$/) {
+ $head = 1;
+ } elsif ($head) {
+ $properties{headBlock} .= $line;
+ } else {
+ $properties{template} .= $line;
+ }
+ }
+ close(FILE);
+ if ($create) {
+ my $template = $folder->addChild(\%properties, $properties{id});
+ $template->commit;
+ } else {
+ my $template = WebGUI::Asset->new($properties{id}, "WebGUI::Asset::Template");
+ if (defined $template) {
+ my $newRevision = $template->addRevision(\%propertes);
+ $newRevision->commit;
+ }
+ }
+ }
+}
+
#-------------------------------------------------
sub addEMSTemplates {
print "\tAdding Event Management System Templates.\n" unless ($quiet);