From 98142c02d3ef465c20e06443b13b84025374ebaf Mon Sep 17 00:00:00 2001 From: Greg Price Date: Mon, 16 Sep 2013 17:35:38 -0400 Subject: [PATCH 1/8] Improve accessibility of forum nav sort buttons --- CHANGELOG.rst | 2 ++ .../views/discussion_thread_list_view.coffee | 10 +++++++--- lms/templates/discussion/_thread_list_template.html | 10 +++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index e5ddfa222a..fe9218379d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,8 @@ These are notable changes in edx-platform. This is a rolling list of changes, in roughly chronological order, most recent first. Add your entries at or near the top. Include a label indicating the component affected. +LMS: Improved accessibility of forum navigation sort buttons + LMS: enhanced shib support, including detection of linked shib account at login page and support for the ?next= GET parameter. diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index c36b3b72d7..2fc31da97a 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -353,9 +353,13 @@ if Backbone? @loadMorePages(event) sortThreads: (event) -> - @$(".sort-bar a").removeClass("active") - $(event.target).addClass("active") - @sortBy = $(event.target).data("sort") + activeSort = @$(".sort-bar a[class='active']") + activeSort.removeClass("active") + activeSort.attr("aria-checked", "false") + newSort = $(event.target) + newSort.addClass("active") + newSort.attr("aria-checked", "true") + @sortBy = newSort.data("sort") @displayedCollection.comparator = switch @sortBy when 'date' then @displayedCollection.sortByDateRecentFirst diff --git a/lms/templates/discussion/_thread_list_template.html b/lms/templates/discussion/_thread_list_template.html index 8475387b74..0ef67735b1 100644 --- a/lms/templates/discussion/_thread_list_template.html +++ b/lms/templates/discussion/_thread_list_template.html @@ -22,11 +22,11 @@
- ${_("Sort by:")} -
<%include file="_filter_dropdown.html" />
From e9b15b6f02806e6b52f65089e29ff28449419238 Mon Sep 17 00:00:00 2001 From: Adam Palay Date: Mon, 23 Sep 2013 14:41:05 -0400 Subject: [PATCH 3/8] add unicode support for course_wiki --- lms/djangoapps/course_wiki/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/djangoapps/course_wiki/views.py b/lms/djangoapps/course_wiki/views.py index 1884ab7f11..322bc9decd 100644 --- a/lms/djangoapps/course_wiki/views.py +++ b/lms/djangoapps/course_wiki/views.py @@ -96,7 +96,7 @@ def course_wiki_redirect(request, course_id): root, course_slug, title=course_slug, - content=cgi.escape("This is the wiki for **{0}**'s _{1}_.".format(course.display_org_with_default, course.display_name_with_default)), + content=cgi.escape(u"This is the wiki for **{0}**'s _{1}_.".format(course.display_org_with_default, course.display_name_with_default)), user_message="Course page automatically created.", user=None, ip_address=None, From 0a3ebf6a10f256ae9aa6900136e785ace68b7733 Mon Sep 17 00:00:00 2001 From: Your Name Date: Tue, 10 Sep 2013 08:49:44 -0400 Subject: [PATCH 4/8] update discussion forums views to add accessibility information and add hidden accessibilty class to discussion scss, this comprises adding comments count and votes count verbiage and vote call to action --- lms/templates/discussion/_single_thread.html | 2 +- lms/templates/discussion/_underscore_templates.html | 10 +++++----- lms/templates/discussion/mustache/_content.mustache | 2 +- .../discussion/mustache/_inline_thread_show.mustache | 2 +- .../discussion/mustache/_profile_thread.mustache | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lms/templates/discussion/_single_thread.html b/lms/templates/discussion/_single_thread.html index 6c7e52d4d6..a14e03d10f 100644 --- a/lms/templates/discussion/_single_thread.html +++ b/lms/templates/discussion/_single_thread.html @@ -11,7 +11,7 @@
${_("This post visible only to group {group}.").format(group=cohort_dictionary[thread['group_id']])}
%endif - + ${thread['votes']['up_count']} + + ${thread['votes']['up_count']}votes (click to vote)

${thread['title']}

sometime by diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html index 73d890fe18..a1de39c839 100644 --- a/lms/templates/discussion/_underscore_templates.html +++ b/lms/templates/discussion/_underscore_templates.html @@ -33,7 +33,7 @@ ${"<% } %>"} - + ${'<%- votes["up_count"] %>'} + + ${'<%- votes["up_count"] %>'}votes (click to vote)

${'<%- title %>'}

${"<% if (obj.username) { %>"} @@ -118,7 +118,7 @@ @@ -105,7 +107,8 @@ % if course is UNDEFINED or has_permission(user, 'create_sub_comment', course.id):

    -
    ${_("Add a comment")} +
    ${_("Submit")} @@ -143,7 +146,7 @@
    ${"<%- body %>"}
    - + ${_("Cancel")}
    @@ -216,7 +219,8 @@ Receive updates - + + If enabled, you will receive an email digest once a day notifying you about new, unread activity from posts you are following. From 3f23b82a0501da4e78518c759bd71a93523b58fd Mon Sep 17 00:00:00 2001 From: cahrens Date: Tue, 24 Sep 2013 10:20:58 -0400 Subject: [PATCH 6/8] Back out USER_ID help text. --- cms/templates/component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/cms/templates/component.html b/cms/templates/component.html index a6deacb486..2412cd74d4 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -11,7 +11,6 @@