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 -N -r1.2 -r1.2.2.1
--- openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml	15 May 2007 20:14:55 -0000	1.2
+++ openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml	21 May 2008 17:59:19 -0000	1.2.2.1
@@ -1,29 +1,41 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="theme-zen" package_version="2.3.0b1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="theme-zen" locale="en_US" charset="ISO-8859-1">
 
   <msg key="acc">ACC</msg>
+  <msg key="Access_key">Access Key</msg>
+  <msg key="Access_keys">Access Keys</msg>
+  <msg key="Access_keys_can_be_used_">Access keys can be used to move quickly through the main sections of the site. If you are using Windows, press the &quot;Alt&quot; key and the corresponding access key. Mac users have to press the &quot;ctrl&quot; key instead of the &quot;Alt&quot; one. Depending on the browser you're using, you might have to press also &quot;Enter&quot; afterwards.</msg>
+  <msg key="Accessibility">Accessibility</msg>
   <msg key="accessibility_note">Note that no software can check completely the accessibility of your website.</msg>
+  <msg key="Accessibility_page">Accessibility Page</msg>
   <msg key="admin">Class Admin</msg>
+  <msg key="Associated_page">Associated Page</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="Change_Contrast">Change Contrast</msg>
   <msg key="Communities">Communities</msg>
   <msg key="ControlPanel">Control Panel</msg>
   <msg key="Courses">Classes</msg>
+  <msg key="Default_Colors">Default colors</msg>
   <msg key="dotlrn_Home">.LRN Home</msg>
   <msg key="dotlrn_Project_Central">.LRN Project Central</msg>
   <msg key="goto_admin_page">Go to Admin page</msg>
   <msg key="goto_admin_page_accesskey">A</msg>
   <msg key="goto_portal_page_pretty_name">Go to %pretty_name% page</msg>
   <msg key="goto_tab_name">Go to %name%</msg>
   <msg key="hc">HC</msg>
+  <msg key="High_Contrast">High contrast</msg>
   <msg key="Logout">Logout</msg>
   <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="switch_to_default_colors">Switch to default colors</msg>
+  <msg key="switch_to_high_contrast">Switch to high contrast</msg>
+  <msg key="The_following_styles_are_">The following styles are available:</msg>
   <msg key="Tools">Tools</msg>
   <msg key="upgrade">Upgrade</msg>
   <msg key="upgrade_finished">The upgrade to the Zen theme has been successfully completed.</msg>
Index: openacs-4/packages/theme-zen/catalog/theme-zen.es_ES.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/catalog/theme-zen.es_ES.ISO-8859-1.xml,v
diff -u -N -r1.2 -r1.2.2.1
--- openacs-4/packages/theme-zen/catalog/theme-zen.es_ES.ISO-8859-1.xml	15 May 2007 20:14:55 -0000	1.2
+++ openacs-4/packages/theme-zen/catalog/theme-zen.es_ES.ISO-8859-1.xml	21 May 2008 17:59:19 -0000	1.2.2.1
@@ -1,29 +1,41 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="theme-zen" package_version="2.3.0b1" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="theme-zen" locale="es_ES" charset="ISO-8859-1">
 
   <msg key="acc">ACC</msg>
+  <msg key="Access_key">Atajo de Teclado</msg>
+  <msg key="Access_keys">Atajos de Teclado</msg>
+  <msg key="Access_keys_can_be_used_">Puede utilizar atajos de teclado para moverse con comodidad por todo el sitio. Si est� utilizando Windows, presiona la tecla &quot;Alt&quot; junto con el atajo que corresponda, para consultar la p�gina a la que quiera acceder. Los usuarios de Macintosh han de presionar, sin embargo, la tecla &quot;Ctrl&quot;. Con algunos navegadores tendr�, adem�s, que presionar la tecla &quot;Intro&quot;.</msg>
+  <msg key="Accessibility">Accesibilidad</msg>
   <msg key="accessibility_note">Notese que ning�n software puede comprobar totalmente la accesibilidad de su sitio web.</msg>
+  <msg key="Accessibility_page">P�gina sobre Accesibilidad</msg>
   <msg key="admin">Admin</msg>
+  <msg key="Associated_page">P�gina Asociada</msg>
   <msg key="begin_footer">Inicio del Pie de P�gina</msg>
   <msg key="begin_main_content">Inicio del Contenido Principal</msg>
   <msg key="begin_main_navigation">Inicio de la Navegaci�n Principal</msg>
   <msg key="begin_sub_navigation">Inicio de la Subnavegaci�n</msg>
+  <msg key="Change_Contrast">Cambiar el Contraste</msg>
   <msg key="Communities">Comunidades</msg>
   <msg key="ControlPanel">Panel de Control</msg>
   <msg key="Courses">Cursos</msg>
+  <msg key="Default_Colors">Colores por defecto</msg>
   <msg key="dotlrn_Home">Sitio web de .LRN</msg>
   <msg key="dotlrn_Project_Central">Proyecto .LRN</msg>
   <msg key="goto_admin_page">Ir a la p�gina de administraci�n</msg>
   <msg key="goto_admin_page_accesskey">A</msg>
   <msg key="goto_portal_page_pretty_name">Ir a %pretty_name%</msg>
   <msg key="goto_tab_name">Ir a %name%</msg>
   <msg key="hc">HC</msg>
+  <msg key="High_Contrast">Alto contraste</msg>
   <msg key="Logout">Salir</msg>
   <msg key="MySpace">Mi Espacio</msg>
   <msg key="online">conectado</msg>
   <msg key="Preferences">Preferencias</msg>
   <msg key="skip_to_main_content">Saltar al Contenido Principal</msg>
   <msg key="std">STD</msg>
+  <msg key="switch_to_default_colors">Usar colores por defecto</msg>
+  <msg key="switch_to_high_contrast">Usar alto contraste</msg>
+  <msg key="The_following_styles_are_">Los siguientes estilos est�n disponibles:</msg>
   <msg key="Tools">Herramientas</msg>
   <msg key="upgrade">Actualizar</msg>
   <msg key="upgrade_finished">La actualizaci�n del tema Zen ha sido completada con �xito.</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 -N -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/theme-zen/lib/lrn-master.adp	27 Mar 2008 13:56:41 -0000	1.7.2.1
+++ openacs-4/packages/theme-zen/lib/lrn-master.adp	21 May 2008 17:59:19 -0000	1.7.2.2
@@ -4,8 +4,13 @@
   <if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
   <if @doc@ defined><property name="&doc">doc</property></if>
 
+<div id="skiptocontent">
+  <p>
+    <a href="#content-wrapper" title="#theme-zen.skip_to_main_content#" accesskey="2">#theme-zen.skip_to_main_content#</a> | <a href="/theme-zen/accessibility" title="#theme-zen.Accessibility_page#" accesskey="0">#theme-zen.Accessibility#</a>
+  </p>
+</div>
+
 <div id="wrapper">
-  <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">
       <if @img_attrib@ not nil>
@@ -17,37 +22,23 @@
         <if @untrusted_user_id@ ne 0>
           <li>
             <!-- user greeting or login message -->
-            #acs-subsite.Welcome_user# |
+            #acs-subsite.Welcome_user#
           </li>
           <li>
             <a href="@whos_online_url@" title="#acs-subsite.Whos_Online_link_label#">
-              @num_users_online@
+              | @num_users_online@
               <if @num_users_online@ eq 1>
                 #acs-subsite.Member#
               </if>
               <else>
                 #acs-subsite.Members#
               </else>
-              #theme-zen.online# |
+              #theme-zen.online#
             </a>
           </li>
-        </if>
-		<li>
-          <!-- DRB: currently std doesn't exist, this just switches to non-alt styles -->
-          <a href="#" onclick="setActiveStyleSheet('std'); return false;"
-             title="switch to standard layout">
-            #theme-zen.std#
-          </a>
-        </li>
-        <li>
-          <a href="#" onclick="setActiveStyleSheet('highContrast'); return false;"
-             title="switch to High Contrast">
-            #theme-zen.hc#
-          </a> |
-        </li> 
-        <if @untrusted_user_id@ ne 0>
           <li>
-            <a href="@logout_url@" title="#acs-subsite.Logout_from_system#" accesskey="L">
+            | 
+            <a href="@logout_url@" title="#acs-subsite.Logout_from_system#">
               #acs-subsite.Logout# 
             </a>
           </li>
@@ -63,6 +54,7 @@
     </div>
 
     <div id="breadcrumbs">
+      <span class="screen-reader-only">#theme-zen.You_are_here#</span>
       <ul class="compact">
         <if @context:rowcount@ not nil>
           <multiple name="context">
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 -N -r1.3 -r1.3.2.1
--- openacs-4/packages/theme-zen/tcl/navigation-procs.tcl	7 Oct 2007 22:37:05 -0000	1.3
+++ openacs-4/packages/theme-zen/tcl/navigation-procs.tcl	21 May 2008 17:59:19 -0000	1.3.2.1
@@ -103,7 +103,7 @@
         }
 
         if { $dotlrn_admin_p } {
-            lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration# #dotlrn.Administration_Accesskey#]
+            lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration# 9]
             if { [string first $dotlrn_admin_url $current_url] != -1 } {
                 set which_tab_selected $which_tab
             }
Index: openacs-4/packages/theme-zen/www/accessibility.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/accessibility.adp,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/www/accessibility.adp	21 May 2008 17:59:19 -0000	1.1.2.1
@@ -0,0 +1,29 @@
+<master>
+<property name="context">@context@</property>
+<property name="title">@title@</property>
+
+<h1>#theme-zen.Accessibility#</h1>
+
+<h2>#theme-zen.Access_keys#</h2>
+<p>#theme-zen.Access_keys_can_be_used_#</p>
+
+<listtemplate name="zen_keys"></listtemplate>
+
+<h2>#theme-zen.Change_Contrast#</h2>
+
+<p>#theme-zen.The_following_styles_are_#</p>
+
+<ul>
+  <li>
+    <a href="#" onclick="setActiveStyleSheet('std'); return false;"
+      title="#theme-zen.switch_to_default_colors#">
+      #theme-zen.Default_Colors#
+    </a>
+  </li>
+  <li>
+    <a href="#" onclick="setActiveStyleSheet('highContrast'); return false;"
+      title="#theme-zen.switch_to_high_contrast#">
+      #theme-zen.High_Contrast#
+    </a>
+  </li>
+</ul>
Index: openacs-4/packages/theme-zen/www/accessibility.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/accessibility.tcl,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/theme-zen/www/accessibility.tcl	21 May 2008 17:59:19 -0000	1.1.2.1
@@ -0,0 +1,47 @@
+ad_page_contract {
+    
+    Page for information regarding accessibility features
+
+}
+
+set title [_ theme-zen.Accessibility]
+set context $title
+
+template::multirow create accesskeys name url key
+
+# Add fixed accesskeys
+template::multirow append accesskeys [_ theme-zen.Accessibility_page] "/theme-zen/accessibility" 0
+template::multirow append accesskeys [_ theme-zen.skip_to_main_content] "#content-wrapper" 2
+
+set dotlrn_admin_p [permission::permission_p \
+                        -party_id [ad_conn user_id] \
+                        -object_id [dotlrn::get_package_id] \
+                        -privilege admin]
+
+if { $dotlrn_admin_p } {
+    template::multirow append accesskeys [_ dotlrn.Administration] "[dotlrn::get_url]/admin" 9
+}
+
+# Now add the ones for the tabs (home should be 1)
+foreach {url name key} [parameter::get_from_package_key -package_key "theme-zen" -parameter "AdditionalNavbarTabs" -default ""] {
+
+    template::multirow append accesskeys $name $url $key
+
+}
+
+template::multirow sort accesskeys key
+
+template::list::create -name zen_keys -multirow accesskeys -elements {
+    key {
+        label "#theme-zen.Access_key#"
+        display_col key
+    }
+    page {
+        label "#theme-zen.Associated_page#"
+        display_col name
+        link_url_col url
+        link_html {title "@accesskeys.name@"}
+    }
+}
+
+ad_return_template
Index: openacs-4/packages/theme-zen/www/resources/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/main.css,v
diff -u -N -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/theme-zen/www/resources/css/main.css	27 Mar 2008 13:56:41 -0000	1.2.2.1
+++ openacs-4/packages/theme-zen/www/resources/css/main.css	21 May 2008 17:59:19 -0000	1.2.2.2
@@ -272,7 +272,30 @@
 
 
 /* SKIP */
- #skiptocontent a, #skiptocontent a:hover, #skiptocontent a:visited, .block-marker {
+#skiptocontent p, #skiptocontent a, #skiptocontent a:hover, #skiptocontent a:visited {
+	position:relative;
+	left:0px;
+	top:0px;
+	overflow:hidden;
+    background-color: #eeeeee;
+    color: #000000;
+}
+
+#skiptocontent p {
+  display: block;
+  margin-top: -3px;
+  margin-bottom: 3px;
+  margin-left: -10px;
+  border-bottom-width: 1px;
+  border-bottom-style: solid;
+  border-bottom-color: #999999;
+  text-align: left;
+  width:100%;
+  height: 1.5em;
+  padding-left: 1em;
+}
+
+.block-marker {
   position:absolute;
   left:0px;
   top:-500px;