Commit 3646ff53 by Diana Huang

Display updates and fixes.

parent 2b4e9f45
...@@ -37,7 +37,7 @@ section.combined-open-ended { ...@@ -37,7 +37,7 @@ section.combined-open-ended {
.result-container .result-container
{ {
float:left; float:left;
width: 93%; width: 100%;
position:relative; position:relative;
} }
h4 h4
...@@ -64,8 +64,8 @@ section.combined-open-ended-status { ...@@ -64,8 +64,8 @@ section.combined-open-ended-status {
} }
.statusitem-current { .statusitem-current {
background-color: #cdc; background-color: #d4d4d4;
color: #2C2C2C; color: #222;
} }
span { span {
...@@ -101,6 +101,7 @@ section.combined-open-ended-status { ...@@ -101,6 +101,7 @@ section.combined-open-ended-status {
div.result-container { div.result-container {
.evaluation { .evaluation {
p { p {
margin-bottom: 1px; margin-bottom: 1px;
} }
...@@ -112,6 +113,7 @@ div.result-container { ...@@ -112,6 +113,7 @@ div.result-container {
} }
.evaluation-response { .evaluation-response {
margin-bottom: 10px;
header { header {
text-align: right; text-align: right;
a { a {
...@@ -142,6 +144,7 @@ div.result-container { ...@@ -142,6 +144,7 @@ div.result-container {
} }
.external-grader-message { .external-grader-message {
margin-bottom: 5px;
section { section {
padding-left: 20px; padding-left: 20px;
background-color: #FAFAFA; background-color: #FAFAFA;
...@@ -247,7 +250,7 @@ div.result-container, section.open-ended-child { ...@@ -247,7 +250,7 @@ div.result-container, section.open-ended-child {
margin:2px; margin:2px;
position: relative; position: relative;
padding: 15px 15px 25px 15px; padding: 15px 15px 25px 15px;
width: 150px; width: 145px;
height:100%; height:100%;
display: inline-block; display: inline-block;
min-height: 50px; min-height: 50px;
...@@ -469,7 +472,6 @@ section.open-ended-child { ...@@ -469,7 +472,6 @@ section.open-ended-child {
p { p {
line-height: 20px; line-height: 20px;
text-transform: capitalize;
margin-bottom: 0; margin-bottom: 0;
float: left; float: left;
} }
......
...@@ -124,6 +124,7 @@ div.peer-grading{ ...@@ -124,6 +124,7 @@ div.peer-grading{
margin: 0px; margin: 0px;
background: #eee; background: #eee;
height: 10em; height: 10em;
width:48%;
h3 h3
{ {
text-align:center; text-align:center;
...@@ -138,12 +139,10 @@ div.peer-grading{ ...@@ -138,12 +139,10 @@ div.peer-grading{
.calibration-panel .calibration-panel
{ {
float:left; float:left;
width:48%;
} }
.grading-panel .grading-panel
{ {
float:right; float:right;
width: 48%;
} }
.current-state .current-state
{ {
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
% if status['state'] == 'initial': % if status['state'] == 'initial':
<span class="unanswered" id="status"></span> <span class="unanswered" id="status"></span>
% elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'correct': % elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'correct':
<span class="correct" id="status"></span> <span class="correct" id="status"></span>
% elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'incorrect': % elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'incorrect':
<span class="incorrect" id="status"></span> <span class="incorrect" id="status"></span>
% elif status['state'] == 'assessing': % elif status['state'] == 'assessing':
<span class="grading" id="status"></span> <span class="grading" id="status"></span>
% endif % endif
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
% if state == 'initial': % if state == 'initial':
<span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span> <span class="unanswered" style="display:inline-block;" id="status_${id}">Unanswered</span>
% elif state in ['done', 'post_assessment'] and correct == 'correct': % elif state in ['done', 'post_assessment'] and correct == 'correct':
<span class="correct" id="status_${id}">Correct</span> <span class="correct" id="status_${id}">Correct</span> <p>Correct</p>
% elif state in ['done', 'post_assessment'] and correct == 'incorrect': % elif state in ['done', 'post_assessment'] and correct == 'incorrect':
<span class="incorrect" id="status_${id}">Incorrect</span> <span class="incorrect" id="status_${id}">Incorrect</span> <p>This submission has been assessed as incorrect. </p>
% elif state == 'assessing': % elif state == 'assessing':
<span class="grading" id="status_${id}">Submitted for grading</span> <span class="grading" id="status_${id}">Submitted for grading</span>
% endif % endif
......
<form class="rubric-template" id="inputtype_${id}"> <form class="rubric-template" id="inputtype_${id}">
<h3>Rubric</h3> <h3>Rubric</h3>
% if view_only and has_score: % if view_only and has_score:
<p>This is the rubric that was used to grade your submission.The highlighted selection matches how the grader feels you performed in each category.</p> <p>This is the rubric that was used to grade your submission. The highlighted selection matches how the grader feels you performed in each category.</p>
% elif view_only: % elif view_only:
<p>Use the below rubric to rate this submission.</p> <p>Use the below rubric to rate this submission.</p>
% else: % else:
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<% option = category['options'][j] %> <% option = category['options'][j] %>
<td> <td>
% if view_only: % if view_only:
## if this is the selected rubric block, show it ## if this is the selected rubric block, show it highlighted
% if option['selected']: % if option['selected']:
<div class="view-only selected-grade"> <div class="view-only selected-grade">
% else: % else:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment