Index: openacs-4/packages/dotlrn/install.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/install.xml,v
diff -u -r1.14.2.3 -r1.14.2.4
--- openacs-4/packages/dotlrn/install.xml	30 Mar 2007 12:43:36 -0000	1.14.2.3
+++ openacs-4/packages/dotlrn/install.xml	17 Apr 2007 18:55:13 -0000	1.14.2.4
@@ -24,10 +24,10 @@
 
     <set-parameter package-key="acs-subsite" name="DefaultMaster" value="/packages/theme-zen/lib/lrn-master"/>
 
-    <set-parameter-default package-key="dotlrn" name="class_instance_pages_csv" value="#dotlrn.class_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.class_page_home_accesskey#;#dotlrn.class_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_calendar_accesskey#;#dotlrn.class_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_file_storage_accesskey#"/>
-    <set-parameter-default package-key="dotlrn" name="club_pages_csv" value="#dotlrn.club_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.club_page_home_accesskey#;#dotlrn.club_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_calendar_accesskey#;#dotlrn.club_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_file_storage_accesskey#;#dotlrn.club_page_people_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_people_accesskey#"/>
-    <set-parameter-default package-key="dotlrn" name="subcomm_pages_csv" value="#dotlrn.subcomm_page_home_title,#theme-zen.Zen_thin_thick#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_file_storage_accesskey#"/>
-    <set-parameter-default package-key="dotlrn" name="user_portal_pages_csv" value="#dotlrn.user_portal_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.user_portal_page_home_accesskey#;#dotlrn.user_portal_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_calendar_accesskey#;#dotlrn.user_portal_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_file_storage_accesskey#"/>
+    <set-parameter-default package-key="dotlrn" name="class_instance_pages_csv" value="#dotlrn.class_page_home_title#,#theme-zen.Zen_2_column#,#dotlrn.class_page_home_accesskey#;#dotlrn.class_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_calendar_accesskey#;#dotlrn.class_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_file_storage_accesskey#"/>
+    <set-parameter-default package-key="dotlrn" name="club_pages_csv" value="#dotlrn.club_page_home_title#,#theme-zen.Zen_2_column#,#dotlrn.club_page_home_accesskey#;#dotlrn.club_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_calendar_accesskey#;#dotlrn.club_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_file_storage_accesskey#;#dotlrn.club_page_people_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_people_accesskey#"/>
+    <set-parameter-default package-key="dotlrn" name="subcomm_pages_csv" value="#dotlrn.subcomm_page_home_title,#theme-zen.Zen_2_column#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_file_storage_accesskey#"/>
+    <set-parameter-default package-key="dotlrn" name="user_portal_pages_csv" value="#dotlrn.user_portal_page_home_title#,#theme-zen.Zen_2_column#,#dotlrn.user_portal_page_home_accesskey#;#dotlrn.user_portal_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_calendar_accesskey#;#dotlrn.user_portal_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_file_storage_accesskey#"/>
     <set-parameter-default package-key="dotlrn" name="DefaultSiteTemplate" value="#theme-zen.Zen_Theme#"/>
 
     <mount package="dotlrn" mount-point="/dotlrn" instance-name="dotLRN"/>
Index: openacs-4/packages/theme-zen/theme-zen.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/theme-zen.info,v
diff -u -r1.1.2.15 -r1.1.2.16
--- openacs-4/packages/theme-zen/theme-zen.info	15 Apr 2007 16:00:11 -0000	1.1.2.15
+++ openacs-4/packages/theme-zen/theme-zen.info	17 Apr 2007 18:55:13 -0000	1.1.2.16
@@ -26,7 +26,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="communityCssUrl"  default="/resources/theme-zen/css/color/purple.css" description="default community css_url"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="courseCssUrl"  default="/resources/theme-zen/css/color/green.css" description="default class css_url"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="CssUrl"  default="/resources/theme-zen/css/color/blue.css" description="default css_url"/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="dotLRNToZenMap"  default="#new-portal.simple_1column_layout_name# #theme-zen.Zen_1_column# #new-portal.simple_2column_layout_name# #theme-zen.Zen_thin_thick# #new-portal.simple_3column_layout_name# #theme-zen.Zen_3_column#" description="list of old layout/new layout names used to update and existing .LRN site"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="dotLRNToZenMap"  default="#new-portal.simple_1column_layout_name# #theme-zen.Zen_1_column# #new-portal.simple_2column_layout_name# #theme-zen.Zen_2_column# #new-portal.simple_3column_layout_name# #theme-zen.Zen_3_column#" description="list of old layout/new layout names used to update and existing .LRN site"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="GenericCommunityTab"  default="0" description="Use a generic name for the community tab"/>
         </parameters>
 
Index: openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml,v
diff -u -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml	30 Mar 2007 23:51:37 -0000	1.1.2.8
+++ openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml	17 Apr 2007 18:55:13 -0000	1.1.2.9
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="theme-zen" package_version="2.3.0d2" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="theme-zen" package_version="2.3.0b1" locale="en_US" charset="ISO-8859-1">
 
-  <msg key="accessibility_note">Note that no software can check completely the accessibility of your website.</msg>
   <msg key="acc">ACC</msg>
-  <msg key="admin">Admin</msg>
+  <msg key="accessibility_note">Note that no software can check completely the accessibility of your website.</msg>
+  <msg key="admin">Class Admin</msg>
+  <msg key="begin_footer">Begin Footer</msg>
+  <msg key="begin_main_content">Begin Main Content</msg>
+  <msg key="begin_main_navigation">Begin Main Navigation</msg>
+  <msg key="begin_sub_navigation">Begin Sub Navigation</msg>
   <msg key="Communities">Communities</msg>
   <msg key="ControlPanel">Control Panel</msg>
   <msg key="Courses">Classes</msg>
@@ -18,6 +22,7 @@
   <msg key="MySpace">My Space</msg>
   <msg key="online">online</msg>
   <msg key="Preferences">Preferences</msg>
+  <msg key="skip_to_main_content">Skip To Main Content</msg>
   <msg key="std">STD</msg>
   <msg key="Tools">Tools</msg>
   <msg key="upgrade">Upgrade</msg>
Index: openacs-4/packages/theme-zen/lib/lrn-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.adp,v
diff -u -r1.1.2.17 -r1.1.2.18
--- openacs-4/packages/theme-zen/lib/lrn-master.adp	31 Mar 2007 00:36:17 -0000	1.1.2.17
+++ openacs-4/packages/theme-zen/lib/lrn-master.adp	17 Apr 2007 18:55:13 -0000	1.1.2.18
@@ -13,7 +13,7 @@
     </else>
 
 <div id="wrapper">
-  <div id="skiptocontent"><a href="#content-wrapper" title="skip to main content" accesskey="k">Skip to Main Content</a></div>
+  <div id="skiptocontent"><a href="#content-wrapper" title="#theme-zen.skip_to_main_content#" accesskey="k">#theme-zen.skip_to_main_content#</a></div>
   <div id="header">
     <div id="logo">
       <img src="/resources/theme-zen/images/global/dotLRN-logo.gif" alt=".LRN" width="82" height="45" />
@@ -49,12 +49,6 @@
           <a href="#" onclick="setActiveStyleSheet('highContrast'); return false;"
              title="switch to High Contrast">
             #theme-zen.hc#
-          </a>
-        </li> 
-        <li>
-          <a href="#" onclick="setActiveStyleSheet('508'); return false;"
-             title="switch to 508">
-            #theme-zen.acc#
           </a> |
         </li> 
         <if @untrusted_user_id@ ne 0>
@@ -93,19 +87,19 @@
   </div> <!-- /header -->
 
   <div id="main-navigation">
-    <div class="block-marker">Begin main navigation</div>
+    <div class="block-marker">#theme-zen.begin_main_navigation#</div>
       <if @navbar@ not nil>@navbar;noquote@</if> 
   </div>
 
   <if @subnavbar@ not nil>
     <div id="sub-navigation">
-      <div class="block-marker">Begin sub navigation</div>
+      <div class="block-marker">#theme-zen.begin_sub_navigation#</div>
       @subnavbar;noquote@
     </div>
   </if>
 
   <div id="content-wrapper">
-    <div class="block-marker">Begin main content</div>
+    <div class="block-marker">#theme-zen.begin_main_content#</div>
     <div id="inner-wrapper">
 
       <if @user_messages:rowcount@ gt 0>
@@ -136,7 +130,7 @@
   </div> <!-- /content-wrapper -->
 
   <div id="footer">
-    <div class="block-marker">Begin footer</div>
+    <div class="block-marker">#theme-zen.begin_footer#</div>
     <div id="footer-links">
       <ul class="compact">
         <li>#dotlrn.A_dotlrn_Site#</li>
Index: openacs-4/packages/theme-zen/www/admin/upgrade.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/admin/upgrade.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/theme-zen/www/admin/upgrade.tcl	30 Mar 2007 23:51:38 -0000	1.1.2.1
+++ openacs-4/packages/theme-zen/www/admin/upgrade.tcl	17 Apr 2007 18:55:14 -0000	1.1.2.2
@@ -58,9 +58,7 @@
     db_1row get_theme {}
     db_dml update_theme {}
 
-    foreach {old new} {#new-portal.simple_1column_layout_name# #theme-zen.Zen_1_column#
-                       #new-portal.simple_2column_layout_name# #theme-zen.Zen_thin_thick#
-                       #new-portal.simple_3column_layout_name# #theme-zen.Zen_thin_thick_thin#} {
+    foreach {old new} [parameter::get -package_id [ad_conn package_id] -parameter dotLRNToZenMap] {
         db_1row get_old {}
         db_1row get_new {}
         db_dml update_layouts {}