From 950d39838729ba77a94fda7b5c2c582a51901f95 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Wed, 9 Jan 2013 10:19:42 -0500 Subject: [PATCH 1/2] Updates to the CSS --- .../src/peer_grading/peer_grading_problem.coffee | 2 ++ lms/static/sass/course/_staff_grading.scss | 15 ++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee index 85b5f064a4..119144d96a 100644 --- a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee +++ b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee @@ -129,6 +129,8 @@ class PeerGradingProblem @interstitial_page_button = $('.interstitial-page-button') Collapsible.setCollapsibles(@content_panel) + + # Set up the click event handlers @action_button.click -> document.location.reload(true) @calibration_feedback_button.click => @calibration_feedback_panel.hide() diff --git a/lms/static/sass/course/_staff_grading.scss b/lms/static/sass/course/_staff_grading.scss index 816c0efd50..92fa760d4a 100644 --- a/lms/static/sass/course/_staff_grading.scss +++ b/lms/static/sass/course/_staff_grading.scss @@ -120,29 +120,22 @@ div.peer-grading{ .calibration-panel { float:left; - width:47%; + width:48%; } .grading-panel { float:right; - width: 47%; + width: 48%; } .current-state { - background: #0F6B8A; + background: #1D9DD9; h3, p { color: white; } } - &:after - { - content:"."; - display:block; - height:0; - visibility: hidden; - clear:both; - } + @include clearfix; } From 13c692c29b538e4084edaf68d69f8d6abbb77405 Mon Sep 17 00:00:00 2001 From: Diana Huang Date: Wed, 9 Jan 2013 14:59:59 -0500 Subject: [PATCH 2/2] Show back button when we see an error. --- lms/static/coffee/src/peer_grading/peer_grading_problem.coffee | 1 + 1 file changed, 1 insertion(+) diff --git a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee index 3a7b7c515a..639fcca947 100644 --- a/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee +++ b/lms/static/coffee/src/peer_grading/peer_grading_problem.coffee @@ -330,6 +330,7 @@ class PeerGradingProblem @calibration_feedback_panel.hide() @error_container.html(error_message) @content_panel.hide() + @action_button.show() show_submit_button: () => @submit_button.show()