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 -r1.47.2.1
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	15 Dec 2006 22:45:21 -0000	1.47
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	19 Feb 2007 17:57:42 -0000	1.47.2.1
@@ -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>
@@ -254,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>
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.1 -r1.1.2.2
--- openacs-4/packages/theme-zen/theme-zen.info	21 Jan 2007 03:07:12 -0000	1.1.2.1
+++ openacs-4/packages/theme-zen/theme-zen.info	19 Feb 2007 17:57:43 -0000	1.1.2.2
@@ -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/layouts/zen2.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen2.adp,v
diff -u -r1.1.2.2 -r1.1.2.3
--- openacs-4/packages/theme-zen/lib/layouts/zen2.adp	6 Feb 2007 02:51:27 -0000	1.1.2.2
+++ openacs-4/packages/theme-zen/lib/layouts/zen2.adp	19 Feb 2007 17:57:43 -0000	1.1.2.3
@@ -20,9 +20,9 @@
       
 <div id="sidebar-1">
   <div class="sidebar-1-padding">
-    <list name="element_ids_2">
+    <list name="element_ids_1">
       <include src="@element_src@"
-        element_id="@element_ids_2:item@"
+        element_id="@element_ids_1:item@"
         action_string="@action_string@"
         theme_id="@theme_id@"
         region="2"
@@ -39,9 +39,9 @@
       
   <div id="main-content">
     <div class="main-content-padding">
-      <list name="element_ids_1">
+      <list name="element_ids_2">
         <include src="@element_src@"
-                 element_id="@element_ids_1:item@"
+                 element_id="@element_ids_2:item@"
                  action_string="@action_string@"
                  theme_id="@theme_id@"
                  region="1"
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.1 -r1.1.2.2
--- openacs-4/packages/theme-zen/tcl/navigation-procs.tcl	23 Jan 2007 01:03:07 -0000	1.1.2.1
+++ openacs-4/packages/theme-zen/tcl/navigation-procs.tcl	19 Feb 2007 17:57:43 -0000	1.1.2.2
@@ -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 
 	}