From 38d46313129b3c2c5a251d9a3fc7d0753ea12c11 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Wed, 5 May 2010 15:01:33 -0500
Subject: [PATCH] startup cleaning

---
 lib/WebGUI/Wizard/HomePage.pm     |  6 ++++--
 lib/WebGUI/Wizard/Setup.pm        | 13 ++++++-------
 lib/WebGUI/i18n/English/WebGUI.pm | 22 +++++++++++++++++-----
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/lib/WebGUI/Wizard/HomePage.pm b/lib/WebGUI/Wizard/HomePage.pm
index 4cae3052c..13c64a21d 100644
--- a/lib/WebGUI/Wizard/HomePage.pm
+++ b/lib/WebGUI/Wizard/HomePage.pm
@@ -113,7 +113,8 @@ sub www_pickStyle {
     my $f       = $self->getForm;
     my $i18n = WebGUI::International->new( $session, "WebGUI" );
 
-    my $output  = '<h1>' . $i18n->get('1073') . '</h1>';
+    my $output  = '<h1>' . $i18n->get('pick style') . '</h1>' 
+                . '<p>' . $i18n->get('pick style description') . '</p>';
 
     my @styleIds
         = $session->db->buildArray( 
@@ -144,8 +145,9 @@ sub www_pickStyle {
         my $class = ++$row % 2 ? " odd" : "";
 
         # Prepare the synopsis
-        my $synopsis = WebGUI::HTML::format( $style->get('synopsis') );
+        my $synopsis = $style->get('synopsis');
         $synopsis =~ s{(https?://\S+)}{<a href="$1">$1</a>}g;
+        $synopsis = WebGUI::HTML::format( $synopsis );
 
         $f->raw(
             '<div class="stylePicker' . $class . '"><label><input type="radio" name="styleTemplateId" value="' . $style->getId . '"/>'
diff --git a/lib/WebGUI/Wizard/Setup.pm b/lib/WebGUI/Wizard/Setup.pm
index 9d0ecc1b2..f7a663a68 100644
--- a/lib/WebGUI/Wizard/Setup.pm
+++ b/lib/WebGUI/Wizard/Setup.pm
@@ -399,14 +399,13 @@ sub www_cleanup {
     $starterForm->hidden( name => "styleTemplateId", value => $self->get('styleTemplateId') );
     $starterForm->submit( value => $i18n->get( 'yes please' ) );
 
-    my $output = '<h1>' . $i18n->get('site starter title') . '</h1>';
-    $output .= ' <p>' . $i18n->get('site starter body') . '</p>'
+    my $homeForm    = WebGUI::HTMLForm->new( $session, { action => $session->url->gateway, method => "GET" } );
+    $homeForm->submit( value => $i18n->get('no thanks') );
+
+    my $output = '<h1>' . $i18n->get('page builder title') . '</h1>';
+    $output .= ' <p>' . $i18n->get('page builder body') . '</p>'
         . '<div style="float: left">' . $starterForm->print . '</div>'
-        . sprintf( 
-            '<div style="float: left"><a href="%s">%s</a></div>',
-            $session->url->gateway,
-            $i18n->get('no thanks'),
-        )
+        . '<div style="float: left">' . $homeForm->print . '</div>'
         . '<div style="clear: both">&nbsp;</div>'
         ;
 
diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm
index 1ed0a0623..35827ea38 100644
--- a/lib/WebGUI/i18n/English/WebGUI.pm
+++ b/lib/WebGUI/i18n/English/WebGUI.pm
@@ -4233,14 +4233,14 @@ LongTruncOk=1</p>
             context     => q{Description for site setting},
         },
 
-    'site starter title' => {
-        message     => q{Site Starter},
+    'page builder title' => {
+        message     => q{Page Builder},
         lastUpdated => 0,
-        context     => q{Title for the site starter screen.},
+        context     => q{Title for the page builder screen.},
     },
 
-    'site starter body' => {
-        message     => q{Do you wish to use the WebGUI Site Starter, which will lead you through options to create a custom look and feel for your site, and set up some basic content areas?},
+    'page builder body' => {
+        message     => q{Would you like to use the Page Builder to select a default set of pages to include on your site, such as an About Us page or discussion forum.},
         lastUpdated => 0,
         context     => q{Body for the site starter screen.},
     },
@@ -4682,6 +4682,18 @@ Users may override this setting in their profile.
         context => 'Label for buttons that take you someplace else'
     },
 
+    'pick style' => {
+        message     => 'Choose a Design',
+        lastUpdated => 0,
+        context     => 'Header for the pick style template page',
+    },
+
+    'pick style description' => {
+        message     => 'Select a design to apply to your site. All designs are created from templates that you will have access to from your site, so modifications can be made later.',
+        lastUpdate  => 0,
+        context     => 'Description for pick style template page',
+    },
+
 };
 
 1;