Index: openacs-4/packages/layout-managed-subsite/catalog/layout-managed-subsite.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/catalog/layout-managed-subsite.en_US.ISO-8859-1.xml,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/layout-managed-subsite/catalog/layout-managed-subsite.en_US.ISO-8859-1.xml	30 Nov 2008 13:15:02 -0000	1.2
+++ openacs-4/packages/layout-managed-subsite/catalog/layout-managed-subsite.en_US.ISO-8859-1.xml	1 Dec 2008 20:16:18 -0000	1.3
@@ -4,12 +4,20 @@
   <msg key="Action">Action</msg>
   <msg key="Active_Includelets">Active Includelets</msg>
   <msg key="Add">Add</msg>
+  <msg key="Add_applications">Add Applications</msg>
+  <msg key="Add_Applications_and_Includelets">Add Applications and Includelets</msg>
   <msg key="Add_checked_applications">Add checked applications</msg>
   <msg key="Add_checked_includelets">Add checked includelets</msg>
   <msg key="Add_single_application">Add single application</msg>
   <msg key="Application">Application</msg>
   <msg key="available_applications">These applications support includelets and can be mounted under the current subsite:</msg>
+  <msg key="Configure_Private_Page_Sets">Configure Private Page Sets</msg>
+  <msg key="Configure_User_Control">Configure User Control Over Appearance</msg>
+  <msg key="Configure_Master">Configure Master Page Set Layout</msg>
+  <msg key="Configure_Subsite">Configure Subsite Integration</msg>
+  <msg key="Congratulations">Congratulations! Configuration Is Complete</msg>
   <msg key="Copy">Copy</msg>
+  <msg key="choose_master">Choose master template?</msg>
   <msg key="configure">Run the configuration wizard</msg>
   <msg key="configure_configurability">The following parameters offer the administrator some control over the degree to which a user can configure their own personal page sets.</msg>
   <msg key="Delete">Delete</msg>
@@ -24,19 +32,24 @@
   <msg key="Manage_Includelets">Manage Includelets</msg>
   <msg key="mounted_applications">These applications and includelets are mounted under the current subsite:</msg>
   <msg key="plain">Plain</msg>
+  <msg key="plain_navigation">Plain navigation (works best if there's only one layout manager page)</msg>
   <msg key="Return_to_Add_Applications">Return to Add Applications</msg>
+  <msg key="show_empty_pages">Should we show the navigation tabs for empty pages?</msg>
+  <msg key="show_single_tab">Should we show the navigation tabs when there's only one of them?</msg>
   <msg key="Service">Service</msg>
   <msg key="services">The following services support includelets which can be added to this subsite:</msg>
   <msg key="Singleton">Singleton</msg>
   <msg key="State">State</msg>
   <msg key="Supported_Includelets">Supported Includelets</msg>
   <msg key="tabbed">Tabbed</msg>
+  <msg key="tabbed_navigation">Tabbed navigation</msg>
   <msg key="Title">Title</msg>
   <msg key="URL">URL</msg>
-  <msg key="wizard_install_help">Install the applications and includelet packages that you want to make available.  The wizard will mount the applications you choose and make their includelets available.</msg>
+  <msg key="use_existing_master">Use my existing custom master template</msg>
+  <msg key="Welcome">Welcome to the Layout Manager Configuration Wizard</msg>
+  <msg key="wizard_install_help">Install the applications and includelet packages that you want to make available.  The wizard will mount the applications you choose and make their includelets available.  You can also mount applications manually using the standard subsite application management user interface.</msg>
   <msg key="wizard_intro">This wizard will take you through the steps necessary to configure the current subsite to use the layout manager.  Before configuring you should:</msg>
-  <msg key="wizard_navigation_help">Decide the navigation style you wish this includelet and subsite to use.</msg>
-  <msg key="wizard_redirect_help">Decide whether or not you want the parent subsite to display a layout manager page rather than its standard index page.</msg>
+  <msg key="wizard_navigation_help">Decide the navigation style you wish this subsite to use.</msg>
   <msg key="wizard_user_pagesets_help">Decide whether or not individual users should have their own private pageset.  pages, or whether you want to configure one pageset configuration to be shared by all visitors.  Creating individual private pagesets is more flexible but also consumes more system resources.</msg>
   <msg key="wizard_user_pageset_no_help"> Check "no" if you want users to share a single page set configuration.  This is more efficient of system resources but only administrators will be able to reconfigure the layout.</msg>
   <msg key="wizard_user_pageset_yes_help">Check "Yes" if you'd like the layout manager package to create each user their own custom page set configuration.  This will allow users to to move includelets from column to column or page to page, to hide includelets, etc.</msg>
Index: openacs-4/packages/layout-managed-subsite/lib/configure-finish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/lib/configure-finish.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/layout-managed-subsite/lib/configure-finish.tcl	26 Nov 2008 11:10:23 -0000	1.1
+++ openacs-4/packages/layout-managed-subsite/lib/configure-finish.tcl	1 Dec 2008 20:16:18 -0000	1.2
@@ -4,7 +4,7 @@
 ad_form -name configure-finish -form {
     foo:text(hidden),optional
 } -on_submit {
-    ad_returnredirect index
+    ad_returnredirect [ad_conn subsite_url]
     ad_script_abort
 }
 
Index: openacs-4/packages/layout-managed-subsite/lib/configure-help.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/lib/configure-help.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/layout-managed-subsite/lib/configure-help.adp	26 Nov 2008 11:10:23 -0000	1.1
+++ openacs-4/packages/layout-managed-subsite/lib/configure-help.adp	1 Dec 2008 20:16:18 -0000	1.2
@@ -4,7 +4,6 @@
 <li>#layout-managed-subsite.wizard_install_help#
 <li>#layout-managed-subsite.wizard_user_pagesets_help#
 <li>#layout-managed-subsite.wizard_navigation_help#
-<li>#layout-managed-subsite.wizard_redirect_help#
 </ul>
 
 <formtemplate id="configure-help"></formtemplate>
Index: openacs-4/packages/layout-managed-subsite/lib/configure-subsite-integration.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/lib/configure-subsite-integration.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/layout-managed-subsite/lib/configure-subsite-integration.tcl	26 Nov 2008 11:10:23 -0000	1.1
+++ openacs-4/packages/layout-managed-subsite/lib/configure-subsite-integration.tcl	1 Dec 2008 20:16:18 -0000	1.2
@@ -6,54 +6,44 @@
 
 ad_form -name configure-subsite-integration -form {
     {template_style:integer(radio)
-        {options {{"Tabbed navigation" 0}
-                  {"Plain navigation (works best if there's only one layout manager page)" 1}
-                  {"Use my existing custom master template" 2}}}
+        {options {{"[_ layout-managed-subsite.tabbed_navigation]" 0}
+                  {"[_ layout-managed-subsite.plain_navigation]" 1}
+                  {"[_ layout-managed-subsite.use_existing_master]" 2}}}
         {values {0}}
-        {label "Choose master template?"}
+        {label "[_ layout-managed-subsite.choose_master]"}
     }
-    {pageset_index_page_p:boolean(radio)
+    {show_single_button_navbar_p:boolean(radio)
         {options {{Yes 1} {No 0}}}
-        {values {1}}
-        {label "Should the parent subsite serve the layout manager package as its index page?"}
+        {values {0}}
+        {label "[_ layout-managed-subsite.show_single_tab]"}
     }
-    {show_single_button_navbar_p:boolean(radio)
+    {show_empty_pages_p:boolean(radio)
         {options {{Yes 1} {No 0}}}
         {values {0}}
-        {label "Should we show the navigation tabs when there's only one of them?"}
+        {label "[_ layout-managed-subsite.show_empty_pages]"}
     }
 } -on_submit {
 
     switch $template_style {
 
-        0 {parameter::set_value \
-               -parameter DefaultMaster \
-               -package_id [ad_conn subsite_id] \
-               -value /packages/layout-managed-subsite/lib/tabbed-master
-        }
+        0 {subsite::set_theme -theme layout_managed_subsite_tabbed}
 
-        1 {parameter::set_value \
-               -parameter DefaultMaster \
-               -package_id [ad_conn subsite_id] \
-               -value /packages/layout-managed-subsite/lib/plain-master
-        }
+        1 {subsite::set_theme -theme layout_managed_subsite_plain}
 
         2 {}
 
     }
 
-    if { $pageset_index_page_p } {
-        parameter::set_value \
-            -parameter IndexInternalRedirectUrl \
-            -package_id [ad_conn subsite_id] \
-            -value /packages/layout-managed-subsite/www/
-    }
-
     parameter::set_value \
         -parameter ShowSingleButtonNavbar \
         -package_id [ad_conn package_id] \
         -value $show_single_button_navbar_p
 
+    parameter::set_value \
+        -parameter ShowEmptyPages \
+        -package_id [ad_conn package_id] \
+        -value $show_empty_pages_p
+
     template::wizard::forward
 }
 
Index: openacs-4/packages/layout-managed-subsite/www/admin/layouts/add-applications.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/www/admin/layouts/add-applications.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/layout-managed-subsite/www/admin/layouts/add-applications.tcl	26 Nov 2008 11:10:23 -0000	1.1
+++ openacs-4/packages/layout-managed-subsite/www/admin/layouts/add-applications.tcl	1 Dec 2008 20:16:18 -0000	1.2
@@ -7,6 +7,6 @@
     @cvs-id $Id$
 }
 
-set context [list "Add Applications"]
+set context [list "[_ layout-subsite-manager.Add_applications]"]
 set return_url [ad_conn url]?[ad_conn query]
 ad_return_template
Index: openacs-4/packages/layout-managed-subsite/www/admin/layouts/configure.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/www/admin/layouts/configure.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/layout-managed-subsite/www/admin/layouts/configure.adp	26 Nov 2008 11:10:23 -0000	1.1
+++ openacs-4/packages/layout-managed-subsite/www/admin/layouts/configure.adp	1 Dec 2008 20:16:18 -0000	1.2
@@ -1,4 +1,6 @@
 <master>
 <property name="title">@title;noquote@</property>
 <property name="context">@context;noquote@</property>
+
+<h1>@current_info.label@</h1>
 <include src="@wizard:current_url@">
Index: openacs-4/packages/layout-managed-subsite/www/admin/layouts/configure.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/layout-managed-subsite/www/admin/layouts/configure.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/layout-managed-subsite/www/admin/layouts/configure.tcl	26 Nov 2008 11:10:23 -0000	1.1
+++ openacs-4/packages/layout-managed-subsite/www/admin/layouts/configure.tcl	1 Dec 2008 20:16:18 -0000	1.2
@@ -13,20 +13,21 @@
 # Now set up the wizard and off we go into configuration ecstasy!
 
 template::wizard::create -action configure -name configure -params {} -steps {
-    1 -label "Welcome to the Layout Manager Configuration Wizard" -url /packages/layout-managed-subsite/lib/configure-help
-    2 -label "Configure Private Page Sets" -url /packages/layout-managed-subsite/lib/configure-private-pagesets
-    3 -label "Configure User Control Over Appearance" -url /packages/layout-managed-subsite/lib/configure-configurability
-    4 -label "Add Applications" -url /packages/layout-managed-subsite/lib/add-applications
-    5 -label "Configure Master Page Set Layout" -url /packages/layout-manager/lib/pageset-configure
-    6 -label "Configure Subsite Integration" -url /packages/layout-managed-subsite/lib/configure-subsite-integration
-    100 -label "Congratulations! Configuration Is Complete" -url /packages/layout-managed-subsite/lib/configure-finish
+    1 -label "[_ layout-managed-subsite.Welcome]" -url /packages/layout-managed-subsite/lib/configure-help
+    2 -label "[_ layout-managed-subsite.Configure_Private_Page_Sets]" -url /packages/layout-managed-subsite/lib/configure-private-pagesets
+    3 -label "[_ layout-managed-subsite.Configure_User_Control]" -url /packages/layout-managed-subsite/lib/configure-configurability
+    4 -label "[_ layout-managed-subsite.Add_Applications_and_Includelets]" -url /packages/layout-managed-subsite/lib/add-applications
+    5 -label "[_ layout-managed-subsite.Configure_Master]" -url /packages/layout-manager/lib/pageset-configure
+    6 -label "[_ layout-managed-subsite.Configure_Subsite]" -url /packages/layout-managed-subsite/lib/configure-subsite-integration
+    100 -label "[_ layout-managed-subsite.Congratulations]" -url /packages/layout-managed-subsite/lib/configure-finish
 }
 
 template::wizard::get_current_step
 
 # Beautify the context bar and title with the current wizard step's label.
 
 array set current_info [array get wizard:${wizard:current_id}]]
+set foo [array get current_info]
 set title $current_info(label)
 set context [list $title]