From 168ba28ccf4af605e4aa4192a6570dd4854caed2 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Thu, 26 Jul 2007 02:19:46 +0000
Subject: [PATCH] some bug fixes

---
 docs/upgrades/upgrade_7.3.22-7.4.0.pl |  5 ++++-
 lib/WebGUI/Setup.pm                   | 32 ++++++++++-----------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/docs/upgrades/upgrade_7.3.22-7.4.0.pl b/docs/upgrades/upgrade_7.3.22-7.4.0.pl
index 6df34f852..bede799dc 100644
--- a/docs/upgrades/upgrade_7.3.22-7.4.0.pl
+++ b/docs/upgrades/upgrade_7.3.22-7.4.0.pl
@@ -14,6 +14,7 @@ use Getopt::Long;
 use WebGUI::Session;
 use WebGUI::Workflow;
 use WebGUI::Storage;
+use WebGUI::Asset;
 
 my $toVersion = "7.4.0"; # make this match what version you're going to
 my $quiet; # this line required
@@ -43,7 +44,7 @@ finish($session); # this line required
 
 sub addWikiAttachments {
     my $session = shift;
-    print "\tAdding support for attachmetns to wikis.\n" unless ($quiet);
+    print "\tAdding support for attachments to wikis.\n" unless ($quiet);
     my $db = $session->db;
     $db->write("alter table WikiMaster add column allowAttachments int not null default 0");
     my $sth = $db->read("select storageId from WikiPage");
@@ -54,6 +55,8 @@ sub addWikiAttachments {
         }
     }
     $db->write("alter table WikiPage drop column storageId");
+    my $root = WebGUI::Asset->getRoot($session);
+    $root->addChild({title=>"Tempspace", url=>"tempspace", className=>"WebGUI::Asset::Wobject::Folder"}, "tempspace0000000000000"); 
 }
 
 #-------------------------------------------------
diff --git a/lib/WebGUI/Setup.pm b/lib/WebGUI/Setup.pm
index ebbdf2d04..f092fee33 100644
--- a/lib/WebGUI/Setup.pm
+++ b/lib/WebGUI/Setup.pm
@@ -285,19 +285,18 @@ a:visited { color: '.$form->get("visitedLinkColor").'; }
         $f->hidden(name=>"step", value=>"7");
         $f->hidden(name=>"styleTemplateId", value=>$style->getId);
         $f->yesNo(name=>"contactUs",label=>"Contact Us");
-        $f->yesNo(name=>"aboutUs",label=>"About Us",
-            extras=>'onchange="document.getElementById(\'aboutUsContent_formId_row\').style.display=\'table-row\';"');
-        $f->HTMLArea(name=>"aboutUsContent", richEditId=>"PBrichedit000000000002", 
-            value=>"Put your about us content here.");
-        if (isIn("WebGUI::Asset::Wobject::Collaboration", @{$session->config->get("assets")})) {
-            $f->yesNo(name=>"forums",label=>"Forums",
-                extras=>'onchange="document.getElementById(\'forumNames_formId_row\').style.display=\'table-row\'"');
-            $f->textarea(name=>"forumNames",subtext=>"One forum name per line", value=>"Support\nGeneral Discussion");
-            $f->yesNo(name=>"news",label=>"News");
-        }
         $f->yesNo(name=>"calendar",label=>"Calendar");
         $f->yesNo(name=>"wiki",label=>"Wiki");
         $f->yesNo(name=>"search",label=>"Search");
+        $f->yesNo(name=>"aboutUs",label=>"About Us");
+        $f->HTMLArea(name=>"aboutUsContent", richEditId=>"PBrichedit000000000002", 
+            value=>"Put your about us content here.");
+        if (isIn("WebGUI::Asset::Wobject::Collaboration", @{$session->config->get("assets")})) {
+            $f->yesNo(name=>"news",label=>"News");
+            $f->yesNo(name=>"forums",label=>"Forums");
+            $f->textarea(name=>"forumNames",subtext=>"One forum name per line", 
+                value=>"Support\nGeneral Discussion");
+        }
         $f->submit;
         $legend = "Initial Pages";
         $output .= $f->print;
@@ -535,12 +534,12 @@ return props[propName];
             top: 5%; left: 10%; position: absolute;
             }
             #initBoxSleeve {
-                overflow: auto;
-                width: 700px;
+                width: 770px;
                 height: 475px;
             }
 		a { color: black; }
 		a:visited { color: black;}
+        body { margin: 0; }
             ';
     }
     else {
@@ -551,16 +550,9 @@ return props[propName];
         }
         ';
     }
-    if ($session->form->process("step") == 6) {
-        $page .= '
-            #forumNames_formId_row, #aboutUsContent_formId_row {
-               display: none;
-            }
-            ';
-    }
     $page .= ' </style> </head> <body> 
             <div id="initBox"><h1>'.$legend.'</h1><div id="initBoxSleeve"> '.$output.'</div></div>
-         <img src="'.$session->url->extras('background.jpg').'" style="border-style:none;position: absolute; top: 0; left: 0; width: 100%; height: 100%; z-index: 1;" />
+         <img src="'.$session->url->extras('background.jpg').'" style="border-style:none;position: absolute; top: 0; left: 0; width: 100%; height: 1000px; z-index: 1;" />
 	</body> </html>';
 	$session->http->setCacheControl("none");
 	$session->http->setMimeType("text/html");