Index: openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl,v
diff -u -r1.43.2.2 -r1.43.2.3
--- openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	20 Feb 2007 16:57:48 -0000	1.43.2.2
+++ openacs-4/packages/acs-lang/tcl/lang-util-procs.tcl	21 Feb 2007 00:00:03 -0000	1.43.2.3
@@ -366,9 +366,8 @@
     @param locale  Name of a locale, as language_COUNTRY using ISO 639 and ISO 3166
     @return        IANA MIME character set name
 } {
-    # LARS:
-    # This should probably be cached
-    return [db_string charset_for_locale {}]
+    # DRB: cache this now that ad_conn tracks it
+    return [db_string -cache_key ad_lang_mime_charset_$locale charset_for_locale {}]
 }
 
 ad_proc -private lang::util::default_locale_from_lang_not_cached { 
Index: openacs-4/packages/acs-lang/www/admin/locale-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/www/admin/locale-edit.tcl,v
diff -u -r1.7.6.2 -r1.7.6.3
--- openacs-4/packages/acs-lang/www/admin/locale-edit.tcl	20 Feb 2007 16:57:48 -0000	1.7.6.2
+++ openacs-4/packages/acs-lang/www/admin/locale-edit.tcl	21 Feb 2007 00:00:03 -0000	1.7.6.3
@@ -153,6 +153,7 @@
             where locale = :locale"
 
     }
+    db_flush_cache -cache_key_pattern ad_lang_mime_charset_$locale
     forward "index?tab=locales"
 
 }
Index: openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl,v
diff -u -r1.85.2.2 -r1.85.2.3
--- openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	20 Feb 2007 16:57:49 -0000	1.85.2.2
+++ openacs-4/packages/acs-tcl/tcl/request-processor-procs.tcl	21 Feb 2007 00:00:03 -0000	1.85.2.3
@@ -645,6 +645,7 @@
     if { [catch {
         ad_conn -set locale [lang::conn::locale]
         ad_conn -set language [lang::conn::language]
+        ad_conn -set charset [lang::util::charset_for_locale [ad_conn locale]] 
     }] } {
         # acs-lang doesn't seem to be installed. Even though it must be installed now,
         # the problem is that if it isn't, everything breaks. So we wrap it in
@@ -653,6 +654,7 @@
         # to assume that most people have added acs-lang to their system.
         ad_conn -set locale ""
         ad_conn -set language ""
+        ad_conn -set charset ""
     }
 
     # Who's online
Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.47.2.2 -r1.47.2.3
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	20 Feb 2007 16:57:49 -0000	1.47.2.2
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	21 Feb 2007 00:00:03 -0000	1.47.2.3
@@ -38,6 +38,7 @@
   <msg key="Administer">Administer</msg>
   <msg key="administer_link">&lt;img border=0 valign=&quot;bottom&quot; src=&quot;/resources/dotlrn/admin.gif&quot; alt=&quot;Administer&quot;&gt;</msg>
   <msg key="Administration">Administration</msg>
+  <msg key="Administration_Accesskey">a</msg>
   <msg key="Administration_Cockpit">Administration Cockpit</msg>
   <msg key="Administrator">Administrator</msg>
   <msg key="Administrators">Administrators</msg>
@@ -104,6 +105,7 @@
   <msg key="Cockpit">Cockpit</msg>
   <msg key="Comma_Separated_Values">Comma Separated Values</msg>
   <msg key="Communities">Communities</msg>
+  <msg key="Communities_Accesskey">m</msg>
   <msg key="Community">Community</msg>
   <msg key="community_header_name">%clubs_pretty_name% Name</msg>
   <msg key="Community_ID">Community ID</msg>
@@ -125,13 +127,15 @@
   <msg key="Confirm_Drop">Confirm Drop</msg>
   <msg key="Confirmation">Confirmation</msg>
   <msg key="control_panel">Control Panel</msg>
+  <msg key="control_panel_accesskey">p</msg>
   <msg key="Copy">Copy</msg>
   <msg key="couldnt_find_user_id">We couldn't find user #%user_id%; perhaps this person was deleted?</msg>
   <msg key="course_admin_role_pretty_name">Course Administrator</msg>
   <msg key="course_admin_role_pretty_plural">Course Administrators</msg>
   <msg key="course_assistant_role_pretty_name">Course Assistant</msg>
   <msg key="course_assistant_role_pretty_plural">Course Assistants</msg>
   <msg key="Courses">Courses</msg>
+  <msg key="Courses_Accesskey">r</msg>
   <msg key="Create_A_New_User">Create A New User</msg>
   <msg key="Create_a_Web_Log">Create a Web Log</msg>
   <msg key="Create_Club">Create Club</msg>
@@ -219,7 +223,6 @@
   <msg key="From">From</msg>
   <msg key="fuchsia">fuchsia</msg>
   <msg key="Full">Full</msg>
-  <msg key="full">full</msg>
   <msg key="Full_Access">Full Access</msg>
   <msg key="General_Information">General Information</msg>
   <msg key="General_Site_Help">General Site Help</msg>
@@ -255,6 +258,7 @@
   <msg key="help">Help</msg>
   <msg key="hide_lrn_toolbar">Hide .LRN toolbar</msg>
   <msg key="Home">Home</msg>
+  <msg key="Home_Accesskey">h</msg>
   <msg key="HTML">HTML</msg>
   <msg key="ID">ID:</msg>
   <msg key="ID_1">ID</msg>
@@ -569,9 +573,6 @@
   <msg key="Send_Date">Send Date</msg>
   <msg key="send_email">Send Email</msg>
   <msg key="Send_to_all">Send to everyone in the group</msg>
-  <msg key="Send_to_the_following_members">In addition, send to the following people (if you have not selected &quot;Send to Everyone&quot; above):</msg>
-  <msg key="Send_to_the_following_roles">Send to the following roles:</msg>
-  <msg key="set_all_screennames_where_null">Set all screenames where no screenname is set</msg>
   <msg key="Shared_Files">Shared Files</msg>
   <msg key="show_lrn_toolbar">Show .LRN Toolbar</msg>
   <msg key="silver">silver</msg>
@@ -597,7 +598,6 @@
   <msg key="Site_Templates_Template_AdminParams">Parameters Administration</msg>
   <msg key="Small">Small</msg>
   <msg key="Sorry">Sorry!</msg>
-  <msg key="Spam">Spam</msg>
   <msg key="Spam_">Spam ...</msg>
   <msg key="Spam_Community">Spam Community</msg>
   <msg key="Spam_Users">Spam Users</msg>
@@ -674,9 +674,7 @@
   <msg key="Yes">Yes</msg>
   <msg key="yes">yes</msg>
   <msg key="Yes_delete">Yes, delete</msg>
-  <msg key="Yes_delete_members">Yes, delete memberships</msg>
   <msg key="Yes_Im_sure">Yes, I'm sure.</msg>
-  <msg key="Yes_keep_members">Yes, keep memberships</msg>
   <msg key="You_can_specify_colors_by_name">You can specify colors by name</msg>
   <msg key="you_need_to_create_terms_to_create_classes">&lt;b&gt;Note:&lt;/b&gt; You must create &lt;a href=&quot;%terms_url%&quot;&gt;%terms_pretty_plural%&lt;/a&gt; to be able to create %class_instances_pretty_plural%, since these must be associated with %terms_pretty_plural%.</msg>
   <msg key="your_icon_is_too_large">Your icon is too large. The publisher of %system_name% has chosen to limit attachments to %max_attachments_bytes% bytes.\n</msg>
Index: openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml,v
diff -u -r1.17.2.1 -r1.17.2.2
--- openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml	20 Feb 2007 16:57:50 -0000	1.17.2.1
+++ openacs-4/packages/new-portal/catalog/new-portal.en_US.ISO-8859-1.xml	21 Feb 2007 00:00:03 -0000	1.17.2.2
@@ -46,5 +46,4 @@
   <msg key="sloan_theme_name">Sloan</msg>
   <msg key="transaction_failed">transaction failed</msg>
   <msg key="Unused_Portlets">Unused Portlets</msg>
-  <msg key="when_portlet_shaded">Maximize window to display content</msg>
 </message_catalog>
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.3 -r1.1.2.4
--- openacs-4/packages/theme-zen/theme-zen.info	20 Feb 2007 16:57:51 -0000	1.1.2.3
+++ openacs-4/packages/theme-zen/theme-zen.info	21 Feb 2007 00:00:03 -0000	1.1.2.4
@@ -22,7 +22,7 @@
             <callback type="before-uninstall"  proc="theme_zen::apm::before_uninstall"/>
         </callbacks>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="AdditionalNavbarTabs"  default="/dotlrn/ #dotlrn.Home# /dotlrn/courses #dotlrn.Courses# /dotlrn/communities #dotlrn.Communities# /dotlrn/control-panel #dotlrn.control_panel#" description="list of URL Names pairs which will make it into additional navbar tabs"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1" name="AdditionalNavbarTabs"  default="/dotlrn/ #dotlrn.Home# #dotlrn.Home_Accesskey# /dotlrn/courses #dotlrn.Courses# #dotlrn.Courses_Accesskey# /dotlrn/communities #dotlrn.Communities# #dotlrn.Communities_Accesskey# /dotlrn/control-panel #dotlrn.control_panel# #dotlrn.control_panel_accesskey#" description="list of URL Names pairs which will make it into additional navbar tabs"/>
         </parameters>
 
     </version>
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.6 -r1.1.2.7
--- openacs-4/packages/theme-zen/lib/lrn-master.adp	20 Feb 2007 16:57:51 -0000	1.1.2.6
+++ openacs-4/packages/theme-zen/lib/lrn-master.adp	21 Feb 2007 00:00:02 -0000	1.1.2.7
@@ -100,11 +100,13 @@
     </div>
   </div>
 
-  <div id="sub-navigation">
-    <div class="block-marker">Begin sub navigation</div>
-      <if @subnavbar@ not nil>@subnavbar;noquote@</if>         
+  <if @subnavbar@ not nil>
+    <div id="sub-navigation">
+      <div class="block-marker">Begin sub navigation</div>
+        @subnavbar;noquote@
+      </div>
     </div>
-  </div>
+  </if>
 
   <div id="content-wrapper">
     <div class="block-marker">Begin main content</div>
Index: openacs-4/packages/theme-zen/lib/lrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.tcl,v
diff -u -r1.1.2.8 -r1.1.2.9
--- openacs-4/packages/theme-zen/lib/lrn-master.tcl	20 Feb 2007 16:57:51 -0000	1.1.2.8
+++ openacs-4/packages/theme-zen/lib/lrn-master.tcl	21 Feb 2007 00:00:02 -0000	1.1.2.9
@@ -260,14 +260,15 @@
 	-post_html $extra_spaces \
         -link_all $link_all
     ]
+ns_log Notice "Huh? subnavbar: '$subnavbar'"
 } else {
-    set navbar " "
-    set subnavbar " "
+    set navbar ""
+    set subnavbar ""
 }
 
 
-append header_stuff {
-<meta http-equiv="content-type" content="text/html; charset=iso-8859-1">
+append header_stuff [subst {
+<meta http-equiv="content-type" content="text/html; charset=[ad_conn charset]">
 <meta name="robots" content="all">
 <meta name="keywords" content="accessibility, portals, elearning, design">
 <link rel="stylesheet" type="text/css" href="/resources/theme-zen/css/main.css" media="screen">
@@ -276,7 +277,7 @@
 <link rel="alternate stylesheet" type="text/css" href="/resources/theme-zen/css/highContrast.css" title="highContrast">
 <link rel="alternate stylesheet" type="text/css" href="/resources/theme-zen/css/508.css" title="508">
 <script type="text/javascript" src="/resources/theme-zen/js/styleswitcher.js"></script>
-}
+}]
 
 if { [info exists text] } {
     set text [lang::util::localize $text]
Index: openacs-4/packages/theme-zen/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/tcl/navigation-procs.tcl,v
diff -u -r1.1.2.4 -r1.1.2.5
--- openacs-4/packages/theme-zen/tcl/navigation-procs.tcl	20 Feb 2007 16:57:51 -0000	1.1.2.4
+++ openacs-4/packages/theme-zen/tcl/navigation-procs.tcl	21 Feb 2007 00:00:02 -0000	1.1.2.5
@@ -82,8 +82,8 @@
         set which_tab 0
         set home_tab -1
 
-	foreach {url name} [parameter::get_from_package_key -package_key "theme-zen" -parameter "AdditionalNavbarTabs" -default ""] {
-	    lappend tabs_list [list $url $name]
+	foreach {url name accesskey} [parameter::get_from_package_key -package_key "theme-zen" -parameter "AdditionalNavbarTabs" -default ""] {
+	    lappend tabs_list [list $url $name $accesskey]
             if { $current_url == $url ||
                  $current_url == "$dotlrn_url/index" && $name eq "#dotlrn.Home#" } {
                 set which_tab_selected $which_tab
@@ -95,7 +95,7 @@
 	}
 
 	if { $sw_admin_p } {
-	    lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration#]
+	    lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration# #dotlrn.Administration_Accesskey#]
             if { [string first $dotlrn_admin_url $current_url] != -1 } {
                 set which_tab_selected $which_tab
             }
@@ -144,13 +144,14 @@
 
         set which_tab 0
 	foreach tab_entry $tabs_list {
-            foreach {url name select_p} $tab_entry {}
+            foreach {url name accesskey} $tab_entry {}
 	    ns_log Debug "URL:: $url"
 	    ns_log Debug "NAME:: $name"
+	    ns_log Debug "ACCESSKEY:: $accesskey"
 	    if { $which_tab == $which_tab_selected } {
-		append navbar "\n<li class=\"main-navigation-active\"><a href=\"$url\" title=\"[_ theme-zen.goto_tab_name]\" accesskey=\"h\">[lang::util::localize $name]</a></li>"
+		append navbar "\n<li class=\"main-navigation-active\"><a href=\"$url\" title=\"[_ theme-zen.goto_tab_name]\" accesskey=\"$accesskey\">[lang::util::localize $name]</a></li>"
 	    } else {
-		append navbar "\n<li><a href=\"$url\" title=\"[_ theme-zen.goto_tab_name]\">[lang::util::localize $name]</a></li>"
+		append navbar "\n<li><a href=\"$url\" title=\"[_ theme-zen.goto_tab_name]\" accesskey=\"$accesskey\">[lang::util::localize $name]</a></li>"
 	    }
 	    incr which_tab 
 	}
@@ -252,8 +253,8 @@
 	    regsub -all {[^0-9]} $page_num {} page_num
 	}
 	
-	set subnavbar "<ul>\n"
 	
+        set subnavbar ""
 	db_foreach list_page_nums_select {} {
 	    if {[string equal $page_num $sort_key]} {
 		append subnavbar "\n<li class=\"sub-navigation-active\"><a href=\"$link?page_num=$sort_key\" title=\"[_ theme-zen.goto_portal_page_pretty_name]\">$pretty_name</a> </li>"
@@ -270,8 +271,10 @@
 	    }
 	}
 
-	append subnavbar "</ul>"
-
+        if { $subnavbar eq "" } {
+            return ""
+        } else {
+            return "<ul>\n${subnavbar}\n</ul>\n"
+        }
     }
-
 }