diff --git a/cms/static/js/factories/index.js b/cms/static/js/factories/index.js index c908c84a64..cb93d29e58 100644 --- a/cms/static/js/factories/index.js +++ b/cms/static/js/factories/index.js @@ -21,8 +21,8 @@ define(['jquery.form', 'js/index'], function() { .find('.label') .text('Sorry, there was error with your request'); $('#request-coursecreator-submit') - .find('.icon-cog') - .toggleClass('icon-spin'); + .find('.fa-cog') + .toggleClass('fa-spin'); }; $('#request-coursecreator').ajaxForm({ diff --git a/cms/static/js/spec/views/group_configuration_spec.js b/cms/static/js/spec/views/group_configuration_spec.js index 6a7abbf041..5a23bd1c7b 100644 --- a/cms/static/js/spec/views/group_configuration_spec.js +++ b/cms/static/js/spec/views/group_configuration_spec.js @@ -35,8 +35,8 @@ define([ usageUnit: '.group-configuration-usage-unit', usageUnitAnchor: '.group-configuration-usage-unit a', usageUnitMessage: '.group-configuration-validation-message', - usageUnitWarningIcon: '.group-configuration-usage-unit i.icon-warning-sign', - usageUnitErrorIcon: '.group-configuration-usage-unit i.icon-exclamation-sign', + usageUnitWarningIcon: '.group-configuration-usage-unit i.fa-warning', + usageUnitErrorIcon: '.group-configuration-usage-unit i.fa-exclamation-circle', warningMessage: '.group-configuration-validation-text', warningIcon: '.wrapper-group-configuration-validation > i', note: '.wrapper-delete-button' diff --git a/cms/static/js/spec/views/pages/container_subviews_spec.js b/cms/static/js/spec/views/pages/container_subviews_spec.js index 50653efcc7..2809c779a4 100644 --- a/cms/static/js/spec/views/pages/container_subviews_spec.js +++ b/cms/static/js/spec/views/pages/container_subviews_spec.js @@ -438,9 +438,9 @@ define(["jquery", "underscore", "underscore.string", "js/common_helpers/ajax_hel verifyExplicitStaffOnly = function(isStaffOnly) { if (isStaffOnly) { - expect(containerPage.$('.action-staff-lock i')).toHaveClass('icon-check'); + expect(containerPage.$('.action-staff-lock i')).toHaveClass('fa-check-square-o'); } else { - expect(containerPage.$('.action-staff-lock i')).toHaveClass('icon-check-empty'); + expect(containerPage.$('.action-staff-lock i')).toHaveClass('fa-square-o'); } }; diff --git a/cms/static/js/spec/views/xblock_validation_spec.js b/cms/static/js/spec/views/xblock_validation_spec.js index 66e579f109..727725ce95 100644 --- a/cms/static/js/spec/views/xblock_validation_spec.js +++ b/cms/static/js/spec/views/xblock_validation_spec.js @@ -17,9 +17,9 @@ define(['jquery', 'js/models/xblock_validation', 'js/views/xblock_validation', ' it('has a getIcon method', function() { var getIcon = view.getIcon.bind(view); - expect(getIcon(model.WARNING)).toBe('icon-warning-sign'); - expect(getIcon(model.NOT_CONFIGURED)).toBe('icon-warning-sign'); - expect(getIcon(model.ERROR)).toBe('icon-exclamation-sign'); + expect(getIcon(model.WARNING)).toBe('fa-warning-sign'); + expect(getIcon(model.NOT_CONFIGURED)).toBe('fa-warning-sign'); + expect(getIcon(model.ERROR)).toBe('fa-exclamation-circle'); expect(getIcon("unknown")).toBeNull(); }); diff --git a/cms/static/js/views/course_rerun.js b/cms/static/js/views/course_rerun.js index 37dccbb650..b8d361aac4 100644 --- a/cms/static/js/views/course_rerun.js +++ b/cms/static/js/views/course_rerun.js @@ -50,7 +50,7 @@ define(["domReady", "jquery", "underscore", "js/views/utils/create_course_utils" // Go into creating re-run state $('.rerun-course-save').addClass('is-disabled').attr('aria-disabled', true).addClass('is-processing').html( - '' + gettext('Processing Re-run Request') + '' + gettext('Processing Re-run Request') ); $('.action-cancel').addClass('is-hidden'); }; diff --git a/cms/static/js/views/import.js b/cms/static/js/views/import.js index 00aa7826ff..51520cb08b 100644 --- a/cms/static/js/views/import.js +++ b/cms/static/js/views/import.js @@ -14,9 +14,9 @@ define( * @param {boolean} isSpinning Turns cog spin on if true, off otherwise. */ var updateCog = function (elem, isSpinning) { - var cogI = elem.find('i.icon-cog'); - if (isSpinning) { cogI.addClass("icon-spin");} - else { cogI.removeClass("icon-spin");} + var cogI = elem.find('i.fa-cog'); + if (isSpinning) { cogI.addClass("fa-spin");} + else { cogI.removeClass("fa-spin");} }; diff --git a/cms/static/js/views/metadata.js b/cms/static/js/views/metadata.js index 872509808b..f70f77b745 100644 --- a/cms/static/js/views/metadata.js +++ b/cms/static/js/views/metadata.js @@ -286,7 +286,7 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, V var template = _.template( '
  • ' + '' + - 'Remove' + + 'Remove' + '
    • ' ); list.append($(template({'ele': ele, 'index': index}))); @@ -453,7 +453,7 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, V '
  • ' + '' + '' + - 'Remove' + + 'Remove' + '
    • ' ); diff --git a/cms/static/js/views/overview.js b/cms/static/js/views/overview.js index f83d46ee9e..ee50094b2e 100644 --- a/cms/static/js/views/overview.js +++ b/cms/static/js/views/overview.js @@ -10,9 +10,9 @@ define(["domReady", "jquery", "jquery.ui", "underscore", "gettext", "js/views/fe var $section = $('.courseware-section'); var $button = $(this); - var $labelCollapsed = $(' ' + + var $labelCollapsed = $(' ' + gettext('Collapse All Sections') + ''); - var $labelExpanded = $(' ' + + var $labelExpanded = $(' ' + gettext('Expand All Sections') + ''); var buttonLabel = $button.hasClass('is-activated') ? $labelCollapsed : $labelExpanded; @@ -102,7 +102,7 @@ define(["domReady", "jquery", "jquery.ui", "underscore", "gettext", "js/views/fe '' + gettext("Release date:") + ' ' + gettext("{month}/{day}/{year} at {hour}:{minute} UTC") + '' + - ' ' + + ' ' + gettext("Edit section release date") + '', {year: datetime.getUTCFullYear(), month: pad2(datetime.getUTCMonth() + 1), day: pad2(datetime.getUTCDate()), diff --git a/cms/static/js/views/overview_assignment_grader.js b/cms/static/js/views/overview_assignment_grader.js index e7facfe7b5..7d20fd4f6f 100644 --- a/cms/static/js/views/overview_assignment_grader.js +++ b/cms/static/js/views/overview_assignment_grader.js @@ -13,7 +13,7 @@ define(["js/views/baseview", "underscore", "gettext", "js/models/assignment_grad // TODO move to a template file '

    <%= assignmentType %>

    ' + '' + - '<% if (!hideSymbol) {%><%};%>' + + '<% if (!hideSymbol) {%><%};%>' + '' + ' @@ -66,9 +66,9 @@ <% if (unit.validation) { %>

    <% if (unit.validation.type === 'warning') { %> - + <% } else if (unit.validation.type === 'error') { %> - + <% } %> <%= unit.validation.text %> diff --git a/cms/templates/js/group-configuration-edit.underscore b/cms/templates/js/group-configuration-edit.underscore index eff282ae2c..ae28caeedf 100644 --- a/cms/templates/js/group-configuration-edit.underscore +++ b/cms/templates/js/group-configuration-edit.underscore @@ -30,11 +30,11 @@ <%= gettext("Name of the groups that students will be assigned to, for example, Control, Video, Problems. You must have two or more groups.") %>

      - + <% if (!_.isEmpty(usage)) { %>
      - +

      <%= gettext('This configuration is currently used in content experiments. If you make changes to the groups, you may need to edit those experiments.') %>

      diff --git a/cms/templates/js/group-edit.underscore b/cms/templates/js/group-edit.underscore index dbb9adb33e..7088793125 100644 --- a/cms/templates/js/group-edit.underscore +++ b/cms/templates/js/group-edit.underscore @@ -1,4 +1,4 @@
      <%= allocation %>%
      - <%= gettext("delete group") %> + <%= gettext("delete group") %> diff --git a/cms/templates/js/metadata-dict-entry.underscore b/cms/templates/js/metadata-dict-entry.underscore index 0be483f2b0..61838f09d1 100644 --- a/cms/templates/js/metadata-dict-entry.underscore +++ b/cms/templates/js/metadata-dict-entry.underscore @@ -3,11 +3,11 @@
      diff --git a/cms/templates/js/metadata-file-uploader-entry.underscore b/cms/templates/js/metadata-file-uploader-entry.underscore index b9ab7c7a38..4dcfd7d9d7 100644 --- a/cms/templates/js/metadata-file-uploader-entry.underscore +++ b/cms/templates/js/metadata-file-uploader-entry.underscore @@ -3,7 +3,7 @@ ">
      <%= model.get('help') %> diff --git a/cms/templates/js/metadata-list-entry.underscore b/cms/templates/js/metadata-list-entry.underscore index 8b3d99c507..92db6ee9e0 100644 --- a/cms/templates/js/metadata-list-entry.underscore +++ b/cms/templates/js/metadata-list-entry.underscore @@ -6,7 +6,7 @@ - <%= gettext("Add") %> <%= model.get('display_name')%> + <%= gettext("Add") %> <%= model.get('display_name')%> <%= model.get('help') %> diff --git a/cms/templates/js/metadata-option-entry.underscore b/cms/templates/js/metadata-option-entry.underscore index 4cb107e882..952e914248 100644 --- a/cms/templates/js/metadata-option-entry.underscore +++ b/cms/templates/js/metadata-option-entry.underscore @@ -10,7 +10,7 @@ <% }) %> <%= model.get('help') %> diff --git a/cms/templates/js/metadata-string-entry.underscore b/cms/templates/js/metadata-string-entry.underscore index 759e3ad826..cef204e0bd 100644 --- a/cms/templates/js/metadata-string-entry.underscore +++ b/cms/templates/js/metadata-string-entry.underscore @@ -2,7 +2,7 @@ <%= model.get('help') %> diff --git a/cms/templates/js/mock/mock-container-page.underscore b/cms/templates/js/mock/mock-container-page.underscore index 55fafc53d5..8f36555317 100644 --- a/cms/templates/js/mock/mock-container-page.underscore +++ b/cms/templates/js/mock/mock-container-page.underscore @@ -28,7 +28,7 @@ % else:
    1. - + ${_("Edit")}
      2. @@ -47,7 +47,7 @@