From 521162c57722478b8ea4bba265e698d5ad8df438 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 26 Apr 2006 22:06:05 +0000
Subject: [PATCH] fixed a few bugs

---
 docs/upgrades/7fixup.pl                        | 18 ++++++------------
 docs/upgrades/7fixup/style1/roottab_level0.nav |  4 ++--
 docs/upgrades/7fixup/style1/roottab_level1.nav |  4 ++--
 .../upgrades/7fixup/style3/style3_coolmenu.nav |  4 ++--
 4 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/docs/upgrades/7fixup.pl b/docs/upgrades/7fixup.pl
index 8cc7841a5..a5ce1cbb0 100644
--- a/docs/upgrades/7fixup.pl
+++ b/docs/upgrades/7fixup.pl
@@ -300,7 +300,7 @@ sub addNewStyles {
 					},"7.0-style".sprintf("%013d",$assetCounter));
 				$asset->getStorageLocation->addFileFromFilesystem("7fixup/".$style."/".$file);
 				$asset->getStorageLocation->generateThumbnail($file);
-			} elsif ($file =~ m/.tmpl$/) {
+			} elsif ($file =~ m/\.tmpl$/) {
 				open(FILE,"<7fixup/".$style."/".$file);
 				my $first = 1;
 				my $head = 0;
@@ -323,23 +323,17 @@ sub addNewStyles {
 				}
 				close(FILE);
 				my $template = $folder->addChild(\%properties, $properties{id});
-			} elsif ($file =~ m/.nav$/) {
+			} elsif ($file =~ m/\.nav$/) {
 				open(FILE,"<"."7fixup/".$style."/".$file);
-				my $first = 1;
-				my $head = 0;
 				my %properties = (className=>"WebGUI::Asset::Wobject::Navigation", styleTemplateId=>'PBtmpl0000000000000060');
 				while (my $line = <FILE>) {
-					if ($first) {
-						$line =~ m/^\#(.*)$/;
-						$properties{id} = $1;
-						$first = 0;
-					} elsif ($line =~ m/^\#(.*):(.*)$/) {
+					if ($line =~ m/^\#(.*):(.*)$/) {
 						$properties{$1} = $2;
 					}
 				}
 				close(FILE);
-				my $template = $folder->addChild(\%properties, "7.0-style".sprintf("%013d",$assetCounter));
-			} elsif ($file =~ m/.snippet$/) {
+				$folder->addChild(\%properties, "7.0-style".sprintf("%013d",$assetCounter));
+			} elsif ($file =~ m/\.snippet$/) {
 				open(FILE,"<7fixup/".$style."/".$file);
 				my $head = 0;
 				my %properties = (className=>"WebGUI::Asset::Snippet");
@@ -351,7 +345,7 @@ sub addNewStyles {
 					}
 				}
 				close(FILE);
-				my $template = $folder->addChild(\%properties, "7.0-style".sprintf("%013d",$assetCounter));
+				$folder->addChild(\%properties, "7.0-style".sprintf("%013d",$assetCounter));
 			}
 		}
 	}
diff --git a/docs/upgrades/7fixup/style1/roottab_level0.nav b/docs/upgrades/7fixup/style1/roottab_level0.nav
index 64f4e9e35..39e16b4c9 100644
--- a/docs/upgrades/7fixup/style1/roottab_level0.nav
+++ b/docs/upgrades/7fixup/style1/roottab_level0.nav
@@ -1,9 +1,9 @@
 #title:RootTab Level 0
 #menuTitle:RootTab Level 0
 #url:roottab_level0
-#startPointType:relativeToRoot
+#startType:relativeToRoot
 #startPoint:1
-#relativesToInclude:descendants
+#assetsToInclude:descendants
 #descendantEndPoint:1
 #templateId:#stevenav00000000000001
 #displayTitle:0
diff --git a/docs/upgrades/7fixup/style1/roottab_level1.nav b/docs/upgrades/7fixup/style1/roottab_level1.nav
index b34253598..e3d591580 100644
--- a/docs/upgrades/7fixup/style1/roottab_level1.nav
+++ b/docs/upgrades/7fixup/style1/roottab_level1.nav
@@ -1,9 +1,9 @@
 #title:RootTab Level 1
 #menuTitle:RootTab Level 1
 #url:roottab_level1
-#startPointType:relativeToRoot
+#startType:relativeToRoot
 #startPoint:2
-#relativesToInclude:descendants
+#assetsToInclude:descendants
 #descendantEndPoint:1
 #templateId:PBnav000000style01lvl2
 #displayTitle:0
diff --git a/docs/upgrades/7fixup/style3/style3_coolmenu.nav b/docs/upgrades/7fixup/style3/style3_coolmenu.nav
index 99da89476..dd3c0b06b 100644
--- a/docs/upgrades/7fixup/style3/style3_coolmenu.nav
+++ b/docs/upgrades/7fixup/style3/style3_coolmenu.nav
@@ -1,9 +1,9 @@
 #title:Style3 Coolmenu
 #menuTitle:Style3 Coolmenu
 #url:style3_coolmenu
-#startPointType:relativeToRoot
+#startType:relativeToRoot
 #startPoint:1
-#relativesToInclude:descendants
+#assetsToInclude:descendants
 #descendantEndPoint:55
 #displayTitle:0
 #ancestorEndPoint:55