diff --git a/lms/envs/common.py b/lms/envs/common.py index 5413bf9bfe..247a0774db 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1294,7 +1294,6 @@ discussion_vendor_js = [ ] staff_grading_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/staff_grading/**/*.js')) -open_ended_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/open_ended/**/*.js')) notes_js = sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/notes/**/*.js')) instructor_dash_js = ( sorted(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/instructor_dashboard/**/*.js')) + @@ -1479,8 +1478,8 @@ PIPELINE_CSS = { } -common_js = set(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/**/*.js')) - set(courseware_js + discussion_js + staff_grading_js + open_ended_js + notes_js + instructor_dash_js) # pylint: disable=line-too-long -project_js = set(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/**/*.js')) - set(courseware_js + discussion_js + staff_grading_js + open_ended_js + notes_js + instructor_dash_js) # pylint: disable=line-too-long +common_js = set(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/**/*.js')) - set(courseware_js + discussion_js + staff_grading_js + notes_js + instructor_dash_js) # pylint: disable=line-too-long +project_js = set(rooted_glob(PROJECT_ROOT / 'static', 'coffee/src/**/*.js')) - set(courseware_js + discussion_js + staff_grading_js + notes_js + instructor_dash_js) # pylint: disable=line-too-long PIPELINE_JS = { @@ -1535,10 +1534,6 @@ PIPELINE_JS = { 'source_filenames': staff_grading_js, 'output_filename': 'js/staff_grading.js', }, - 'open_ended': { - 'source_filenames': open_ended_js, - 'output_filename': 'js/open_ended.js', - }, 'notes': { 'source_filenames': notes_js, 'output_filename': 'js/notes.js', diff --git a/lms/static/coffee/src/open_ended/open_ended.coffee b/lms/static/coffee/src/open_ended/open_ended.coffee deleted file mode 100644 index 058776bda8..0000000000 --- a/lms/static/coffee/src/open_ended/open_ended.coffee +++ /dev/null @@ -1,65 +0,0 @@ -# This is a simple class that just hides the error container -# and message container when they are empty -# Can (and should be) expanded upon when our problem list -# becomes more sophisticated -class OpenEnded - constructor: (ajax_url) -> - @ajax_url = ajax_url - @error_container = $('.error-container') - @error_container.toggle(not @error_container.is(':empty')) - - @message_container = $('.message-container') - @message_container.toggle(not @message_container.is(':empty')) - - @problem_list = $('.problem-list') - - @ban_button = $('.ban-button') - @unflag_button = $('.unflag-button') - @ban_button.click @ban - @unflag_button.click @unflag - - unflag: (event) => - event.preventDefault() - parent_tr = $(event.target).parent().parent() - tr_children = parent_tr.children() - action_type = "unflag" - submission_id = parent_tr.data('submission-id') - student_id = parent_tr.data('student-id') - callback_func = @after_action_wrapper($(event.target), action_type) - @post('take_action_on_flags', {'submission_id' : submission_id, 'student_id' : student_id, 'action_type' : action_type}, callback_func) - - ban: (event) => - event.preventDefault() - parent_tr = $(event.target).parent().parent() - tr_children = parent_tr.children() - action_type = "ban" - submission_id = parent_tr.data('submission-id') - student_id = parent_tr.data('student-id') - callback_func = @after_action_wrapper($(event.target), action_type) - @post('take_action_on_flags', {'submission_id' : submission_id, 'student_id' : student_id, 'action_type' : action_type}, callback_func) - - post: (cmd, data, callback) -> - # if this post request fails, the error callback will catch it - $.post(@ajax_url + cmd, data, callback) - .error => callback({success: false, error: "Error occurred while performing javascript ajax post."}) - - after_action_wrapper: (target, action_type) -> - tr_parent = target.parent().parent() - tr_children = tr_parent.children() - action_taken = tr_children[4].firstElementChild - action_taken.innerText = "#{action_type} done for student." - return @handle_after_action - - handle_after_action: (data) -> - if !data.success - @gentle_alert data.error - - gentle_alert: (msg) => - if $('.message-container').length - $('.message-container').remove() - alert_elem = "
" + msg + "
" - $('.error-container').after(alert_elem) - $('.message-container').css(opacity: 0).animate(opacity: 1, 700) - -ajax_url = $('.open-ended-problems').data('ajax_url') -$(document).ready(() -> new OpenEnded(ajax_url)) diff --git a/lms/static/sass/_build-course.scss b/lms/static/sass/_build-course.scss index c4a13a67fa..2883ab38e6 100644 --- a/lms/static/sass/_build-course.scss +++ b/lms/static/sass/_build-course.scss @@ -45,9 +45,6 @@ @import "course/profile"; @import "course/gradebook"; @import "course/tabs"; -@import "course/staff_grading"; -@import "course/rubric"; -@import "course/open_ended_grading"; @import "course/student-notes"; @import "views/teams"; diff --git a/lms/static/sass/course/_open_ended_grading.scss b/lms/static/sass/course/_open_ended_grading.scss deleted file mode 100644 index e9bf04d938..0000000000 --- a/lms/static/sass/course/_open_ended_grading.scss +++ /dev/null @@ -1,64 +0,0 @@ -.open-ended-problems, -.combined-notifications { - padding: ($baseline*2); - - .problem-list { - table-layout: auto; - margin-top: ($baseline/2); - width: 70%; - - td, th { - padding: 7px; - } - } - - .notification-container { - margin: ($baseline*1.5) 0; - } - - .notification { - @include clearfix(); - margin: ($baseline/2); - width: 30%; - display: inline-block; - vertical-align: top; - - .notification-link { - display:block; - height: 9em; - padding: ($baseline/2); - border: 1px solid black; - text-align: center; - - p { - font-size: 0.9em; - text-align: center; - } - } - - .notification-title { - text-transform: uppercase; - background: $blue; - color: white; - padding: ($baseline/4) 0; - font-size: 1.1em; - } - - .notification-link:hover, - .notification-link:focus { - background-color: #eee; - } - - .notification-description { - padding-top:5%; - } - - .alert-message { - - img { - vertical-align: baseline; - } - } - } - -} diff --git a/lms/static/sass/course/_rubric.scss b/lms/static/sass/course/_rubric.scss deleted file mode 100644 index b0830e7881..0000000000 --- a/lms/static/sass/course/_rubric.scss +++ /dev/null @@ -1,85 +0,0 @@ -.rubric-header { - background-color: #fafafa; - border-radius: 5px; - - .rubric-collapse { - margin-right: $baseline/2; - } -} - -.button { - display: inline-block; -} - -.rubric { - margin: 0; - color: #3C3C3C; - - tr { - margin: 0; - height: 100%; - } - - td { - height: 100%; - border: 1px black solid; - text-align: center; - } - - th { - margin: $baseline/4; - padding: $baseline/4; - text-align: center; - } - - .points-header th { - padding: 0px; - } - - .rubric-label { - position: relative; - display: block; - font-size: .9em; - - .choicegroup-correct { - //nothing - } - - .choicegroup-incorrect { - display:none; - } - } - - .grade { - position: absolute; - bottom: 0; - right: 0; - } - .selected-grade, - .selected-grade .rubric-label { - background: #666; - color: white; - } - - input[type=radio]:checked + .rubric-label { - background: white; - color: $base-font-color; - white-space:nowrap; - } - - .wrappable { - white-space:normal; - } - - input[class='score-selection'] { - position: relative; - font-size: 16px; - } - - ul.rubric-list { - margin: 0; - padding: 0; - list-style-type: none; - } -} - diff --git a/lms/static/sass/course/_staff_grading.scss b/lms/static/sass/course/_staff_grading.scss deleted file mode 100644 index f9a712e877..0000000000 --- a/lms/static/sass/course/_staff_grading.scss +++ /dev/null @@ -1,248 +0,0 @@ -div.staff-grading, -div.peer-grading { - border: 1px solid lightgray; - - textarea.feedback-area { - margin: 0; - height: 75px; - } - - div.feedback-area.track-changes { - position: relative; - margin: 0; - height: 400px; - border: 1px solid lightgray; - padding: ($baseline/4); - resize: vertical; - width: 99%; - overflow: auto; - } - - div.feedback-area.track-changes, p.ice-legend { - - .ice-controls { - float: right; - } - .del { - position: relative; - text-decoration: line-through; - background-color: #ffc3c3; - } - .ins { - position: relative; - background-color: #c3ffc3; - } - } - - ul.rubric-list{ - margin: 0; - padding: 0; - list-style-type: none; - - li { - &.rubric-list-item{ - margin-bottom: 0; - padding: 0; - } - } - } - - h1 { - margin: 0 0 0 ($baseline/2); - } - - h2 { - a { - text-size: 0.5em; - } - } - - div { - margin: 0; - - &.submission-container{ - @include clearfix(); - overflow-y: auto; - max-height: 300px; - height: auto; - border: 1px solid #ddd; - background: $gray-l6; - } - } - - label { - margin: 0; - padding: ($baseline/10); - min-width: 50px; - text-size: 1.5em; - } - - /* Toggled State */ - input[type=radio]:checked + label { - background: #666; - color: white; - } - - input[name='score-selection'], - input[name='grade-selection'] { - display: none; - } - - .problem-list { - width: 100%; - table-layout: auto; - text-align: center; - - th { - padding: ($baseline/10); - } - - td { - padding: ($baseline/10); - } - - td.problem-name { - text-align: left; - } - - .ui-progressbar { - margin: 0; - padding: 0; - height: 1em; - } - } - - .prompt-information-container, - .rubric-wrapper, - .calibration-feedback-wrapper, - .grading-container { - padding: ($baseline/2) 0; - } - - .error-container { - margin-left: 0; - padding: ($baseline/10); - background-color: #ffcccc; - } - - .submission-wrapper { - padding: ($baseline/10); - padding-bottom: ($baseline*0.75); - - h3 { - margin-bottom: ($baseline/10); - } - - p { - margin-left: ($baseline/10); - } - } - .meta-info-wrapper { - padding: ($baseline/10); - background-color: #eee; - - div { - display: inline; - } - } - .message-container, - .grading-message { - margin-left: 0; - padding: ($baseline/10); - background-color: $yellow; - } - - .breadcrumbs { - margin: ($baseline/2) ($baseline/4); - font-size: .8em; - } - - .instructions-panel { - @include clearfix(); - padding: ($baseline/2); - background-color: #eee; - font-size: .8em; - - > div { - margin-bottom: ($baseline/4); - padding: ($baseline/2); - width: 49%; - background: #eee; - - h3 { - color: #777; - text-align: center; - text-transform: uppercase; - } - - p{ - color: #777; - } - } - .calibration-panel { - display: inline-block; - width: 20%; - border-radius: 3px; - } - - .grading-panel { - display: inline-block; - width: 20%; - border-radius: 3px; - } - .current-state { - background: $white; - - } - } - - .collapsible { - margin-left: 0; - - header { - margin-top: ($baseline/10); - margin-bottom: ($baseline/10); - font-size: 1.2em; - } - } - - .interstitial-page { - text-align: center; - - input[type=button] { - margin-top: $baseline; - } - } -} - -div.peer-grading { - border-radius: ($baseline/2); - padding: 0; - - .peer-grading-tools { - padding: $baseline; - } - - .error-container { - margin: $baseline; - border-radius: ($baseline/4); - padding: ($baseline/2); - } - - .interstitial-page, .calibration -feedback, .calibration-interstitial-page { - padding: $baseline; - } - - .prompt-wrapper { - padding: $baseline; - } - - .grading-wrapper { - padding: $baseline; - } -} - -div.staff-grading { - padding: $baseline; -} -