From 450653355b4cddfff687a8969c1f8338f0b760ad Mon Sep 17 00:00:00 2001
From: Dave Cranwell <david@torchbox.com>
Date: Wed, 11 Feb 2015 12:52:29 +0000
Subject: [PATCH] tweaks to aid keyboard nav

---
 .../static/wagtailadmin/js/blocks/sequence.js |  3 ++-
 .../scss/layouts/page-editor.scss             | 19 +++++++++++++++++--
 .../wagtailadmin/block_forms/stream_menu.html |  2 +-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js b/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js
index 3b6054487..52e85b5f3 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js
+++ b/wagtail/wagtailadmin/static/wagtailadmin/js/blocks/sequence.js
@@ -14,7 +14,8 @@ For example, they don't assume the presence of a 'delete' button - it's up to th
 
         var indexField = $('#' + self.prefix + '-order');
 
-        self.menu.click(function(){
+        self.menu.click(function(e){
+            e.preventDefault();
             self.toggleMenu();
         });
 
diff --git a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
index f99dd5e3f..cf7b707ff 100644
--- a/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
+++ b/wagtail/wagtailadmin/static/wagtailadmin/scss/layouts/page-editor.scss
@@ -286,6 +286,7 @@
     .stream-controls{
         @include transition(opacity 0.2s ease);
         opacity:0;
+        visibility:hidden;
         position:absolute;
         top:0; right:1em;
         z-index:1;
@@ -335,7 +336,11 @@
             z-index:5;
             color:$color-grey-1;
             background-color:white;
-        
+
+            span{
+                @include visuallyhidden();
+            }
+
             &:before{
                 @include transition(all 0.2s ease);
                 @include transform(rotate(-45deg));
@@ -358,6 +363,7 @@
         ul{
             @include transition(all 0.2s ease);
             @include clearfix;
+            visibility:visible;
             opacity:1;
             padding:1em 1em 0 1em;
             overflow:hidden;
@@ -382,6 +388,7 @@
             display:block;
             width:100%;
             padding:0 0 0.5em 0;
+            outline:$color-teal;
 
             span{
                 text-transform:capitalize;
@@ -403,7 +410,8 @@
                 text-align:center;
             }
 
-            &:hover{
+            &:hover,
+            &:focus{
                 background-color:$color-teal;
                 color:white;
             }
@@ -421,12 +429,16 @@
                 &:before{
                     @include transform(rotate(0deg));
                 }
+                &:focus{
+                    color:$color-teal;
+                }
             } 
 
             .stream-menu-inner{
                 max-height:1em;
             }
             ul{
+                visibility:hidden;
                 opacity:0;
                 padding:10em;
             }           
@@ -445,12 +457,15 @@
     }
     .sequence-member .stream-menu-closed{
         opacity:0;
+        visibility:hidden;
     }
     .sequence-member:hover{
         .stream-controls{
+            visibility:visible;
             opacity:1;
         }
         .stream-menu{
+            visibility:visible;
             opacity:1;
         }
     }
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html
index 8cfb9c083..f7aab585a 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/block_forms/stream_menu.html
@@ -1,5 +1,5 @@
 <div class="stream-menu {% if state == 'closed' %}stream-menu-closed{% endif %}">
-    <div class="toggle"></div>
+    <a href="#" class="toggle"><span>Insert block</span></a>
     <div class="stream-menu-inner">
         <ul>
             {% for child_block in child_blocks %}