Merge branch 'release'

Conflicts:
	lms/djangoapps/instructor/views/instructor_dashboard.py

common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee

@@ -95,6 +95,7 @@ if Backbone?
       @timer = 0
       @$el.html(@template())
 
+      $(window).bind "load", @updateSidebar
       $(window).bind "scroll", @updateSidebar
       $(window).bind "resize", @updateSidebar
 
@@ -143,6 +144,18 @@ if Backbone?
             options.group_id = @group_id
         
     
+      lastThread = @collection.last()?.get('id')
+      if lastThread
+        # Pagination; focus the first thread after what was previously the last thread
+        @once("threads:rendered", ->
+          $(".post-list li:has(a[data-id='#{lastThread}']) + li a").focus()
+        )
+      else
+        # Totally refreshing the list (e.g. from clicking a sort button); focus the first thread
+        @once("threads:rendered", ->
+          $(".post-list a").first()?.focus()
+        )
+
       @collection.retrieveAnotherPage(@mode, options, {sort_key: @sortBy})
 
     renderThread: (thread) =>

common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee

@@ -42,8 +42,10 @@ if Backbone?
     renderVoted: =>
       if window.user.voted(@model)
         @$("[data-role=discussion-vote]").addClass("is-cast")
+        @$("[data-role=discussion-vote] span.sr").html("votes (click to remove your vote)")
       else
         @$("[data-role=discussion-vote]").removeClass("is-cast")
+        @$("[data-role=discussion-vote] span.sr").html("votes (click to vote)")
         
     renderFlagged: =>
       if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
@@ -70,7 +72,12 @@ if Backbone?
       @renderVoted()
       @renderFlagged()
       @renderPinned()
-      @$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"])
+      @$("[data-role=discussion-vote] .votes-count-number").html(@model.get("votes")["up_count"] + '<span class ="sr"></span>')
+      if window.user.voted(@model)
+        @$("[data-role=discussion-vote] .votes-count-number span.sr").html("votes (click to remove your vote)")
+      else
+        @$("[data-role=discussion-vote] .votes-count-number span.sr").html("votes (click to vote)")
+
 
     convertMath: ->
       element = @$(".post-body")

common/static/coffee/src/discussion/views/thread_response_show_view.coffee

@@ -23,6 +23,7 @@ if Backbone?
       @delegateEvents()
       if window.user.voted(@model)
         @$(".vote-btn").addClass("is-cast")
+        @$(".vote-btn span.sr").html("votes (click to remove your vote)")
       @renderAttrs()
       @renderFlagged()
       @$el.find(".posted-details").timeago()
@@ -48,12 +49,14 @@ if Backbone?
       @$(".vote-btn").toggleClass("is-cast")
       if @$(".vote-btn").hasClass("is-cast")
         @vote()
+        @$(".vote-btn span.sr").html("votes (click to remove your vote)")
       else
         @unvote()
+        @$(".vote-btn span.sr").html("votes (click to vote)")
 
     vote: ->
       url = @model.urlFor("upvote")
-      @$(".votes-count-number").html(parseInt(@$(".votes-count-number").html()) + 1)
+      @$(".votes-count-number").html((parseInt(@$(".votes-count-number").html()) + 1) + '<span class="sr"></span>')
       DiscussionUtil.safeAjax
         $elem: @$(".discussion-vote")
         url: url
@@ -64,7 +67,7 @@ if Backbone?
 
     unvote: ->
       url = @model.urlFor("unvote")
-      @$(".votes-count-number").html(parseInt(@$(".votes-count-number").html()) - 1)
+      @$(".votes-count-number").html((parseInt(@$(".votes-count-number").html()) - 1)+'<span class="sr"></span>')
       DiscussionUtil.safeAjax
         $elem: @$(".discussion-vote")
         url: url