Point access keys to top instead of bottom; works better except no access keys will...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13446 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/read_body.php b/src/read_body.php
index f8fde2ed85dc07339cffc41cb4d721df315eee6f..1e8646a7016e355bc76bd9e3b986921eb66dc45d 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -666,29 +666,20 @@ function formatMenubar($aMailbox, $passed_id, $passed_ent_id, $message,
         $oTemplate->assign('can_be_copied', false);
     }
 
-    // access keys... only add to the bottom menubar, because adding
+    // access keys... only add to the top menubar, because adding
     // them twice makes them less functional (press access key, *then*
-    // press <enter> to make it work), and we always have a bottom
-    // menubar, even on the non-JavaScript printable screen
+    // press <enter> to make it work)
     //
-    // the one exception we'll make to this is the "move to" (folder
-    // selection) since the user can get confused if the focus for
-    // that access key does not land in the folder select widget at
-    // the top of the page
-    //
-    // FIXME: this also can be confusing for the "as attachment" and "bypass trash" checkboxes, but they are not being excepted like "move to" because pressing their access keys will only focus on them and not check them, which might be even more confusing to naive users or those that can't see the focus indication on the checkbox - this is a compromise, the best I can think of at this time
-    //
-    global $accesskey_read_msg_move_to;
-    if (!$nav_on_top) {
+    if ($nav_on_top) {
         global $accesskey_read_msg_reply, $accesskey_read_msg_reply_all,
                $accesskey_read_msg_forward, $accesskey_read_msg_as_attach,
                $accesskey_read_msg_delete, $accesskey_read_msg_bypass_trash,
-               $accesskey_read_msg_move;
+               $accesskey_read_msg_move, $accesskey_read_msg_move_to;
     } else {
         $accesskey_read_msg_reply = $accesskey_read_msg_reply_all =
         $accesskey_read_msg_forward = $accesskey_read_msg_as_attach =
         $accesskey_read_msg_delete = $accesskey_read_msg_bypass_trash =
-        $accesskey_read_msg_move = 'NONE';
+        $accesskey_read_msg_move = $accesskey_read_msg_move_to = 'NONE';
     }
     $oTemplate->assign('accesskey_read_msg_reply', $accesskey_read_msg_reply);
     $oTemplate->assign('accesskey_read_msg_reply_all', $accesskey_read_msg_reply_all);