From 370eb970b14a804b93b1739dfc1cea3409fddc06 Mon Sep 17 00:00:00 2001
From: Chris Rodriguez <crodriguez@edx.org>
Date: Fri, 23 Jan 2015 14:09:00 -0500
Subject: [PATCH] Accessibility issues addressing UX-1573

Conflicts:
	common/lib/xmodule/xmodule/css/sequence/display.scss
---
 .../xmodule/xmodule/css/sequence/display.scss | 39 +++----------------
 .../xmodule/js/src/sequence/display.coffee    |  3 ++
 lms/templates/seq_module.html                 | 11 +++---
 3 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/common/lib/xmodule/xmodule/css/sequence/display.scss b/common/lib/xmodule/xmodule/css/sequence/display.scss
index 3cf3843648..f906e11d87 100644
--- a/common/lib/xmodule/xmodule/css/sequence/display.scss
+++ b/common/lib/xmodule/xmodule/css/sequence/display.scss
@@ -106,10 +106,6 @@ nav.sequence-nav {
         padding: 0;
         position: relative;
 
-/*        &:focus {
-          outline: 0;
-        }
-*/
         &:hover, &:focus {
           background-color: $white;
           background-repeat: no-repeat;
@@ -120,17 +116,6 @@ nav.sequence-nav {
           @extend %ui-depth1;
           background-color: $white;
 
-          // &:after {
-          //   content: '▲';
-          //   position: absolute;
-          //   top: 28px;
-          //   left: 50%;
-          //   z-index: 9999;
-          //   margin-left: -5px;
-          //   font-size: 12px;
-          //   color: #aaa;
-          // }
-
           &:hover, &:focus {
             background-color: $white;
             background-repeat: no-repeat;
@@ -213,7 +198,6 @@ nav.sequence-nav {
           visibility: hidden;
           pointer-events: none;
 
-
           &:empty {
             background: none;
 
@@ -280,10 +264,6 @@ nav.sequence-nav {
           overflow: hidden;
           @include transition(all .2s $ease-in-out-quad 0s);
 
-/*          &:focus {
-            outline: 0;
-          }
-*/
           &:hover, &:focus {
             opacity: 0.5;
           }
@@ -382,11 +362,7 @@ nav.sequence-bottom {
           &.disabled {
             opacity: 0.4;
           }
-
-/*          &:focus {
-            outline: 0;
-          }
-*/        }
+        }
       }
 
       &.prev {
@@ -429,15 +405,10 @@ nav.sequence-bottom {
   }
 }
 
-.xmodule_VerticalModule div.vert-mod > div ul.sequence-nav-buttons {
-  list-style: none !important;
-}
+#seq_content {
 
-.xmodule_SequenceModule nav.sequence-bottom ul li.next a,
-.xmodule_SequenceModule nav.sequence-bottom ul li.prev a {
-
-/*  &:focus {
-    outline: 0;
+  &:focus,
+  &:active {
+    outline: none;
   }
-*/
 }
diff --git a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
index c259d8b531..cd26bf71f6 100644
--- a/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
+++ b/common/lib/xmodule/xmodule/js/src/sequence/display.coffee
@@ -4,6 +4,7 @@ class @Sequence
     @el = $(element).find('.sequence')
     @contents = @$('.seq_contents')
     @content_container = @$('#seq_content')
+    @sr_container = @$('#sr-is-focusable')
     @num_contents = @contents.length
     @id = @el.data('id')
     @ajaxUrl = @el.data('ajax-url')
@@ -114,6 +115,8 @@ class @Sequence
 
       sequence_links = @content_container.find('a.seqnav')
       sequence_links.click @goto
+
+      @sr_container.focus();
     @$("a.active").blur()
 
   goto: (event) =>
diff --git a/lms/templates/seq_module.html b/lms/templates/seq_module.html
index 67003114f3..d8d9954aad 100644
--- a/lms/templates/seq_module.html
+++ b/lms/templates/seq_module.html
@@ -1,13 +1,13 @@
 <%! from django.utils.translation import ugettext as _ %>
 
 <div id="sequence_${element_id}" class="sequence" data-id="${item_id}" data-position="${position}" data-ajax-url="${ajax_url}" >
-  <nav class="sequence-nav">
+  <nav class="sequence-nav" aria-label="${_('Unit')}" >
     <ul class="sequence-nav-buttons">
       <li class="prev"><a role="button" href="#">${_('Previous')}</a></li>
     </ul>
 
     <div class="sequence-list-wrapper">
-      <ol role="tablist" aria-label="${_('Section Navigation')}" id="sequence-list">
+      <ol role="tablist" id="sequence-list">
         % for idx, item in enumerate(items):
         ## TODO (vshnayder): add item.progress_detail either to the title or somewhere else.
         ## Make sure it gets updated after ajax calls.
@@ -44,10 +44,11 @@
      ${item['content'] | h}
   </div>
   % endfor
-  <div id="seq_content" role="tabpanel"></div>
+  <div id="sr-is-focusable" tabindex="-1"></div>
+  <div id="seq_content"></div>
 
-  <nav class="sequence-bottom">
-    <ul aria-label="${_('Section Navigation')}" class="sequence-nav-buttons">
+  <nav class="sequence-bottom" aria-label="${_('Section')}">
+    <ul class="sequence-nav-buttons">
       <li class="prev"><a role="button" href="#">${_("Previous")}</a></li>
       <li class="next"><a role="button" href="#">${_("Next")}</a></li>
     </ul>