From 4562f13eee5435461d2b2d2eef3c1ec41ae57528 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 17 Nov 2014 12:30:01 -0500 Subject: [PATCH 01/19] CMS font icon updates --- cms/templates/asset_index.html | 6 +- cms/templates/component.html | 2 +- cms/templates/course_outline.html | 2 +- cms/templates/edit-tabs.html | 4 +- cms/templates/export.html | 2 +- cms/templates/export_git.html | 2 +- cms/templates/howitworks.html | 12 +- cms/templates/html_error.html | 2 +- cms/templates/import.html | 12 +- cms/templates/index.html | 10 +- .../js/asset-upload-modal.underscore | 2 +- cms/templates/js/asset.underscore | 2 +- cms/templates/js/checklist.underscore | 2 +- cms/templates/js/container-message.underscore | 2 +- cms/templates/js/course-outline.underscore | 16 +- cms/templates/js/edit-chapter.underscore | 2 +- .../js/group-configuration-details.underscore | 8 +- .../js/group-configuration-edit.underscore | 2 +- cms/templates/js/group-edit.underscore | 2 +- .../mock-course-rerun-notification.underscore | 2 +- .../js/mock/mock-index-page.underscore | 4 +- cms/templates/js/publish-xblock.underscore | 4 +- cms/templates/js/show-textbook.underscore | 2 +- cms/templates/js/staff-lock-editor.underscore | 4 +- cms/templates/js/system-feedback.underscore | 2 +- .../js/validation-error-modal.underscore | 2 +- .../metadata-translations-item.underscore | 2 +- .../messages/transcripts-found.underscore | 2 +- .../messages/transcripts-uploaded.underscore | 2 +- cms/templates/js/xblock-outline.underscore | 2 +- cms/templates/manage_users.html | 2 +- cms/templates/settings.html | 2 +- cms/templates/studio_xblock_wrapper.html | 2 +- cms/templates/ux/reference/container.html | 10 +- cms/templates/ux/reference/outline.html | 2 +- .../outline_section_header-collapsed.html | 4 +- .../outline_section_header-expanded.html | 4 +- .../ux/reference/outline_status_grading.html | 2 +- .../outline_status_message-error.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-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 | 4 +- .../outline_subsection_header-expanded.html | 4 +- .../ux/reference/outline_unit_header.html | 4 +- cms/templates/widgets/sock.html | 2 +- common/static/css/vendor/font-awesome.css | 1098 ++++++++++------- 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 56 files changed, 898 insertions(+), 567 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/templates/asset_index.html b/cms/templates/asset_index.html index 481fb8607734..bf2391e08916 100644 --- a/cms/templates/asset_index.html +++ b/cms/templates/asset_index.html @@ -79,7 +79,7 @@

${_("Using File URLs")}

- ${_('close')} + ${_('close')}

${_("Upload New File")}

@@ -105,14 +105,14 @@

${_("Upload New File")}

- +

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

- + ${_('close alert')}
diff --git a/cms/templates/component.html b/cms/templates/component.html index c5128ba279e3..2b530cb1281e 100644 --- a/cms/templates/component.html +++ b/cms/templates/component.html @@ -20,7 +20,7 @@
  • - + ${_("Delete this component")}
    • diff --git a/cms/templates/course_outline.html b/cms/templates/course_outline.html index 10f151bbda6f..e856216ad7db 100644 --- a/cms/templates/course_outline.html +++ b/cms/templates/course_outline.html @@ -42,7 +42,7 @@

    ${_("This course was created as a re-run. Some manual
    • - + ${_("Dismiss")}
      • diff --git a/cms/templates/edit-tabs.html b/cms/templates/edit-tabs.html index 4129af198521..d600fa4203fc 100644 --- a/cms/templates/edit-tabs.html +++ b/cms/templates/edit-tabs.html @@ -105,7 +105,7 @@

      ${_(tab.name)}

      % else: % endif -
      +
      % endif @@ -163,7 +163,7 @@

      ${_("Pages in Your Course")}

      - + ${_("close modal")}

    diff --git a/cms/templates/export.html b/cms/templates/export.html index c7714ecca103..fa77cb0c8d9d 100644 --- a/cms/templates/export.html +++ b/cms/templates/export.html @@ -51,7 +51,7 @@

    ${_("Export My Course Content")}

    • - + ${_("Export Course Content")}
      • diff --git a/cms/templates/export_git.html b/cms/templates/export_git.html index 86b5037760da..6f09695ca432 100644 --- a/cms/templates/export_git.html +++ b/cms/templates/export_git.html @@ -39,7 +39,7 @@

      ${_("Export Course to Git:")}

      • - + ${_("Export to Git")}
        • diff --git a/cms/templates/howitworks.html b/cms/templates/howitworks.html index 418d2c64ae7d..7b064364b069 100644 --- a/cms/templates/howitworks.html +++ b/cms/templates/howitworks.html @@ -34,7 +34,7 @@

        ${_("Studio's Many Features")}

        ${_('Studio Helps You Keep Your Courses Organized')}
        ${_("Studio Helps You Keep Your Courses Organized")}
        - + @@ -68,7 +68,7 @@

        ${_("Go A Week Or A Semester At A Time")}

        ${_('Learning is More than Just Lectures')}
        ${_("Learning is More than Just Lectures")}
        - + @@ -102,7 +102,7 @@

        ${_("A Broad Library of Problem Types")}

        ${_('Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.')}
        ${_("Studio Gives You Simple, Fast, and Incremental Publishing. With Friends.")}
        - + @@ -158,7 +158,7 @@

        ${_("Outlining Your Course")}

        - + ${_("close modal")}
    @@ -171,7 +171,7 @@

    ${_("More than Just Lectures")}

    - + ${_("close modal")}
    @@ -184,7 +184,7 @@

    ${_("Publishing on Date")}

    - + ${_("close modal")} diff --git a/cms/templates/html_error.html b/cms/templates/html_error.html index 65bf870029bd..c0c47a8e1dc7 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 63ab52ceb73f..bf6c963fffc4 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -36,7 +36,7 @@

    ${_("Select a .tar.gz File to Replace Your Course Content")}

    - + ${_("Choose a File to Import")} @@ -58,7 +58,7 @@

    ${_("Course Import Status")}

  • - +
    @@ -73,7 +73,7 @@

    ${_("Uploading")}

  • - +
    @@ -86,7 +86,7 @@

    ${_("Unpacking")}

  • - +
    @@ -98,7 +98,7 @@

    ${_("Verifying")}

  • - +
    @@ -108,7 +108,7 @@

    ${_("Updating Course")}

  • - +
    diff --git a/cms/templates/index.html b/cms/templates/index.html index 7a155f9ceca4..3bea4bef7704 100644 --- a/cms/templates/index.html +++ b/cms/templates/index.html @@ -183,7 +183,7 @@

    ${course_info['display_name']}

    This re-run processing status:
    - + Configuration Error
    @@ -195,7 +195,7 @@

    ${course_info['display_name']}

    diff --git a/cms/templates/studio_xblock_wrapper.html b/cms/templates/studio_xblock_wrapper.html index 4ad50666d57c..e881da6fd058 100644 --- a/cms/templates/studio_xblock_wrapper.html +++ b/cms/templates/studio_xblock_wrapper.html @@ -71,7 +71,7 @@ % endif
  • - + ${_("Delete")}
    • diff --git a/cms/templates/ux/reference/container.html b/cms/templates/ux/reference/container.html index 880a53d6fae1..8436248bc0eb 100644 --- a/cms/templates/ux/reference/container.html +++ b/cms/templates/ux/reference/container.html @@ -124,7 +124,7 @@

    Page Actions

  • - + Delete this component
    • @@ -239,7 +239,7 @@

    Speed

  • - + Delete this component
    • @@ -293,7 +293,7 @@

    Speed

  • - + Delete this component
    • @@ -324,7 +324,7 @@

    Speed

  • - + Delete this component
    • @@ -414,7 +414,7 @@

  • - + Delete this component
    • diff --git a/cms/templates/ux/reference/outline.html b/cms/templates/ux/reference/outline.html index e2475910b228..a8ac21b0dfd6 100644 --- a/cms/templates/ux/reference/outline.html +++ b/cms/templates/ux/reference/outline.html @@ -478,7 +478,7 @@

    Your Course's Outline

    Release Status: - + Released on: March 25, 2014 diff --git a/cms/templates/ux/reference/outline_section_header-collapsed.html b/cms/templates/ux/reference/outline_section_header-collapsed.html index 83956f5b029d..9b1c1a9ed267 100644 --- a/cms/templates/ux/reference/outline_section_header-collapsed.html +++ b/cms/templates/ux/reference/outline_section_header-collapsed.html @@ -10,7 +10,7 @@

  • - + Publish all content
    • @@ -22,7 +22,7 @@

    - + Delete diff --git a/cms/templates/ux/reference/outline_section_header-expanded.html b/cms/templates/ux/reference/outline_section_header-expanded.html index 83956f5b029d..9b1c1a9ed267 100644 --- a/cms/templates/ux/reference/outline_section_header-expanded.html +++ b/cms/templates/ux/reference/outline_section_header-expanded.html @@ -10,7 +10,7 @@

  • - + Publish all content
    • @@ -22,7 +22,7 @@

    - + Delete diff --git a/cms/templates/ux/reference/outline_status_grading.html b/cms/templates/ux/reference/outline_status_grading.html index 57794030e9bb..e8d0bdb1f6b4 100644 --- a/cms/templates/ux/reference/outline_status_grading.html +++ b/cms/templates/ux/reference/outline_status_grading.html @@ -1,7 +1,7 @@

    Graded as: - + Homework Due: December 31, 2014

    diff --git a/cms/templates/ux/reference/outline_status_message-error.html b/cms/templates/ux/reference/outline_status_message-error.html index 365799f429b8..b73c010d88b9 100644 --- a/cms/templates/ux/reference/outline_status_message-error.html +++ b/cms/templates/ux/reference/outline_status_message-error.html @@ -1,4 +1,4 @@
    - +

    Critical error

    diff --git a/cms/templates/ux/reference/outline_status_message-unpublished_changes.html b/cms/templates/ux/reference/outline_status_message-unpublished_changes.html index ac6a752bc0f0..0eb04a31c273 100644 --- a/cms/templates/ux/reference/outline_status_message-unpublished_changes.html +++ b/cms/templates/ux/reference/outline_status_message-unpublished_changes.html @@ -1,4 +1,4 @@
    - +

    Unpublished change(s) to live content

    diff --git a/cms/templates/ux/reference/outline_status_message-unpublished_units.html b/cms/templates/ux/reference/outline_status_message-unpublished_units.html index cab479da3e3b..8d4b9854dec0 100644 --- a/cms/templates/ux/reference/outline_status_message-unpublished_units.html +++ b/cms/templates/ux/reference/outline_status_message-unpublished_units.html @@ -1,4 +1,4 @@
    - +

    Unpublished unit(s) will not be released

    diff --git a/cms/templates/ux/reference/outline_status_release-draft.html b/cms/templates/ux/reference/outline_status_release-draft.html index 02304355abae..d6458f3842b0 100644 --- a/cms/templates/ux/reference/outline_status_release-draft.html +++ b/cms/templates/ux/reference/outline_status_release-draft.html @@ -2,7 +2,7 @@

    Release Status: - + This item is Unscheduled diff --git a/cms/templates/ux/reference/outline_status_release-released.html b/cms/templates/ux/reference/outline_status_release-released.html index d6eb3dc91bf1..8ee628633e04 100644 --- a/cms/templates/ux/reference/outline_status_release-released.html +++ b/cms/templates/ux/reference/outline_status_release-released.html @@ -2,7 +2,7 @@

    Release Status: - + Released on: March 25, 2014 diff --git a/cms/templates/ux/reference/outline_status_release-released_with_parent.html b/cms/templates/ux/reference/outline_status_release-released_with_parent.html index c06f01819192..31e05e40a76f 100644 --- a/cms/templates/ux/reference/outline_status_release-released_with_parent.html +++ b/cms/templates/ux/reference/outline_status_release-released_with_parent.html @@ -2,7 +2,7 @@

    Release Status: - + Released with Section

    diff --git a/cms/templates/ux/reference/outline_status_release-scheduled.html b/cms/templates/ux/reference/outline_status_release-scheduled.html index e6b62df57be8..7387695e05ad 100644 --- a/cms/templates/ux/reference/outline_status_release-scheduled.html +++ b/cms/templates/ux/reference/outline_status_release-scheduled.html @@ -2,7 +2,7 @@

    Release Status: - + Scheduled: October 31, 2014

    diff --git a/cms/templates/ux/reference/outline_status_release-scheduled_with_parent.html b/cms/templates/ux/reference/outline_status_release-scheduled_with_parent.html index e5ae050b3d8c..c08234c4a4ef 100644 --- a/cms/templates/ux/reference/outline_status_release-scheduled_with_parent.html +++ b/cms/templates/ux/reference/outline_status_release-scheduled_with_parent.html @@ -2,7 +2,7 @@

    Release Status: - + Scheduled: with Section

    diff --git a/cms/templates/ux/reference/outline_subsection_header-collapsed.html b/cms/templates/ux/reference/outline_subsection_header-collapsed.html index c51e69520d2c..a1837b0e68eb 100644 --- a/cms/templates/ux/reference/outline_subsection_header-collapsed.html +++ b/cms/templates/ux/reference/outline_subsection_header-collapsed.html @@ -17,7 +17,7 @@

  • - + Publish
    • @@ -29,7 +29,7 @@

    - + Delete diff --git a/cms/templates/ux/reference/outline_subsection_header-expanded.html b/cms/templates/ux/reference/outline_subsection_header-expanded.html index c51e69520d2c..a1837b0e68eb 100644 --- a/cms/templates/ux/reference/outline_subsection_header-expanded.html +++ b/cms/templates/ux/reference/outline_subsection_header-expanded.html @@ -17,7 +17,7 @@

  • - + Publish
    • @@ -29,7 +29,7 @@

    - + Delete diff --git a/cms/templates/ux/reference/outline_unit_header.html b/cms/templates/ux/reference/outline_unit_header.html index 7487c56a4695..f711fba89679 100644 --- a/cms/templates/ux/reference/outline_unit_header.html +++ b/cms/templates/ux/reference/outline_unit_header.html @@ -7,7 +7,7 @@

    diff --git a/lms/templates/dashboard/_dashboard_reverification_sidebar.html b/lms/templates/dashboard/_dashboard_reverification_sidebar.html index 85867e305d3d..d80d5bbd8631 100644 --- a/lms/templates/dashboard/_dashboard_reverification_sidebar.html +++ b/lms/templates/dashboard/_dashboard_reverification_sidebar.html @@ -23,13 +23,13 @@ % if reverifications["denied"]: % for item in reverifications["denied"]: -
  • ${_('Denied:')} ${item.course_name}
    • +
  • ${_('Denied:')} ${item.course_name}
    • % endfor %endif % if reverifications["approved"]: % for item in reverifications["approved"]: -
  • ${_('Approved:')} ${item.course_name}
    • +
  • ${_('Approved:')} ${item.course_name}
    • % endfor %endif diff --git a/lms/templates/discussion/_underscore_templates.html b/lms/templates/discussion/_underscore_templates.html index 1e36c0fc9b9a..78f7b1c8e310 100644 --- a/lms/templates/discussion/_underscore_templates.html +++ b/lms/templates/discussion/_underscore_templates.html @@ -215,7 +215,7 @@

    ${_("Editing comment")}

    icon_class = "icon-comments"; sr_text = "{discussion}"; }} else if (endorsed) {{ - icon_class = "icon-ok"; + icon_class = "icon-check"; sr_text = "{answered_question}"; }} else {{ icon_class = "icon-question"; diff --git a/lms/templates/shoppingcart/shopping_cart.html b/lms/templates/shoppingcart/shopping_cart.html index e938ad4a335b..8664046c8a72 100644 --- a/lms/templates/shoppingcart/shopping_cart.html +++ b/lms/templates/shoppingcart/shopping_cart.html @@ -59,7 +59,7 @@

    ${ course.display_name }${course.start_datetime_tex
    - +
    @@ -78,7 +78,7 @@

    ${ course.display_name }${course.start_datetime_tex % else:
    - ${_('code has been applied')} + ${_('code has been applied')}
    %endif diff --git a/lms/templates/shoppingcart/verified_cert_receipt.html b/lms/templates/shoppingcart/verified_cert_receipt.html index 2924d515c2a3..18852b5c4e33 100644 --- a/lms/templates/shoppingcart/verified_cert_receipt.html +++ b/lms/templates/shoppingcart/verified_cert_receipt.html @@ -65,7 +65,7 @@

    ${_("Your Progress")}

  • - + ${_("Current Step: ")}${_("Confirmation")}
    • diff --git a/lms/templates/verify_student/_modal_editname.html b/lms/templates/verify_student/_modal_editname.html index 93d39694712a..c47d3c010b43 100644 --- a/lms/templates/verify_student/_modal_editname.html +++ b/lms/templates/verify_student/_modal_editname.html @@ -28,7 +28,7 @@

    ${_("Edit Your Name")}

    - + ${_("close")} diff --git a/lms/templates/verify_student/face_upload.html b/lms/templates/verify_student/face_upload.html index d2944589073c..a180aefaf5a0 100644 --- a/lms/templates/verify_student/face_upload.html +++ b/lms/templates/verify_student/face_upload.html @@ -92,7 +92,7 @@

    Take Your Photo

    Take photo
  • - Looks good + Looks good
    • @@ -156,7 +156,7 @@

    Take Your Photo

    Take photo
  • - Looks good + Looks good
    • @@ -316,7 +316,7 @@

    ${_("Edit Your Full Name")}

    - + close diff --git a/lms/templates/verify_student/midcourse_photo_reverification.html b/lms/templates/verify_student/midcourse_photo_reverification.html index 177c7ca8ce78..c01efd3dd863 100644 --- a/lms/templates/verify_student/midcourse_photo_reverification.html +++ b/lms/templates/verify_student/midcourse_photo_reverification.html @@ -17,7 +17,7 @@

    <%= gettext("Tasks Completed:") %> <%= itemsChecked %>/<%= items.length %> - + diff --git a/cms/templates/js/course-outline.underscore b/cms/templates/js/course-outline.underscore index 60892834014c..36907ead6325 100644 --- a/cms/templates/js/course-outline.underscore +++ b/cms/templates/js/course-outline.underscore @@ -100,7 +100,7 @@ if (xblockInfo.get('graded')) { <%= gettext('Release Status:') %> <% if (xblockInfo.get('released_to_students')) { %> - + <%= gettext('Released:') %> <% } else if (xblockInfo.get('release_date')) { %> @@ -119,7 +119,7 @@ if (xblockInfo.get('graded')) {

    <%= gettext('Graded as:') %> - + <%= gradingType %> <% if (xblockInfo.get('due_date')) { %> <%= gettext('Due:') %> <%= xblockInfo.get('due_date') %> diff --git a/cms/templates/js/publish-xblock.underscore b/cms/templates/js/publish-xblock.underscore index b2a4115271f1..c7c343a6c3fc 100644 --- a/cms/templates/js/publish-xblock.underscore +++ b/cms/templates/js/publish-xblock.underscore @@ -80,9 +80,9 @@ var visibleToStaffOnly = visibilityState === 'staff_only';

    <% if (hasExplicitStaffLock) { %> - + <% } else { %> - + <% } %> <%= gettext('Hide from students') %> diff --git a/cms/templates/js/staff-lock-editor.underscore b/cms/templates/js/staff-lock-editor.underscore index b0b81d1b3b41..d295bef17f40 100644 --- a/cms/templates/js/staff-lock-editor.underscore +++ b/cms/templates/js/staff-lock-editor.underscore @@ -5,8 +5,8 @@

  • From a7fd20732e95bb83aa37ad0598d82adfd3fee6d9 Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 17 Nov 2014 13:34:32 -0500 Subject: [PATCH 08/19] LMS icon font cleanup pass #2 --- lms/templates/courseware/course_about.html | 2 +- .../dashboard/_dashboard_prompt_midcourse_reverify.html | 2 +- lms/templates/dashboard/_dashboard_reverification_sidebar.html | 2 +- lms/templates/shoppingcart/shopping_cart.html | 2 +- lms/templates/verify_student/_modal_editname.html | 2 +- lms/templates/verify_student/face_upload.html | 2 +- lms/templates/wiki/includes/article_menu.html | 2 +- lms/templates/wiki/plugins/attachments/index.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index 1d9b8959ccbe..3c73fdec9785 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -308,7 +308,7 @@

  • ${_("Estimated Effort")}

    ${get_course_about_section(course, "effort")}
    • % endif - ##

  • ${_('Course Length')}

    ${_('{number} weeks').format(number=15)}
    • + ##

  • ${_('Course Length')}

    ${_('{number} weeks').format(number=15)}
    • % if get_course_about_section(course, "prerequisites"):

  • ${_("Prerequisites")}

    ${get_course_about_section(course, "prerequisites")}
    • diff --git a/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html b/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html index 0288d8d40748..a7f99ae9da17 100644 --- a/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html +++ b/lms/templates/dashboard/_dashboard_prompt_midcourse_reverify.html @@ -80,7 +80,7 @@

    ${_("Your re-verification failed")}

    % endfor
    • - +
    diff --git a/lms/templates/dashboard/_dashboard_reverification_sidebar.html b/lms/templates/dashboard/_dashboard_reverification_sidebar.html index d6b38e0cbb5a..0c3bfe203dfd 100644 --- a/lms/templates/dashboard/_dashboard_reverification_sidebar.html +++ b/lms/templates/dashboard/_dashboard_reverification_sidebar.html @@ -23,7 +23,7 @@ % if reverifications["denied"]: % for item in reverifications["denied"]: -
  • ${_('Denied:')} ${item.course_name}
    • +
  • ${_('Denied:')} ${item.course_name}
    • % endfor %endif diff --git a/lms/templates/shoppingcart/shopping_cart.html b/lms/templates/shoppingcart/shopping_cart.html index 0d908f036dbf..2cb25dddd1c8 100644 --- a/lms/templates/shoppingcart/shopping_cart.html +++ b/lms/templates/shoppingcart/shopping_cart.html @@ -59,7 +59,7 @@

    ${ course.display_name }${course.start_datetime_tex
    - +
    diff --git a/lms/templates/verify_student/_modal_editname.html b/lms/templates/verify_student/_modal_editname.html index c47d3c010b43..48a6e279e865 100644 --- a/lms/templates/verify_student/_modal_editname.html +++ b/lms/templates/verify_student/_modal_editname.html @@ -28,7 +28,7 @@

    ${_("Edit Your Name")}

    - + ${_("close")} diff --git a/lms/templates/verify_student/face_upload.html b/lms/templates/verify_student/face_upload.html index 0b089d836b12..3fbed3baf233 100644 --- a/lms/templates/verify_student/face_upload.html +++ b/lms/templates/verify_student/face_upload.html @@ -316,7 +316,7 @@

    ${_("Edit Your Full Name")}

    - + close diff --git a/lms/templates/wiki/includes/article_menu.html b/lms/templates/wiki/includes/article_menu.html index 02a8de86a9dd..e3665e63386e 100644 --- a/lms/templates/wiki/includes/article_menu.html +++ b/lms/templates/wiki/includes/article_menu.html @@ -25,7 +25,7 @@
  • - + ${_("Changes")} ${_("{span_start}(active){span_end}").format(span_start="", span_end="") if selected_tab == "history" else ""} diff --git a/lms/templates/wiki/plugins/attachments/index.html b/lms/templates/wiki/plugins/attachments/index.html index 77cd0d17afcc..c4c85ea31d7a 100644 --- a/lms/templates/wiki/plugins/attachments/index.html +++ b/lms/templates/wiki/plugins/attachments/index.html @@ -118,7 +118,7 @@

    - + {% trans "File history" %} ({{ attachment.attachmentrevision_set.all.count }} {% trans "revisions" %}) From 4eeed2ec65c357aadd8f18e9baf8a98f07b2169e Mon Sep 17 00:00:00 2001 From: Chris Date: Mon, 17 Nov 2014 13:45:52 -0500 Subject: [PATCH 09/19] CMS icon font cleanup pass #5 --- cms/templates/js/checklist.underscore | 2 +- cms/templates/js/course-outline.underscore | 2 +- cms/templates/js/staff-lock-editor.underscore | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/templates/js/checklist.underscore b/cms/templates/js/checklist.underscore index fc2b72504e67..545c80fd14dc 100644 --- a/cms/templates/js/checklist.underscore +++ b/cms/templates/js/checklist.underscore @@ -15,7 +15,7 @@ <%= checklistShortDescription %>

    <%= gettext("Tasks Completed:") %> <%= itemsChecked %>/<%= items.length %> - + diff --git a/cms/templates/js/course-outline.underscore b/cms/templates/js/course-outline.underscore index 36907ead6325..c5be961f189f 100644 --- a/cms/templates/js/course-outline.underscore +++ b/cms/templates/js/course-outline.underscore @@ -100,7 +100,7 @@ if (xblockInfo.get('graded')) { <%= gettext('Release Status:') %> <% if (xblockInfo.get('released_to_students')) { %> - + <%= gettext('Released:') %> <% } else if (xblockInfo.get('release_date')) { %> diff --git a/cms/templates/js/staff-lock-editor.underscore b/cms/templates/js/staff-lock-editor.underscore index d295bef17f40..f369d0ad000b 100644 --- a/cms/templates/js/staff-lock-editor.underscore +++ b/cms/templates/js/staff-lock-editor.underscore @@ -5,7 +5,7 @@
  • From 39afbe3252d13b0de9794a3acfeb5c1d8c6196af Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 18 Nov 2014 16:24:00 -0500 Subject: [PATCH 10/19] Initial stages of the student notes markup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @talbs I chose to use the existing layout already in LMS, even though it looks a little different from the wires. Let me know if the wires are the “new direction” for LMS and I’ll make the necessary changes. This commit also includes a bunch of icon font updates from another branch, so that I could use the new icon fonts in this work. It probably includes too many commits, but I wanted to make sure I got everything for LMS. --- cms/templates/ux/reference/student-notes.html | 27 +++ lms/static/sass/course.scss.mako | 3 + lms/static/sass/views/_student-notes.scss | 161 ++++++++++++++++ .../ux/reference/student-notes-recent.html | 179 ++++++++++++++++++ lms/templates/ux/reference/student-notes.html | 137 ++++++++++++++ 5 files changed, 507 insertions(+) create mode 100644 cms/templates/ux/reference/student-notes.html create mode 100644 lms/static/sass/views/_student-notes.scss create mode 100644 lms/templates/ux/reference/student-notes-recent.html create mode 100644 lms/templates/ux/reference/student-notes.html diff --git a/cms/templates/ux/reference/student-notes.html b/cms/templates/ux/reference/student-notes.html new file mode 100644 index 000000000000..05b2c4a40a89 --- /dev/null +++ b/cms/templates/ux/reference/student-notes.html @@ -0,0 +1,27 @@ + + +
    +
    + +
    +
    +

    + > Notes + Highlights and personal notes you've made within this course +

    +
    +
    \ No newline at end of file diff --git a/lms/static/sass/course.scss.mako b/lms/static/sass/course.scss.mako index eb35050fe9b0..a1362fb53991 100644 --- a/lms/static/sass/course.scss.mako +++ b/lms/static/sass/course.scss.mako @@ -75,3 +75,6 @@ // discussion @import "course/discussion/form-wmd-toolbar"; + +// views +@import "views/student-notes"; \ No newline at end of file diff --git a/lms/static/sass/views/_student-notes.scss b/lms/static/sass/views/_student-notes.scss new file mode 100644 index 000000000000..8a5d3c96884b --- /dev/null +++ b/lms/static/sass/views/_student-notes.scss @@ -0,0 +1,161 @@ +.student-notes { + + .updates { + padding-bottom: $baseline; + + .title-search-container { + border-bottom: 1px solid $gray-l3; + margin-bottom: $baseline; + + .title-wrapper { + display: inline-block; + width: flex-grid(7,12); + + h1 { + font-weight: 100; + + small { + display: block; + line-height: 100%; + font-size: 60%; + } + } + } + + .search-wrapper { + display: inline-block; + width: flex-grid(5,12); + text-align: right; + + .search-input { + width: 55%; + padding: ($baseline/3); + } + } + } + + .tabs-wrapper { + + .tab-list { + position: relative; + + .tabs-label { + float: left; + margin-bottom: 0; + padding: ($baseline/2) $baseline; + padding-left: 0; + font-size: 90%; + font-weight: 700; + } + + .tabs { + float: left; + margin: 0; + padding: 0; + list-style: none; + + .tab { + float: left; + + a { + display: block; + padding: ($baseline/2) $baseline; + } + } + + .tab.active { + + a { + color: $gray-d3; + border-bottom: ($baseline/5) solid $gray-d3; + } + } + } + } + + .tab-panel { + + .note { + margin: 0; + padding: ($baseline*1.5) 0; + border-bottom: 1px solid $gray-l3; + + .excerpt { + float: left; + width: flex-grid(9, 12); + + p { + padding: $baseline; + background: tint($blue, 95%); + font-size: 90%; + } + + .note-comments { + position: relative; + margin: 0; + padding: 0; + list-style: none; + background: tint($blue, 85%); + + li { + padding: ($baseline/2) $baseline; + + p { + padding: 0; + margin: 0; + font-size: 90%; + font-weight: 500; + background: transparent; + } + } + } + + .note-comments:before { + display: block; + position: absolute; + top: -12px; + left: 12px; + height: 12px; + width: 12px; + font-family: "FontAwesome"; + content: "\f0d8"; + color: tint($blue, 85%); + } + } + + .references { + float: left; + width: flex-grid(3, 12); + font-size: 90%; + + div { + padding: 0 $baseline; + color: $gray-l3; + + h3 { + margin-top: $baseline; + text-transform: uppercase; + font-size: 100%; + font-weight: 500; + letter-spacing: 1px; + color: $gray-l3; + } + + h3:first-child { + margin-top: 0; + } + + a { + font-weight: 500; + } + } + } + + .note:last-child { + border-bottom: none; + } + } + } + } + } +} \ No newline at end of file diff --git a/lms/templates/ux/reference/student-notes-recent.html b/lms/templates/ux/reference/student-notes-recent.html new file mode 100644 index 000000000000..e7c79ddab457 --- /dev/null +++ b/lms/templates/ux/reference/student-notes-recent.html @@ -0,0 +1,179 @@ +<%! from django.utils.translation import ugettext as _ %> +<%! from django.core.urlresolvers import reverse %> + +<%inherit file="/main.html" /> +<%namespace name='static' file='/static_content.html'/> + +<%block name="pagetitle">Student Notes +<%block name="nav_skip">#instructor-dashboard-content + +<%block name="headextra"> + <%static:css group='style-course-vendor'/> + <%static:css group='style-vendor-tinymce-content'/> + <%static:css group='style-vendor-tinymce-skin'/> + <%static:css group='style-course'/> + + +
    + + +
    +
    +
    +
    +

    Notes Highlights and personal notes you have made within this course

    +
    + +
    +
    + + + +
    +
    +
    + +
    +
    +

    View Notes By:

    + +
    +
    +

    Recent Activity

    + +
    +
    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
      +
    1. +

      Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      +
      2. +
    +
    + +
    + +
    +
    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
    + +
    + +
    + +
    +
    +
    +
    + +
    + +
    \ No newline at end of file diff --git a/lms/templates/ux/reference/student-notes.html b/lms/templates/ux/reference/student-notes.html new file mode 100644 index 000000000000..434a910c77c6 --- /dev/null +++ b/lms/templates/ux/reference/student-notes.html @@ -0,0 +1,137 @@ +<%! from django.utils.translation import ugettext as _ %> +<%! from django.core.urlresolvers import reverse %> + +<%inherit file="/main.html" /> +<%namespace name='static' file='/static_content.html'/> + +<%block name="pagetitle">Student Notes +<%block name="nav_skip">#instructor-dashboard-content + +<%block name="headextra"> + <%static:css group='style-course-vendor'/> + <%static:css group='style-vendor-tinymce-content'/> + <%static:css group='style-vendor-tinymce-skin'/> + <%static:css group='style-course'/> + + +
    + + +
    +
    +
    +
    +

    Notes Highlights and personal notes you have made within this course

    +
    + +
    +
    +
    +

    You haven not made any notes in this course yet.

    +

    Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

    + +

    Other Students In This Course Are Using Notes To:

    +
      +
    • Add study notes to course content for exams and homework.
      • +
    • Highlight important concepts for later coursework or future courses
      • +
    • Donec id elit non mi porta gravida et eget metus.
      • +
    • Praesent commodo cursus magna, vel scelerisque nisl consectetur et.
      • +
    + +
    +

    Start creating notes

    +

    Get started by making a note in something you just read, like Week 1: Introduction to Justice.

    +
    +
    +
    +
    +
    +
    +
    +
    + +
    + +
    \ No newline at end of file From 1611501d0099f54fea3be256a9a3c1a043f7e7d5 Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 19 Nov 2014 15:42:09 -0500 Subject: [PATCH 11/19] Adding Course Structure template, adjusting styles --- lms/static/sass/views/_student-notes.scss | 45 ++- .../ux/reference/student-notes-course.html | 314 ++++++++++++++++++ .../ux/reference/student-notes-recent.html | 55 ++- lms/templates/ux/reference/student-notes.html | 2 +- 4 files changed, 398 insertions(+), 18 deletions(-) create mode 100644 lms/templates/ux/reference/student-notes-course.html diff --git a/lms/static/sass/views/_student-notes.scss b/lms/static/sass/views/_student-notes.scss index 8a5d3c96884b..07199b9a8cd5 100644 --- a/lms/static/sass/views/_student-notes.scss +++ b/lms/static/sass/views/_student-notes.scss @@ -4,7 +4,7 @@ padding-bottom: $baseline; .title-search-container { - border-bottom: 1px solid $gray-l3; + border-bottom: 1px solid $gray-l4; margin-bottom: $baseline; .title-wrapper { @@ -78,7 +78,7 @@ .note { margin: 0; padding: ($baseline*1.5) 0; - border-bottom: 1px solid $gray-l3; + border-top: 1px solid $gray-l4; .excerpt { float: left; @@ -86,7 +86,7 @@ p { padding: $baseline; - background: tint($blue, 95%); + background: tint($blue, 85%); font-size: 90%; } @@ -95,10 +95,11 @@ margin: 0; padding: 0; list-style: none; - background: tint($blue, 85%); + background: tint($blue, 95%); li { padding: ($baseline/2) $baseline; + border-bottom: 2px solid $white; p { padding: 0; @@ -113,13 +114,13 @@ .note-comments:before { display: block; position: absolute; - top: -12px; - left: 12px; - height: 12px; - width: 12px; + top: -13px; + left: 20px; + height: 16px; + width: 16px; font-family: "FontAwesome"; content: "\f0d8"; - color: tint($blue, 85%); + color: tint($blue, 95%); } } @@ -130,7 +131,7 @@ div { padding: 0 $baseline; - color: $gray-l3; + color: $gray-l2; h3 { margin-top: $baseline; @@ -138,7 +139,7 @@ font-size: 100%; font-weight: 500; letter-spacing: 1px; - color: $gray-l3; + color: $gray-l2; } h3:first-child { @@ -150,11 +151,29 @@ } } } + } + + .note-group { + padding-top: ($baseline*1.5); - .note:last-child { - border-bottom: none; + .group-lecture { + padding-bottom: $baseline; + border-bottom: 2px solid $gray-l4; + text-transform: uppercase; + letter-spacing: 1px; + + .subtitle { + display: block; + font-size: 75%; + font-weight: 100; + color: inherit; + } } } + + .note.no-top-border { + border-top: none; + } } } } diff --git a/lms/templates/ux/reference/student-notes-course.html b/lms/templates/ux/reference/student-notes-course.html new file mode 100644 index 000000000000..ee27edb0b978 --- /dev/null +++ b/lms/templates/ux/reference/student-notes-course.html @@ -0,0 +1,314 @@ +<%! from django.utils.translation import ugettext as _ %> +<%! from django.core.urlresolvers import reverse %> + +<%inherit file="/main.html" /> +<%namespace name='static' file='/static_content.html'/> + +<%block name="pagetitle">Student Notes +<%block name="nav_skip">#instructor-dashboard-content + +<%block name="headextra"> + <%static:css group='style-course-vendor'/> + <%static:css group='style-vendor-tinymce-content'/> + <%static:css group='style-vendor-tinymce-skin'/> + <%static:css group='style-course'/> + + +
    + + +
    +
    +
    +
    +

    Notes Highlights and personal notes you have made within this course

    +
    + +
    +
    + + + +
    +
    +
    + +
    +
    +

    View Notes By:

    + +
    + + +
    +
    +
    +
    + +
    + +
    \ No newline at end of file diff --git a/lms/templates/ux/reference/student-notes-recent.html b/lms/templates/ux/reference/student-notes-recent.html index e7c79ddab457..755be2044ecc 100644 --- a/lms/templates/ux/reference/student-notes-recent.html +++ b/lms/templates/ux/reference/student-notes-recent.html @@ -14,7 +14,7 @@ <%static:css group='style-course'/> -
    +
    • - +======= +
    +
    + + + +
    +
    + + +
    +
    +

    View Notes By:

    + +
    +
    +

    Recent Activity

    + +
    +
    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
    + +>>>>>>> Stashed changes
    +<<<<<<< Updated upstream
    +======= + +
    +
    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
      +
    1. +

      Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      +
      2. +
    2. +

      Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      +
      3. +
    3. +

      Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

      +
      4. +
    +
    + +
    + + + +>>>>>>> Stashed changes From b75e054441720b1652c168005c59b5bf58533272 Mon Sep 17 00:00:00 2001 From: clrux Date: Wed, 26 Nov 2014 10:07:29 -0500 Subject: [PATCH 16/19] Wrapping up PR feedback --- lms/static/sass/views/_student-notes.scss | 1 + .../ux/reference/student-notes-course.html | 227 ++---------------- .../ux/reference/student-notes-recent.html | 115 ++------- 3 files changed, 43 insertions(+), 300 deletions(-) diff --git a/lms/static/sass/views/_student-notes.scss b/lms/static/sass/views/_student-notes.scss index f7d52aae622c..1231ad2d585b 100644 --- a/lms/static/sass/views/_student-notes.scss +++ b/lms/static/sass/views/_student-notes.scss @@ -115,6 +115,7 @@ a.reference-meta { font-weight: $font-regular; + color: $gray-l2; } } } diff --git a/lms/templates/ux/reference/student-notes-course.html b/lms/templates/ux/reference/student-notes-course.html index 208476a9a9f1..97776884ceff 100644 --- a/lms/templates/ux/reference/student-notes-course.html +++ b/lms/templates/ux/reference/student-notes-course.html @@ -48,224 +48,40 @@

    Notes Highlights and persona -<<<<<<< Updated upstream

    View Notes By:

    -
    -
    diff --git a/lms/templates/ux/reference/student-notes-recent.html b/lms/templates/ux/reference/student-notes-recent.html index 3d6fd1e577e8..730b2381a9e9 100644 --- a/lms/templates/ux/reference/student-notes-recent.html +++ b/lms/templates/ux/reference/student-notes-recent.html @@ -48,22 +48,23 @@

    Notes Highlights and persona -<<<<<<< Updated upstream

    View Notes By:

    -
    -
    + +

    Recent Activity

    -
    -

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +

    ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

    +
      +
        -======= -
        -
        - - - -
        -
        - -
        -
        -

        View Notes By:

        - -
        -
        -

        Recent Activity

        - -
        -
        -

        ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

        -
        - ->>>>>>> Stashed changes -
        - -<<<<<<< Updated upstream
        -======= - -
        -
        -

        ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

        -
          -
        1. -

          Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

          -
          2. -
        2. -

          Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

          -
          3. -
        3. -

          Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

          -
          4. -
        -
        - -
        - - - ->>>>>>> Stashed changes
        From 3a792370e2ed7d90b7958c3e6abe8630528989a6 Mon Sep 17 00:00:00 2001 From: clrux Date: Wed, 26 Nov 2014 10:18:26 -0500 Subject: [PATCH 17/19] Student Notes --- .../js/spec/views/group_configuration_spec.js | 4 +-- .../views/pages/container_subviews_spec.js | 4 +-- cms/templates/import.html | 20 ++++++------- cms/templates/js/publish-xblock.underscore | 4 +-- cms/templates/js/staff-lock-editor.underscore | 4 +-- lms/static/sass/views/_student-notes.scss | 30 +++++++++++-------- 6 files changed, 35 insertions(+), 31 deletions(-) diff --git a/cms/static/js/spec/views/group_configuration_spec.js b/cms/static/js/spec/views/group_configuration_spec.js index 6a7abbf04105..3c64e98c5475 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-triangle', 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 50653efcc726..2809c779a412 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/templates/import.html b/cms/templates/import.html index 312f4d95d20d..57043734db81 100644 --- a/cms/templates/import.html +++ b/cms/templates/import.html @@ -36,7 +36,7 @@

        ${_("Select a .tar.gz File to Replace Your Course Content")}

        - + ${_("Choose a File to Import")} @@ -57,8 +57,8 @@

        ${_("Course Import Status")}

        1. - - + +
          @@ -72,8 +72,8 @@

          ${_("Uploading")}

        2. - - + +
          @@ -85,8 +85,8 @@

          ${_("Unpacking")}

        3. - - + +
          @@ -97,8 +97,8 @@

          ${_("Verifying")}

        4. - - + +
          @@ -108,7 +108,7 @@

          ${_("Updating Course")}

        5. - +
          diff --git a/cms/templates/js/publish-xblock.underscore b/cms/templates/js/publish-xblock.underscore index c7c343a6c3fc..4b746523d7dd 100644 --- a/cms/templates/js/publish-xblock.underscore +++ b/cms/templates/js/publish-xblock.underscore @@ -80,9 +80,9 @@ var visibleToStaffOnly = visibilityState === 'staff_only';

          <% if (hasExplicitStaffLock) { %> - + <% } else { %> - + <% } %> <%= gettext('Hide from students') %> diff --git a/cms/templates/js/staff-lock-editor.underscore b/cms/templates/js/staff-lock-editor.underscore index f369d0ad000b..19b1d9298dee 100644 --- a/cms/templates/js/staff-lock-editor.underscore +++ b/cms/templates/js/staff-lock-editor.underscore @@ -5,8 +5,8 @@

        6. diff --git a/lms/static/sass/views/_student-notes.scss b/lms/static/sass/views/_student-notes.scss index 1231ad2d585b..d01c60b41b61 100644 --- a/lms/static/sass/views/_student-notes.scss +++ b/lms/static/sass/views/_student-notes.scss @@ -16,7 +16,7 @@ display: inline-block; width: flex-grid(7,12); - h1.page-title { + .page-title { font-weight: $font-light; .page-subtitle { @@ -48,10 +48,13 @@ border-bottom: none; .note-excerpt { - float: left; + display: inline-block; width: flex-grid(9, 12); + vertical-align: top; - p { + .note-excerpt-p, + .note-excerpt-ul, + .note-excerpt-ol { @extend %t-copy-base; padding: $baseline; background: tint($blue, 85%); @@ -64,11 +67,11 @@ list-style: none; background: tint($blue, 95%); - li { + .note-comment { padding: ($baseline/2) $baseline; border-bottom: 2px solid $white; - p { + .note-comment-p { @extend %t-copy-sub1; padding: 0; margin: 0; @@ -93,8 +96,9 @@ .reference { @extend %t-copy-sub1; - float: left; + display: inline-block; width: flex-grid(3, 12); + vertical-align: top; .wrapper-reference-content { padding: 0 $baseline; @@ -113,7 +117,7 @@ margin-top: 0; } - a.reference-meta { + .reference-meta { font-weight: $font-regular; color: $gray-l2; } @@ -156,7 +160,7 @@ .tabs-label { @extend %t-copy-base; @include line-height(14); - float: left; + display: inline; margin-bottom: 0; padding: ($baseline/2) $baseline; padding-left: 0; @@ -165,22 +169,22 @@ .tabs { @include clearfix(); - float: left; + display: inline; margin: 0; padding: 0; list-style: none; .tab { - float: left; + display: inline; - a.tab-label { - display: block; + .tab-label { + display: inline-block; padding: ($baseline/2) $baseline; } &.is-active { - a.tab-label { + .tab-label { color: $gray-d3; border-bottom: ($baseline/5) solid $gray-d3; } From c124aca190b0116b8d72d80a6c366193f46bef9d Mon Sep 17 00:00:00 2001 From: Chris Date: Wed, 3 Dec 2014 15:20:46 -0500 Subject: [PATCH 18/19] Student Notes PR fixes --- lms/static/sass/views/_student-notes.scss | 34 ++++++---- .../ux/reference/student-notes-course.html | 64 +++++++++--------- .../ux/reference/student-notes-recent.html | 65 ++++++++----------- 3 files changed, 83 insertions(+), 80 deletions(-) diff --git a/lms/static/sass/views/_student-notes.scss b/lms/static/sass/views/_student-notes.scss index d01c60b41b61..7f7fedec0fa1 100644 --- a/lms/static/sass/views/_student-notes.scss +++ b/lms/static/sass/views/_student-notes.scss @@ -47,17 +47,21 @@ border-top: 1px solid $gray-l4; border-bottom: none; - .note-excerpt { + .wrapper-note-excerpts { display: inline-block; width: flex-grid(9, 12); - vertical-align: top; - .note-excerpt-p, - .note-excerpt-ul, - .note-excerpt-ol { - @extend %t-copy-base; - padding: $baseline; - background: tint($blue, 85%); + .note-excerpt { + display: inline-block; + vertical-align: top; + background: tint($blue, 95%); + + .note-excerpt-p, + .note-excerpt-ul, + .note-excerpt-ol { + @extend %t-copy-base; + padding: $baseline; + } } .note-comments { @@ -65,7 +69,6 @@ margin: 0; padding: 0; list-style: none; - background: tint($blue, 95%); .note-comment { padding: ($baseline/2) $baseline; @@ -119,7 +122,16 @@ .reference-meta { font-weight: $font-regular; - color: $gray-l2; + color: $m-gray-d2; + } + + a.reference-meta { + color: $link-color; + + &:hover, + &:focus { + color: $link-hover; + } } } } @@ -135,8 +147,6 @@ text-transform: uppercase; letter-spacing: 1px; - .course-title {} - .course-subtitle { @extend %t-copy-sub1; display: block; diff --git a/lms/templates/ux/reference/student-notes-course.html b/lms/templates/ux/reference/student-notes-course.html index 97776884ceff..77b6c140c2e3 100644 --- a/lms/templates/ux/reference/student-notes-course.html +++ b/lms/templates/ux/reference/student-notes-course.html @@ -57,21 +57,6 @@

          View Notes By:

          -
          -

          Recent Activity

          - -
          -
          - -
          - -
          -
          -

          Course Structure

          @@ -82,8 +67,16 @@

          -
          -

          ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

          +
          +
          +

          ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

          +
          + +
            +
          1. +

            Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

            +
            2. +
          -
          -

          ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

          +
          +
          +

          ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

          +
          +
            -
          1. -

            Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

            +
          2. +

            Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

          @@ -122,11 +118,14 @@

          -
          -

          ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

          +
          +
          +

          ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

          +
          +
            -
          1. -

            Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

            +
          2. +

            Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

          @@ -134,18 +133,21 @@

          Highlighted & Noted In:

          Reading 1: The Queen vs. Dudley and Stephens (1884) (The Lifeboat Case) -

          Last Edited:

          +

          Added:

          September 24, 2014 at 10:01PM

          -
          -

          ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

          +
          +
          +

          ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

          +
          +
            -
          1. -

            Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

            +
          2. +

            Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

          @@ -153,7 +155,7 @@

          Last Edited:

          Highlighted & Noted In:

          Reading 1: The Queen vs. Dudley and Stephens (1884) (The Lifeboat Case) -

          Last Edited:

          +

          Added:

          September 24, 2014 at 10:01PM
          diff --git a/lms/templates/ux/reference/student-notes-recent.html b/lms/templates/ux/reference/student-notes-recent.html index 730b2381a9e9..981b02b0c905 100644 --- a/lms/templates/ux/reference/student-notes-recent.html +++ b/lms/templates/ux/reference/student-notes-recent.html @@ -59,54 +59,45 @@

          View Notes By:

          Recent Activity

          -
          - -
          +
          +

          ...Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris ... More

          -
            -
              +

              1. Adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

              - -
              -
              - -
              -

              Course Structure

              -
              - -
              -
              + +
              +
              + +
            From 2c63262c4389c23ef2cecceac6c9a331b8580259 Mon Sep 17 00:00:00 2001 From: Chris Date: Thu, 4 Dec 2014 15:03:30 -0500 Subject: [PATCH 19/19] Style tweaks for Student Notes --- lms/static/sass/views/_student-notes.scss | 62 ++++++++++++++++--- .../ux/reference/student-notes-course.html | 8 +-- lms/templates/ux/reference/student-notes.html | 6 +- 3 files changed, 61 insertions(+), 15 deletions(-) diff --git a/lms/static/sass/views/_student-notes.scss b/lms/static/sass/views/_student-notes.scss index 7f7fedec0fa1..cc7090b6639c 100644 --- a/lms/static/sass/views/_student-notes.scss +++ b/lms/static/sass/views/_student-notes.scss @@ -54,46 +54,90 @@ .note-excerpt { display: inline-block; vertical-align: top; - background: tint($blue, 95%); + background: $m-blue-l4; .note-excerpt-p, .note-excerpt-ul, .note-excerpt-ol { @extend %t-copy-base; - padding: $baseline; + position: relative; + padding: $baseline ($baseline*4) $baseline ($baseline*4); } } + .note-excerpt > .note-excerpt-p:before, + .note-excerpt > .note-excerpt-ul:before, + .note-excerpt > .note-excerpt-ol:before, + .note-excerpt > .note-excerpt-p:after, + .note-excerpt > .note-excerpt-ul:after, + .note-excerpt > .note-excerpt-ol:after { + @extend %t-title3; + display: block; + position: absolute; + height: 40px; + width: 40px; + font-family: "FontAwesome"; + // color: $gray-l4; + color: $white; + } + + .note-excerpt > .note-excerpt-p:before, + .note-excerpt > .note-excerpt-ul:before, + .note-excerpt > .note-excerpt-ol:before { + content: "\f10d"; + top: $baseline; + left: $baseline; + } + + .note-excerpt > .note-excerpt-p:after, + .note-excerpt > .note-excerpt-ul:after, + .note-excerpt > .note-excerpt-ol:after { + content: "\f10e"; + bottom: $baseline; + right: $baseline; + } + .note-comments { position: relative; margin: 0; padding: 0; list-style: none; + // background: $m-blue-l4; .note-comment { padding: ($baseline/2) $baseline; border-bottom: 2px solid $white; - .note-comment-p { - @extend %t-copy-sub1; + .note-comment-p, + .note-comment-ul, + .note-comment-ol { + @extend %t-weight4; padding: 0; margin: 0; - font-weight: $font-regular; background: transparent; } + + .note-comment-ul, + .note-comment-ol { + padding: auto; + margin: auto; + } } } .note-comments:before { + @extend %t-title4; display: block; position: absolute; - top: -13px; + top: -14px; left: 20px; - height: 16px; - width: 16px; + height: 24px; + width: 24px; font-family: "FontAwesome"; + line-height: 20px; content: "\f0d8"; - color: tint($blue, 95%); + // color: $m-blue-l4; + color: $white; } } diff --git a/lms/templates/ux/reference/student-notes-course.html b/lms/templates/ux/reference/student-notes-course.html index 77b6c140c2e3..72c78a338029 100644 --- a/lms/templates/ux/reference/student-notes-course.html +++ b/lms/templates/ux/reference/student-notes-course.html @@ -61,10 +61,10 @@

            View Notes By:

            Course Structure

            -

            +

            Lecture 1 - Doing the Right Thing The Queen Vs Dudley and Stephens (1884) -

            +

            @@ -112,10 +112,10 @@

            Last Edited:

            -

            +

            Section Name That Contains Notes Is Placed Here Subsection Name That's A Child of the Section Can Be Placed Here And Go On For Quite A While -

            +

            diff --git a/lms/templates/ux/reference/student-notes.html b/lms/templates/ux/reference/student-notes.html index 94f1861e3b26..ced293f0ab55 100644 --- a/lms/templates/ux/reference/student-notes.html +++ b/lms/templates/ux/reference/student-notes.html @@ -34,8 +34,10 @@
            -
            -

            Notes Highlights and personal notes you have made within this course

            +
            +
            +

            Notes Highlights and personal notes you have made within this course

            +