From c5d2dd7536e005e2f29374af56018849a96feeeb Mon Sep 17 00:00:00 2001 From: Chris Date: Fri, 14 Nov 2014 12:44:23 -0500 Subject: [PATCH] Upgrading Font Awesome vendor files from 3.2.1 to 4.2.0 * updating vendor files * updating class syntax (to new FA-based classes) for all UI elements * correcting broken tests --- cms/static/js/factories/index.js | 4 +- .../js/spec/views/group_configuration_spec.js | 4 +- .../views/pages/container_subviews_spec.js | 4 +- .../js/spec/views/xblock_validation_spec.js | 6 +- cms/static/js/views/course_rerun.js | 2 +- cms/static/js/views/import.js | 6 +- cms/static/js/views/metadata.js | 4 +- cms/static/js/views/overview.js | 6 +- .../js/views/overview_assignment_grader.js | 2 +- .../js/views/pages/container_subviews.js | 4 +- cms/static/js/views/settings/main.js | 2 +- cms/static/js/views/xblock_validation.js | 4 +- cms/static/sass/_base.scss | 2 +- cms/static/sass/_shame.scss | 2 +- cms/static/sass/elements/_controls.scss | 6 +- cms/static/sass/elements/_footer.scss | 2 +- cms/static/sass/elements/_forms.scss | 4 + cms/static/sass/elements/_header.scss | 8 +- cms/static/sass/elements/_icons.scss | 7 +- cms/static/sass/elements/_layout.scss | 2 +- cms/static/sass/elements/_navigation.scss | 2 +- cms/static/sass/elements/_sock.scss | 5 +- .../sass/elements/_system-feedback.scss | 8 +- cms/static/sass/elements/_xblocks.scss | 14 +- cms/static/sass/elements/_xmodules.scss | 14 +- cms/static/sass/views/_assets.scss | 15 +- cms/static/sass/views/_checklists.scss | 10 +- cms/static/sass/views/_container.scss | 4 +- cms/static/sass/views/_dashboard.scss | 10 +- cms/static/sass/views/_export-git.scss | 2 +- cms/static/sass/views/_export.scss | 2 +- .../sass/views/_group-configuration.scss | 8 +- cms/static/sass/views/_import.scss | 26 +- cms/static/sass/views/_index.scss | 2 +- cms/static/sass/views/_outline.scss | 20 +- cms/static/sass/views/_settings.scss | 7 +- cms/static/sass/views/_static-pages.scss | 10 +- cms/templates/asset_index.html | 10 +- cms/templates/component.html | 6 +- cms/templates/container.html | 4 +- cms/templates/course_info.html | 2 +- cms/templates/course_outline.html | 14 +- cms/templates/edit-tabs.html | 8 +- cms/templates/export.html | 2 +- cms/templates/export_git.html | 2 +- cms/templates/group_configurations.html | 4 +- cms/templates/howitworks.html | 12 +- cms/templates/html_error.html | 2 +- cms/templates/import.html | 20 +- cms/templates/index.html | 18 +- cms/templates/js/asset-library.underscore | 2 +- .../js/asset-upload-modal.underscore | 2 +- cms/templates/js/asset.underscore | 4 +- cms/templates/js/checklist.underscore | 4 +- cms/templates/js/container-message.underscore | 2 +- cms/templates/js/course-outline.underscore | 34 +- cms/templates/js/due-date-editor.underscore | 2 +- cms/templates/js/edit-chapter.underscore | 2 +- cms/templates/js/edit-textbook.underscore | 2 +- .../js/group-configuration-details.underscore | 10 +- .../js/group-configuration-edit.underscore | 4 +- cms/templates/js/group-edit.underscore | 2 +- .../js/metadata-dict-entry.underscore | 4 +- .../metadata-file-uploader-entry.underscore | 2 +- .../js/metadata-list-entry.underscore | 2 +- .../js/metadata-number-entry.underscore | 2 +- .../js/metadata-option-entry.underscore | 2 +- .../js/metadata-string-entry.underscore | 2 +- .../js/mock/mock-container-page.underscore | 4 +- .../js/mock/mock-container-xblock.underscore | 4 +- .../mock/mock-course-outline-page.underscore | 10 +- .../mock-course-rerun-notification.underscore | 4 +- .../mock-empty-container-xblock.underscore | 2 +- .../mock-group-configuration-page.underscore | 4 +- .../js/mock/mock-index-page.underscore | 8 +- .../js/mock/mock-xmodule-editor.underscore | 2 +- ...ck-xmodule-settings-only-editor.underscore | 2 +- .../js/no-group-configurations.underscore | 2 +- cms/templates/js/no-textbooks.underscore | 2 +- cms/templates/js/paging-footer.underscore | 4 +- cms/templates/js/paging-header.underscore | 4 +- cms/templates/js/publish-xblock.underscore | 4 +- .../js/release-date-editor.underscore | 2 +- cms/templates/js/show-textbook.underscore | 4 +- cms/templates/js/staff-lock-editor.underscore | 6 +- cms/templates/js/system-feedback.underscore | 6 +- cms/templates/js/unit-outline.underscore | 2 +- .../js/validation-error-modal.underscore | 4 +- .../metadata-translations-entry.underscore | 4 +- .../metadata-translations-item.underscore | 2 +- .../messages/transcripts-choose.underscore | 2 +- .../messages/transcripts-found.underscore | 2 +- .../messages/transcripts-import.underscore | 2 +- .../messages/transcripts-not-found.underscore | 2 +- .../messages/transcripts-replace.underscore | 2 +- .../messages/transcripts-uploaded.underscore | 2 +- .../transcripts-use-existing.underscore | 2 +- .../metadata-videolist-entry.underscore | 2 +- cms/templates/js/xblock-outline.underscore | 14 +- .../js/xblock-string-field-editor.underscore | 2 +- cms/templates/manage_users.html | 6 +- cms/templates/settings.html | 2 +- cms/templates/settings_graders.html | 4 +- cms/templates/studio_xblock_wrapper.html | 10 +- cms/templates/textbooks.html | 2 +- cms/templates/ux/reference/container.html | 50 +- .../ux/reference/course-create-rerun.html | 4 +- cms/templates/ux/reference/outline.html | 10 +- .../ux/reference/outline_add-section.html | 2 +- .../ux/reference/outline_add-subsection.html | 2 +- .../ux/reference/outline_add-unit.html | 2 +- .../outline_section_header-collapsed.html | 8 +- .../outline_section_header-expanded.html | 8 +- .../ux/reference/outline_status_grading.html | 2 +- .../outline_status_message-error.html | 2 +- .../outline_status_message-lock.html | 2 +- ...ne_status_message-unpublished_changes.html | 2 +- ...line_status_message-unpublished_units.html | 2 +- .../outline_status_release-draft.html | 2 +- .../outline_status_release-lock.html | 2 +- .../outline_status_release-released.html | 2 +- ...e_status_release-released_with_parent.html | 2 +- .../outline_status_release-scheduled.html | 2 +- ..._status_release-scheduled_with_parent.html | 2 +- .../outline_subsection_header-collapsed.html | 8 +- .../outline_subsection_header-expanded.html | 8 +- .../ux/reference/outline_unit_header.html | 6 +- .../widgets/_ui-dnd-indicator-after.html | 2 +- .../widgets/_ui-dnd-indicator-before.html | 2 +- .../widgets/_ui-dnd-indicator-initial.html | 2 +- cms/templates/widgets/header.html | 8 +- cms/templates/widgets/open-ended-edit.html | 6 +- cms/templates/widgets/sock.html | 4 +- .../third_party_auth/tests/specs/base.py | 8 +- .../discussion/discussion_spec_helper.coffee | 56 +- .../discussion_thread_list_view_spec.coffee | 6 +- common/static/css/vendor/font-awesome.css | 1866 +++++++++-------- common/static/fonts/vendor/FontAwesome.otf | Bin 61896 -> 85908 bytes .../fonts/vendor/fontawesome-webfont.eot | Bin 37405 -> 56006 bytes .../fonts/vendor/fontawesome-webfont.svg | 189 +- .../fonts/vendor/fontawesome-webfont.ttf | Bin 79076 -> 112160 bytes .../fonts/vendor/fontawesome-webfont.woff | Bin 43572 -> 65452 bytes .../js/spec_helpers/rwd_header_footer.js | 2 +- common/static/sass/_mixins.scss | 2 +- .../js/discussion/thread-show.underscore | 6 +- .../test/acceptance/pages/studio/container.py | 5 +- .../test/acceptance/pages/studio/overview.py | 2 +- .../studio/settings_group_configurations.py | 6 +- .../instructor_dashboard/membership.coffee | 4 +- lms/static/sass/course/wiki/_wiki.scss | 50 +- lms/static/sass/discussion/_discussion.scss | 1 - .../sass/discussion/elements/_navigation.scss | 2 +- .../combined_open_ended_results.html | 6 +- lms/templates/courseware/course_about.html | 22 +- lms/templates/courseware/courseware.html | 4 +- .../legacy_instructor_dashboard.html | 6 +- lms/templates/dashboard.html | 14 +- .../dashboard/_dashboard_course_listing.html | 2 +- .../_dashboard_prompt_midcourse_reverify.html | 2 +- .../_dashboard_reverification_sidebar.html | 8 +- .../_discussion_course_navigation.html | 2 +- .../discussion/_discussion_module.html | 2 +- .../discussion/_discussion_module_studio.html | 2 +- .../discussion/_filter_dropdown.html | 4 +- .../discussion/_thread_list_template.html | 4 +- .../discussion/_underscore_templates.html | 62 +- lms/templates/footer-edx-new.html | 10 +- lms/templates/forgot_password_modal.html | 4 +- lms/templates/help_modal.html | 6 +- .../add_coupon_modal.html | 2 +- .../instructor_dashboard_2/e-commerce.html | 4 +- .../edit_coupon_modal.html | 2 +- .../generate_registarion_codes_modal.html | 2 +- .../instructor_dashboard_2/metrics.html | 4 +- .../set_course_mode_price_modal.html | 2 +- lms/templates/lti.html | 2 +- .../modal/_modal-settings-language.html | 2 +- lms/templates/modal/accessible_confirm.html | 2 +- lms/templates/navigation-edx.html | 2 +- lms/templates/navigation.html | 2 +- .../shoppingcart/cybersource_form.html | 4 +- lms/templates/shoppingcart/receipt.html | 4 +- lms/templates/shoppingcart/shopping_cart.html | 8 +- .../shoppingcart/verified_cert_receipt.html | 2 +- lms/templates/signup_modal.html | 2 +- .../student_profile/third_party_auth.html | 4 +- .../instructor_dashboard/membership.html | 12 +- .../verify_student/_modal_editname.html | 2 +- lms/templates/verify_student/face_upload.html | 14 +- .../midcourse_photo_reverification.html | 16 +- .../verify_student/photo_reverification.html | 28 +- .../verify_student/photo_verification.html | 30 +- .../reverification_confirmation.html | 2 +- .../verify_student/show_requirements.html | 24 +- lms/templates/verify_student/verified.html | 2 +- lms/templates/wiki/create.html | 4 +- lms/templates/wiki/delete.html | 4 +- lms/templates/wiki/edit.html | 12 +- lms/templates/wiki/history.html | 28 +- lms/templates/wiki/includes/article_menu.html | 10 +- lms/templates/wiki/includes/breadcrumbs.html | 2 +- lms/templates/wiki/includes/cheatsheet.html | 2 +- .../wiki/plugins/attachments/index.html | 20 +- 203 files changed, 1826 insertions(+), 1525 deletions(-) mode change 100755 => 100644 common/static/fonts/vendor/fontawesome-webfont.eot mode change 100755 => 100644 common/static/fonts/vendor/fontawesome-webfont.svg mode change 100755 => 100644 common/static/fonts/vendor/fontawesome-webfont.ttf mode change 100755 => 100644 common/static/fonts/vendor/fontawesome-webfont.woff 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 @@