From 578f7ae86fca543ab21c95637ca7b07443617984 Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Fri, 12 Jul 2013 12:40:14 -0700 Subject: [PATCH 1/2] renamed tab, redisplayed legend and changed assessment type name to Reviewed Assessment --- .../xmodule/xmodule/css/combinedopenended/display.scss | 1 - .../js/src/peergrading/peer_grading_problem.coffee | 9 +++------ .../combined_open_ended_modulev1.py | 2 +- lms/templates/peer_grading/peer_grading_problem.html | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss index 9f75637447d2..8378f6002337 100644 --- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss +++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss @@ -52,7 +52,6 @@ section.legend-container { width: 20%; } margin-bottom: 5px; - display: none !important; } section.combined-open-ended-status { diff --git a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee index 776db0e47c3d..010c9aed421b 100644 --- a/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee +++ b/common/lib/xmodule/xmodule/js/src/peergrading/peer_grading_problem.coffee @@ -294,9 +294,6 @@ class @PeerGradingProblem # Callbacks for various events # ########## - - remove_answer_unknown: () => - @answer_unknown_checkbox.removeAttr("checked") remove_flag: () => @flag_student_checkbox.removeAttr("checked") @@ -352,9 +349,9 @@ class @PeerGradingProblem @grading_wrapper.attr('data-graded', graded) #just in case someone wants to read the DOM message = "

Successfully saved your feedback. Fetched the next essay.

" if graded >= required - message = "

Successfully saved your feedback. Fetched the next essay. - You have completed the required number of peer evaluations, but may - choose to continue grading if you'd like.

" + message = "

Successfully saved your feedback. Fetched the next essay.

+

You have completed the required number of peer evaluations, but may + choose to continue grading if you'd like.

" @grading_message.fadeIn() @grading_message.html(message) $.scrollTo(@grading_message) diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py index 1fe62035e65e..f0a208395fe3 100644 --- a/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py +++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py @@ -32,7 +32,7 @@ HUMAN_TASK_TYPE = { 'selfassessment': "Self Assessment", - 'openended': "edX Assessment", + 'openended': "Reviewed Assessment", } # Default value that controls whether or not to skip basic spelling checks in the controller diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html index 776154cfc4dd..3d086ee6678a 100644 --- a/lms/templates/peer_grading/peer_grading_problem.html +++ b/lms/templates/peer_grading/peer_grading_problem.html @@ -47,7 +47,7 @@

Written Feedback

This submission has explicit or pornographic content :
-
I do not know how to grade this question :
+
I'm not confident about my choices above :
From 1fa2a70a532d1fa3bb092289cd29456dc251e42a Mon Sep 17 00:00:00 2001 From: Giulio Gratta Date: Fri, 12 Jul 2013 15:53:22 -0700 Subject: [PATCH 2/2] wording change for unknown answer checkbox text --- lms/templates/peer_grading/peer_grading_problem.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html index 3d086ee6678a..0a991adf56fe 100644 --- a/lms/templates/peer_grading/peer_grading_problem.html +++ b/lms/templates/peer_grading/peer_grading_problem.html @@ -47,7 +47,7 @@

Written Feedback

This submission has explicit or pornographic content :
-
I'm not confident about my choices above :
+
I am uncomfortable with my choices above :