diff --git a/cms/static/js/spec/views/group_configuration_spec.js b/cms/static/js/spec/views/group_configuration_spec.js index 0f53baad57..38aaaf401d 100644 --- a/cms/static/js/spec/views/group_configuration_spec.js +++ b/cms/static/js/spec/views/group_configuration_spec.js @@ -34,10 +34,10 @@ define([ usageUnit: '.group-configuration-usage-unit', usageUnitAnchor: '.group-configuration-usage-unit a', usageUnitMessage: '.group-configuration-validation-message', - usageUnitWarningIcon: '.group-configuration-usage-unit i.fa-warning', - usageUnitErrorIcon: '.group-configuration-usage-unit i.fa-exclamation-circle', + usageUnitWarningIcon: '.group-configuration-usage-unit .fa-warning', + usageUnitErrorIcon: '.group-configuration-usage-unit .fa-exclamation-circle', warningMessage: '.group-configuration-validation-text', - warningIcon: '.wrapper-group-configuration-validation > i', + warningIcon: '.wrapper-group-configuration-validation > .fa-warning', note: '.wrapper-delete-button' }; diff --git a/cms/static/js/spec/views/pages/container_spec.js b/cms/static/js/spec/views/pages/container_spec.js index 43d36f2376..b307111536 100644 --- a/cms/static/js/spec/views/pages/container_spec.js +++ b/cms/static/js/spec/views/pages/container_spec.js @@ -519,7 +519,7 @@ define(["jquery", "underscore", "underscore.string", "common/js/spec_helpers/aja var getButtonIcon, getButtonText; getButtonIcon = function (containerPage) { - return containerPage.$('.action-toggle-preview i'); + return containerPage.$('.action-toggle-preview .fa'); }; getButtonText = function (containerPage) { 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 1d5385bc98..1f518342cc 100644 --- a/cms/static/js/spec/views/pages/container_subviews_spec.js +++ b/cms/static/js/spec/views/pages/container_subviews_spec.js @@ -443,9 +443,9 @@ define(["jquery", "underscore", "underscore.string", "common/js/spec_helpers/aja verifyExplicitStaffOnly = function(isStaffOnly) { if (isStaffOnly) { - expect(containerPage.$('.action-staff-lock i')).toHaveClass('fa-check-square-o'); + expect(containerPage.$('.action-staff-lock .fa')).toHaveClass('fa-check-square-o'); } else { - expect(containerPage.$('.action-staff-lock i')).toHaveClass('fa-square-o'); + expect(containerPage.$('.action-staff-lock .fa')).toHaveClass('fa-square-o'); } }; diff --git a/cms/static/js/views/course_rerun.js b/cms/static/js/views/course_rerun.js index aed115cdcc..b256e158e5 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') //jshint ignore:line ); $('.action-cancel').addClass('is-hidden'); }; diff --git a/cms/static/js/views/metadata.js b/cms/static/js/views/metadata.js index e8aca4b5d4..f9148b3f7e 100644 --- a/cms/static/js/views/metadata.js +++ b/cms/static/js/views/metadata.js @@ -287,8 +287,8 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, _.each(value, function(ele, index) { var template = _.template( '
  • ' + - '' + - 'Remove' + + '' + + '' + gettext('Remove') + '' + //jshint ignore:line '
    • ' ); list.append($(template({'ele': ele, 'index': index}))); @@ -455,7 +455,7 @@ function(BaseView, _, MetadataModel, AbstractEditor, FileUpload, UploadDialog, '
  • ' + '' + '' + - 'Remove' + + 'Remove' + //jshint ignore:line '
    • ' ); diff --git a/cms/static/js/views/overview_assignment_grader.js b/cms/static/js/views/overview_assignment_grader.js deleted file mode 100644 index 8d6aeaa9be..0000000000 --- a/cms/static/js/views/overview_assignment_grader.js +++ /dev/null @@ -1,87 +0,0 @@ -define(["js/views/baseview", "underscore", "gettext", "js/models/assignment_grade", "common/js/components/views/feedback_notification"], - function(BaseView, _, gettext, AssignmentGrade, NotificationView) { - var l10nNotGraded = gettext('Not Graded'); - var OverviewAssignmentGrader = BaseView.extend({ - // instantiate w/ { graders : CourseGraderCollection, el : } - events : { - "click .menu-toggle" : "showGradeMenu", - "click .menu li" : "selectGradeType" - }, - initialize : function() { - // call template w/ {assignmentType : formatname, graders : CourseGraderCollection instance } - this.template = _.template( - // TODO move to a template file - '

    <%= assignmentType %>

    ' + - '' + - '<% if (!hideSymbol) {%><%};%>' + - '' + - ''); - this.assignmentGrade = new AssignmentGrade({ - locator : this.$el.closest('.id-holder').data('locator'), - graderType : this.$el.data('initial-status')}); - // TODO throw exception if graders is null - this.graders = this.options['graders']; - var cachethis = this; - // defining here to get closure around this - this.removeMenu = function(e) { - e.preventDefault(); - cachethis.$el.removeClass('is-active'); - $(document).off('click', cachethis.removeMenu); - }; - this.hideSymbol = this.options['hideSymbol']; - this.render(); - }, - render : function() { - var graderType = this.assignmentGrade.get('graderType'); - this.$el.html(this.template( - { - assignmentType : (graderType == 'notgraded') ? l10nNotGraded : graderType, - graders : this.graders, - hideSymbol : this.hideSymbol - } - )); - if (this.assignmentGrade.has('graderType') && this.assignmentGrade.get('graderType') != "notgraded") { - this.$el.addClass('is-set'); - } - else { - this.$el.removeClass('is-set'); - } - }, - showGradeMenu : function(e) { - e.preventDefault(); - // I sure hope this doesn't break anything but it's needed to keep the removeMenu from activating - e.stopPropagation(); - // nasty global event trap :-( - $(document).on('click', this.removeMenu); - this.$el.addClass('is-active'); - }, - selectGradeType : function(e) { - e.preventDefault(); - - this.removeMenu(e); - - var saving = new NotificationView.Mini({ - title: gettext('Saving') - }); - saving.show(); - - // TODO I'm not happy with this string fetch via the html for what should be an id. I'd rather use the id attr - // of the CourseGradingPolicy model or null for notgraded (NOTE, change template's if check for is-selected accordingly) - this.assignmentGrade.save( - 'graderType', - ($(e.target).hasClass('gradable-status-notgraded')) ? 'notgraded' : $(e.target).text(), - {success: function () { saving.hide(); }} - ); - - this.render(); - } - }); - return OverviewAssignmentGrader; -}); diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html index 1fe9b7d251..48a6559ecd 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -44,7 +44,7 @@

    ${_("Page Actions")}

    @@ -56,7 +56,7 @@
    -

    ${_("Loading")}

    +

    ${_("Loading")}

    @@ -88,7 +88,7 @@
    - ${_('close')} + ${_('close')}

    ${_("Upload New File")}

    ${_("Max per-file size: {max_filesize}MB").format(max_filesize=max_file_size_in_mbs)}

    @@ -115,14 +115,14 @@
    - +

    ${_('Your file has been deleted.')}

    - + ${_('close alert')}
    diff --git a/cms/templates/certificates.html b/cms/templates/certificates.html index 99ec02ab51..08327ba97d 100644 --- a/cms/templates/certificates.html +++ b/cms/templates/certificates.html @@ -76,7 +76,7 @@ CMS.User.isGlobalStaff = '${is_global_staff}'=='True' ? true : false;
    % else:
    -

    ${_("Loading")}

    +

    ${_("Loading")}

    % endif
    diff --git a/cms/templates/component.html b/cms/templates/component.html index 0bd2a11467..b03418af11 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -9,19 +9,19 @@
    @@ -191,7 +191,7 @@ - + ${_("close modal")} @@ -204,7 +204,7 @@ - + ${_("close modal")} diff --git a/cms/templates/html_error.html b/cms/templates/html_error.html index 5cfdafb575..6b80a6a1ff 100644 --- a/cms/templates/html_error.html +++ b/cms/templates/html_error.html @@ -7,7 +7,7 @@

    - + ${_("We're having trouble rendering your component")}

    diff --git a/cms/templates/import.html b/cms/templates/import.html index b00db006d2..dc9bf72725 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -69,7 +69,7 @@ else:

    - + ${_("Choose a File to Import")} @@ -102,8 +102,8 @@ else:
    1. - - + +
      @@ -117,8 +117,8 @@ else:
    2. - - + +
      @@ -130,8 +130,8 @@ else:
    3. - - + +
      @@ -142,8 +142,8 @@ else:
    4. - - + +
      @@ -165,7 +165,7 @@ else:
    5. - +
      diff --git a/cms/templates/index.html b/cms/templates/index.html index 76d63a924a..daf518d8a6 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -28,19 +28,19 @@ from openedx.core.djangolib.markup import HTML, Text
      • % if course_creator_status=='granted': - + ${_("New Course")} % elif course_creator_status=='disallowed_for_this_site' and settings.FEATURES.get('STUDIO_REQUEST_EMAIL',''): ${_("Email staff to create course")} % endif % if show_new_library_button: - + ${_("New Library")} % endif % if is_programs_enabled: - + ${_("New Program")} % endif
        • @@ -220,7 +220,7 @@ from openedx.core.djangolib.markup import HTML, Text
        ${_("This course run is currently being created.")}
        - + ## Translators: This is a status message, used to inform the user of ## what the system is doing. This status means that the user has ## requested to re-run an existing course, and the system is currently @@ -270,7 +270,7 @@ from openedx.core.djangolib.markup import HTML, Text ## the process will follow this text.
        ${_("This re-run processing status:")}
        - + ${_("Configuration Error")}
        @@ -282,7 +282,7 @@ from openedx.core.djangolib.markup import HTML, Text
      @@ -381,7 +381,7 @@ from openedx.core.djangolib.markup import HTML, Text %if course_creator_status == "unrequested":

      - ${_('Becoming a Course Creator in {studio_name}').format(studio_name=settings.STUDIO_SHORT_NAME)} + ${_('Becoming a Course Creator in {studio_name}').format(studio_name=settings.STUDIO_SHORT_NAME)}

      @@ -395,7 +395,7 @@ from openedx.core.djangolib.markup import HTML, Text
      - +
      @@ -405,7 +405,7 @@ from openedx.core.djangolib.markup import HTML, Text %elif course_creator_status == "denied":

      - ${_('Your Course Creator Request Status')} + ${_('Your Course Creator Request Status')}

      @@ -433,7 +433,7 @@ from openedx.core.djangolib.markup import HTML, Text %elif course_creator_status == "pending":

      - ${_('Your Course Creator Request Status')} + ${_('Your Course Creator Request Status')}

      @@ -508,7 +508,7 @@ from openedx.core.djangolib.markup import HTML, Text
      @@ -553,7 +553,7 @@ from openedx.core.djangolib.markup import HTML, Text diff --git a/cms/templates/js/access-editor.underscore b/cms/templates/js/access-editor.underscore index a4fc348aa1..7b1b7c09b9 100644 --- a/cms/templates/js/access-editor.underscore +++ b/cms/templates/js/access-editor.underscore @@ -35,8 +35,8 @@
      7. diff --git a/cms/templates/js/asset-library.underscore b/cms/templates/js/asset-library.underscore index 3ab3cfc6eb..d199bdfb4c 100644 --- a/cms/templates/js/asset-library.underscore +++ b/cms/templates/js/asset-library.underscore @@ -26,7 +26,7 @@ <%- gettext("Type") %> Filter - +
      @@ -64,5 +64,5 @@
      -

      <%- gettext("You haven't added any assets to this course yet.") %> <%- gettext("Upload your first asset") %>

      +

      <%- gettext("You haven't added any assets to this course yet.") %> <%- gettext("Upload your first asset") %>

      diff --git a/cms/templates/js/asset-upload-modal.underscore b/cms/templates/js/asset-upload-modal.underscore index 3b146affd5..17101b0325 100644 --- a/cms/templates/js/asset-upload-modal.underscore +++ b/cms/templates/js/asset-upload-modal.underscore @@ -1,5 +1,5 @@
    - <%= gettext("Add") %> <%= model.get('display_name')%> + <%= gettext("Add") %> <%= model.get('display_name')%>
    diff --git a/cms/templates/js/metadata-number-entry.underscore b/cms/templates/js/metadata-number-entry.underscore index b30e5b84e5..8621ab528c 100644 --- a/cms/templates/js/metadata-number-entry.underscore +++ b/cms/templates/js/metadata-number-entry.underscore @@ -2,7 +2,7 @@ <%= model.get('help') %> diff --git a/cms/templates/js/metadata-option-entry.underscore b/cms/templates/js/metadata-option-entry.underscore index 952e914248..71132c66ff 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 cef204e0bd..538528afc2 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-collapsible-view.underscore b/cms/templates/js/mock/mock-collapsible-view.underscore index 78f55f2784..556fcb61cc 100644 --- a/cms/templates/js/mock/mock-collapsible-view.underscore +++ b/cms/templates/js/mock/mock-collapsible-view.underscore @@ -1,4 +1,4 @@
    - Expand/Collapse + Expand/Collapse
    Mock Content
    diff --git a/cms/templates/js/mock/mock-container-page.underscore b/cms/templates/js/mock/mock-container-page.underscore index d5356605f2..620f8995f0 100644 --- a/cms/templates/js/mock/mock-container-page.underscore +++ b/cms/templates/js/mock/mock-container-page.underscore @@ -28,20 +28,20 @@ % else:
  • - + Edit
    • % endif
  • - + Add Component
    • @@ -59,7 +59,7 @@