diff --git a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee index 740bc7ec2b..951659735a 100644 --- a/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee +++ b/common/static/coffee/spec/discussion/view/discussion_thread_list_view_spec.coffee @@ -32,7 +32,7 @@ describe "DiscussionThreadListView", -> All Discussions
  • - Posts I'm Following + Posts I'm Following
  • Parent diff --git a/common/static/coffee/src/discussion/utils.coffee b/common/static/coffee/src/discussion/utils.coffee index 976966d525..06f1667e13 100644 --- a/common/static/coffee/src/discussion/utils.coffee +++ b/common/static/coffee/src/discussion/utils.coffee @@ -113,7 +113,7 @@ class @DiscussionUtil alertDiv = $("
    • diff --git a/common/static/common/templates/discussion/forum-action-close.underscore b/common/static/common/templates/discussion/forum-action-close.underscore index 61fd9af230..f32319d601 100644 --- a/common/static/common/templates/discussion/forum-action-close.underscore +++ b/common/static/common/templates/discussion/forum-action-close.underscore @@ -6,7 +6,7 @@ <%- gettext("Open") %> - + diff --git a/common/static/common/templates/discussion/forum-action-delete.underscore b/common/static/common/templates/discussion/forum-action-delete.underscore index facf308c61..c779936f4a 100644 --- a/common/static/common/templates/discussion/forum-action-delete.underscore +++ b/common/static/common/templates/discussion/forum-action-delete.underscore @@ -1,6 +1,6 @@
  • <%- gettext("Delete") %> - +
    • diff --git a/common/static/common/templates/discussion/forum-action-edit.underscore b/common/static/common/templates/discussion/forum-action-edit.underscore index 1a67c97d90..7c67830faf 100644 --- a/common/static/common/templates/discussion/forum-action-edit.underscore +++ b/common/static/common/templates/discussion/forum-action-edit.underscore @@ -1,6 +1,6 @@
  • <%- gettext("Edit") %> - +
    • diff --git a/common/static/common/templates/discussion/forum-action-endorse.underscore b/common/static/common/templates/discussion/forum-action-endorse.underscore index dfa400bffc..774004a4f5 100644 --- a/common/static/common/templates/discussion/forum-action-endorse.underscore +++ b/common/static/common/templates/discussion/forum-action-endorse.underscore @@ -5,6 +5,6 @@ <%- gettext("Endorse") %> <%- gettext("Unendorse") %> - + diff --git a/common/static/common/templates/discussion/forum-action-follow.underscore b/common/static/common/templates/discussion/forum-action-follow.underscore index c4adc7aa9f..709cf36cb9 100644 --- a/common/static/common/templates/discussion/forum-action-follow.underscore +++ b/common/static/common/templates/discussion/forum-action-follow.underscore @@ -5,6 +5,6 @@ <%- gettext("Follow") %> <%- gettext("Unfollow") %> - + diff --git a/common/static/common/templates/discussion/forum-action-pin.underscore b/common/static/common/templates/discussion/forum-action-pin.underscore index a4b3117bcd..f853f2461f 100644 --- a/common/static/common/templates/discussion/forum-action-pin.underscore +++ b/common/static/common/templates/discussion/forum-action-pin.underscore @@ -6,7 +6,7 @@ <%- gettext("Unpin") %> - + diff --git a/common/static/common/templates/discussion/forum-action-report.underscore b/common/static/common/templates/discussion/forum-action-report.underscore index dfc52eaa7b..626f52f3eb 100644 --- a/common/static/common/templates/discussion/forum-action-report.underscore +++ b/common/static/common/templates/discussion/forum-action-report.underscore @@ -6,7 +6,7 @@ <%- gettext("Unreport") %> - + diff --git a/common/static/common/templates/discussion/forum-action-vote.underscore b/common/static/common/templates/discussion/forum-action-vote.underscore index a9cb2dcdc7..b8186291aa 100644 --- a/common/static/common/templates/discussion/forum-action-vote.underscore +++ b/common/static/common/templates/discussion/forum-action-vote.underscore @@ -12,7 +12,7 @@ diff --git a/common/static/common/templates/discussion/forum-actions.underscore b/common/static/common/templates/discussion/forum-actions.underscore index ac637a0bca..9b4b0eaedf 100644 --- a/common/static/common/templates/discussion/forum-actions.underscore +++ b/common/static/common/templates/discussion/forum-actions.underscore @@ -5,7 +5,7 @@
    <%- gettext("More") %> - + diff --git a/common/static/common/templates/discussion/search-alert.underscore b/common/static/common/templates/discussion/search-alert.underscore index e75fc65cfd..74e908b9ee 100644 --- a/common/static/common/templates/discussion/search-alert.underscore +++ b/common/static/common/templates/discussion/search-alert.underscore @@ -4,6 +4,7 @@
    - + + <%- gettext("Close") %>
    diff --git a/common/static/common/templates/discussion/thread-list-item.underscore b/common/static/common/templates/discussion/thread-list-item.underscore index 8e271cd1fd..7fa664fdd3 100644 --- a/common/static/common/templates/discussion/thread-list-item.underscore +++ b/common/static/common/templates/discussion/thread-list-item.underscore @@ -18,7 +18,7 @@ } %> <%= sr_text %> - +
    <%- title %> <% if(typeof(subscribed) === "undefined") { var subscribed = null; } %> @@ -26,28 +26,28 @@
    diff --git a/common/static/common/templates/discussion/thread-response.underscore b/common/static/common/templates/discussion/thread-response.underscore index 846819665d..c4e9b40432 100644 --- a/common/static/common/templates/discussion/thread-response.underscore +++ b/common/static/common/templates/discussion/thread-response.underscore @@ -4,7 +4,7 @@ var fmts = ngettext("Show Comment (%(num_comments)s)", "Show Comments (%(num_comments)s)", comments.length); print(interpolate(fmts, {num_comments: comments.length}, true)); %> - +
    1. diff --git a/common/static/common/templates/discussion/thread-show.underscore b/common/static/common/templates/discussion/thread-show.underscore index cd260bc2e8..4a2d7230af 100644 --- a/common/static/common/templates/discussion/thread-show.underscore +++ b/common/static/common/templates/discussion/thread-show.underscore @@ -21,9 +21,9 @@ %>

      - <%- gettext("Pinned") %> - <%- gettext("Reported") %> - <%- gettext("Closed") %> + <%- gettext("Pinned") %> + <%- gettext("Reported") %> + <%- gettext("Closed") %>
    <% if (!readOnly) { %> diff --git a/common/static/common/templates/discussion/thread.underscore b/common/static/common/templates/discussion/thread.underscore index fea3d35517..a21f07a8a4 100644 --- a/common/static/common/templates/discussion/thread.underscore +++ b/common/static/common/templates/discussion/thread.underscore @@ -11,7 +11,7 @@ <% if (!readOnly) { %>
    diff --git a/common/static/common/templates/image-modal.underscore b/common/static/common/templates/image-modal.underscore index f37520752a..a863f0d14f 100644 --- a/common/static/common/templates/image-modal.underscore +++ b/common/static/common/templates/image-modal.underscore @@ -3,7 +3,7 @@ <%= smallHTML%> - <%= gettext("Fullscreen") %> + <%- gettext("Fullscreen") %> @@ -11,12 +11,12 @@
    - <%= largeALT %>, <%= gettext('Large') %> + <%= largeALT %>, <%- gettext('Large') %>
    - <%= gettext("Close") %> + <%- gettext("Close") %> @@ -24,7 +24,7 @@
  • - <%= gettext("Zoom In") %> + <%- gettext("Zoom In") %>
    • @@ -32,7 +32,7 @@
  • - <%= gettext("Zoom Out") %> + <%- gettext("Zoom Out") %>
    • diff --git a/common/test/acceptance/pages/lms/fields.py b/common/test/acceptance/pages/lms/fields.py index 9b02729f1e..a49c073217 100644 --- a/common/test/acceptance/pages/lms/fields.py +++ b/common/test/acceptance/pages/lms/fields.py @@ -104,7 +104,7 @@ class FieldsMixin(object): """ self.wait_for_field(field_id) - query = self.q(css='.u-field-{} .u-field-message i'.format(field_id)) + query = self.q(css='.u-field-{} .u-field-message .fa'.format(field_id)) return [ class_name for class_name in query.attrs('class')[0].split(' ') diff --git a/lms/djangoapps/teams/static/teams/js/views/topic_card.js b/lms/djangoapps/teams/static/teams/js/views/topic_card.js index b1d5292dde..81bffedd05 100644 --- a/lms/djangoapps/teams/static/teams/js/views/topic_card.js +++ b/lms/djangoapps/teams/static/teams/js/views/topic_card.js @@ -46,7 +46,7 @@ gettext('View Teams in the %(topic_name)s Topic'), { topic_name: this.model.get('name') }, true )); - return '' + screenReaderText + ''; + return '' + screenReaderText + ''; // jshint ignore:line } }); diff --git a/lms/djangoapps/teams/static/teams/templates/team-profile.underscore b/lms/djangoapps/teams/static/teams/templates/team-profile.underscore index e3f902192c..0013887a82 100644 --- a/lms/djangoapps/teams/static/teams/templates/team-profile.underscore +++ b/lms/djangoapps/teams/static/teams/templates/team-profile.underscore @@ -5,7 +5,7 @@ data-user-create-comment="<%- !readOnly %>" data-user-create-subcomment="<%- !readOnly %>"> <% if (!readOnly) { %> - + <% } %> @@ -32,7 +32,7 @@ <% if (country) { %>
    <%- gettext("The country that team members primarily identify with.") %> - + <%- gettext(country) %> @@ -41,7 +41,7 @@ <% if (language) { %>
    <%- gettext("The language that team members primarily use to communicate with each other.") %> - + <%- gettext(language) %> diff --git a/lms/static/coffee/src/instructor_dashboard/membership.coffee b/lms/static/coffee/src/instructor_dashboard/membership.coffee index 73f5023c8a..8888f6b856 100644 --- a/lms/static/coffee/src/instructor_dashboard/membership.coffee +++ b/lms/static/coffee/src/instructor_dashboard/membership.coffee @@ -117,7 +117,7 @@ class AuthListWidget extends MemberListWidget # create revoke button and insert it into the row label_trans = gettext("Revoke access") - $revoke_btn = $ _.template('
    <%= label %>
    ')({label: label_trans}), + $revoke_btn = $ _.template('
    <%= label %>
    ')({label: label_trans}), class: 'revoke' $revoke_btn.click => @modify_member_access member.email, 'revoke', (error) => diff --git a/lms/static/js/bookmarks/views/bookmarks_list.js b/lms/static/js/bookmarks/views/bookmarks_list.js index bb512d045a..38a7688d9a 100644 --- a/lms/static/js/bookmarks/views/bookmarks_list.js +++ b/lms/static/js/bookmarks/views/bookmarks_list.js @@ -15,8 +15,8 @@ coursewareContentEl: '#course-content', coursewareResultsWrapperEl: '.courseware-results-wrapper', - errorIcon: '', - loadingIcon: '', + errorIcon: '', + loadingIcon: '', errorMessage: gettext('An error has occurred. Please try again.'), loadingMessage: gettext('Loading'), diff --git a/lms/static/js/fixtures/ccx/schedule.html b/lms/static/js/fixtures/ccx/schedule.html index 31a281347c..a023d673c6 100644 --- a/lms/static/js/fixtures/ccx/schedule.html +++ b/lms/static/js/fixtures/ccx/schedule.html @@ -6,7 +6,7 @@ diff --git a/lms/templates/courseware/course_about_sidebar_header.html b/lms/templates/courseware/course_about_sidebar_header.html index 2361409538..027587ef3a 100644 --- a/lms/templates/courseware/course_about_sidebar_header.html +++ b/lms/templates/courseware/course_about_sidebar_header.html @@ -45,13 +45,13 @@ from django.conf import settings ).replace(u" ", u"%20") %>
    % endif diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index 1e08c3684d..994ef7e6d7 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -37,11 +37,11 @@
    - -
    diff --git a/lms/templates/courseware/progress.html b/lms/templates/courseware/progress.html index e930b1f5fa..2e63897888 100644 --- a/lms/templates/courseware/progress.html +++ b/lms/templates/courseware/progress.html @@ -124,7 +124,7 @@ from django.utils.http import urlquote_plus %elif credit_course_requirements['eligibility_status'] == 'partial_eligible': ${_("{student_name}, you have not yet met the requirements for credit.").format(student_name=student.profile.name) | h} %endif - ${_("Information about course credit requirements")}
    + ${_("Information about course credit requirements")}
    %for requirement in credit_course_requirements['requirements']:
    @@ -139,13 +139,13 @@ from django.utils.http import urlquote_plus %if requirement['status'] == 'submitted': ${_("Verification Submitted")} %elif requirement['status'] == 'failed': - + ${_("Verification Failed" )} %elif requirement['status'] == 'declined': - + ${_("Verification Declined" )} %elif requirement['status'] == 'satisfied': - + ${_("Completed by")} ${get_time_display(requirement['status_date'], DEFAULT_SHORT_DATE_FORMAT, settings.TIME_ZONE)} %endif %else: @@ -155,7 +155,7 @@ from django.utils.http import urlquote_plus
    %endfor
    - diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 7f0d776144..68a4d4140a 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -140,11 +140,11 @@ from openedx.core.djangolib.markup import HTML, Text
    - -
    @@ -182,7 +182,7 @@ from openedx.core.djangolib.markup import HTML, Text