diff --git a/lms/static/sass/course/_staff_grading.scss b/lms/static/sass/course/_staff_grading.scss index 4dd225199c..739cdc6ca5 100644 --- a/lms/static/sass/course/_staff_grading.scss +++ b/lms/static/sass/course/_staff_grading.scss @@ -1,7 +1,6 @@ div.staff-grading, div.peer-grading{ - padding: $baseline; - border: none; + border: 1px solid lightgray; textarea.feedback-area { margin: 0; @@ -37,7 +36,8 @@ div.peer-grading{ &.submission-container{ @include clearfix; overflow-y: auto; - height: 150px; + height: auto; + max-height: 300px; border: 1px solid #ddd; background: #F6F6F6; } @@ -133,12 +133,14 @@ div.peer-grading{ .instructions-panel { @include clearfix; - margin-right:2px; + padding: $baseline/2; + background-color: #eee; + font-size: .8em; > div { margin-bottom: 5px; - padding: 2px; - width: 47.6%; + padding: $baseline/2; + width: 49%; background: #eee; h3 { @@ -152,18 +154,19 @@ div.peer-grading{ } } .calibration-panel { - float: left; + display: inline-block; + width: 20%; + border-radius: 3px; } .grading-panel { - float: right; + display: inline-block; + width: 20%; + border-radius: 3px; } .current-state { - background: #1d9dd9; + background: #fff; - h3, p { - color: white; - } } } @@ -186,3 +189,20 @@ div.peer-grading{ } } +div.peer-grading { + border-radius: $baseline/2; + padding: 0; + + .prompt-wrapper { + padding: $baseline; + } + + .grading-wrapper { + padding: $baseline; + } +} + +div.staff-grading { + padding: $baseline; +} + diff --git a/lms/templates/combinedopenended/combined_open_ended.html b/lms/templates/combinedopenended/combined_open_ended.html index 84ac00fab3..098f6d456a 100644 --- a/lms/templates/combinedopenended/combined_open_ended.html +++ b/lms/templates/combinedopenended/combined_open_ended.html @@ -11,12 +11,12 @@
- Open Response + ${_("Open Response")}
- Assessments: + ${_("Assessments:")}
${status|n} @@ -30,7 +30,7 @@
- Hide Prompt + ${_("Hide Prompt")}
% for item in items: @@ -38,7 +38,7 @@ % endfor
- Response: + ${_("Response: ")}
diff --git a/lms/templates/combinedopenended/combined_open_ended_results.html b/lms/templates/combinedopenended/combined_open_ended_results.html index b013586d4f..94208d43dc 100644 --- a/lms/templates/combinedopenended/combined_open_ended_results.html +++ b/lms/templates/combinedopenended/combined_open_ended_results.html @@ -9,13 +9,13 @@
- Submitted Rubric + ${_("Submitted Rubric")}
- Rubric: - + ${_("Rubric: ")} + - Scores: + ${_("Scores:")} % if len(results)>1: % endif diff --git a/lms/templates/instructor/staff_grading.html b/lms/templates/instructor/staff_grading.html index 40e80de11e..8595b0d722 100644 --- a/lms/templates/instructor/staff_grading.html +++ b/lms/templates/instructor/staff_grading.html @@ -19,75 +19,69 @@

${_("Staff grading")}

-
-
-
-
-
-
+
+
+
-

${_("Instructions")}

-
-

${_("This is the list of problems that currently need to be graded in order to train the machine learning models. Each problem needs to be trained separately, and we have indicated the number of student submissions that need to be graded in order for a model to be generated. You can grade more than the minimum required number of submissions--this will improve the accuracy of machine learning, though with diminishing returns. You can see the current accuracy of machine learning while grading.")}

-
+

${_("Instructions")}

+
+

${_("This is the list of problems that currently need to be graded in order to train the machine learning models. Each problem needs to be trained separately, and we have indicated the number of student submissions that need to be graded in order for a model to be generated. You can grade more than the minimum required number of submissions--this will improve the accuracy of machine learning, though with diminishing returns. You can see the current accuracy of machine learning while grading.")}

+
-

${_("Problem List")}

- -
+

${_("Problem List")}

+ +
-

-
-
-
-
-
-
-
+

+

+
+
+
+
+
+
+

${_('Prompt')} ${_("(Hide)")}

-
-
+
- +
- +
+
+
+

${_("Student Response")}

+
+
+
+
+

+

+

+

+

${_("Written Feedback")}

+ +

+ ${_("Flag as inappropriate content for later review")} +

+
+
+ + +
-
-
-

${_("Student Response")}

-
-
-
-
-

-

-

-

-

${_("Written Feedback")}

- -

- ${_("Flag as inappropriate content for later review")} -

-
+
- -
- - -
- -
- -
+
diff --git a/lms/templates/peer_grading/peer_grading_problem.html b/lms/templates/peer_grading/peer_grading_problem.html index a46f9135a0..a0078b8868 100644 --- a/lms/templates/peer_grading/peer_grading_problem.html +++ b/lms/templates/peer_grading/peer_grading_problem.html @@ -4,102 +4,95 @@
-
-
-

${_("Learning to Grade")}

-
-
-

${_("Peer Grading")}

-
-
- -
-
-
+
+
+

${_("Learning to Grade")}

+
+
+

${_("Peer Grading")}

- ${_('Hide Prompt')}
-
-
-
+ +
+
+
+
+ ${_('Hide Prompt')} +
+
+
+
+
+
+
+
+
+

${_("Student Response")}

+
+
+

+
+
+ + +
+
+

+

+

${_("Written Feedback")}

+

${_("Please include some written feedback as well.")}

+ +
${_("This submission has explicit or pornographic content : ")} + +
+
${_("I do not know how to grade this question : ")} + +
+
+
+ +
+
+
+
+ +
+

${_("How did I do?")}

+
+ +
-
+ +
+

${_("Ready to grade!")}

+

${_("You have finished learning to grade, which means that you are now ready to start grading.")}

+ +
+ +
+

${_("Learning to grade")}

+

${_("You have not yet finished learning to grade this problem.")}

+

${_("You will now be shown a series of instructor-scored essays, and will be asked to score them yourself.")}

+

${_("Once you can score the essays similarly to an instructor, you will be ready to grade your peers.")}

+ +
-
-

${_("Student Response")}

- -
-
-

-
+ +
+

${_("Are you sure that you want to flag this submission?")}

+

+ ${_("You are about to flag a submission. You should only flag a submission that contains explicit or offensive content. If the submission is not addressed to the question or is incorrect, you should give it a score of zero and accompanying feedback instead of flagging it.")} +

+
+ +
- - -
-
-

-

-

-

${_("Written Feedback")}

-

${_("Please include some written feedback as well.")}

- -
${_("This submission has explicit or pornographic content : ")}
-
${_("I do not know how to grade this question : ")}
-
+
- -
- -
- -
-
-
- -
- - -
-

${_("How did I do?")}

-
-
- -
- - -
-

${_("Ready to grade!")}

-

${_("You have finished learning to grade, which means that you are now ready to start grading.")}

- -
- - -
-

${_("Learning to grade")}

-

${_("You have not yet finished learning to grade this problem.")}

-

${_("You will now be shown a series of instructor-scored essays, and will be asked to score them yourself.")}

-

${_("Once you can score the essays similarly to an instructor, you will be ready to grade your peers.")}

- -
- - -
-

${_("Are you sure that you want to flag this submission?")}

-

- ${_("You are about to flag a submission. You should only flag a submission that contains explicit or offensive content. If the submission is not addressed to the question or is incorrect, you should give it a score of zero and accompanying feedback instead of flagging it.")} -

-
- - -
-
- - - +