Commit 1cf8326b by Vik Paruchuri

Make status bar, minor CSS fixes

parent b1726dae
...@@ -47,10 +47,11 @@ section.combined-open-ended-status { ...@@ -47,10 +47,11 @@ section.combined-open-ended-status {
.statusitem { .statusitem {
color: #2C2C2C; color: #2C2C2C;
font-size: 1em; background-color : #d4d4d4;
font-size: .9em;
padding: 0px; padding: 0px;
display: block; display: inline;
width: 70%; width: 20%;
.show-results { .show-results {
margin-top: .3em; margin-top: .3em;
text-align:right; text-align:right;
...@@ -61,7 +62,7 @@ section.combined-open-ended-status { ...@@ -61,7 +62,7 @@ section.combined-open-ended-status {
} }
.statusitem-current { .statusitem-current {
background-color: #d4d4d4; background-color: #B2B2B2;
color: #222; color: #222;
} }
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
{ {
position: relative; position: relative;
font-size: .9em; font-size: .9em;
background-color: white;
display: block; display: block;
} }
.grade { .grade {
......
%if status_list[0]['state'] != 'initial': %if status_list[0]['state'] != 'initial':
<h4>Status</h4>
<div class="status-elements"> <div class="status-elements">
<section id="combined-open-ended-status" class="combined-open-ended-status"> <section id="combined-open-ended-status" class="combined-open-ended-status">
%for i in xrange(0,len(status_list)): %for i in xrange(0,len(status_list)):
...@@ -10,17 +9,7 @@ ...@@ -10,17 +9,7 @@
<div class="statusitem" data-status-number="${i}"> <div class="statusitem" data-status-number="${i}">
%endif %endif
${status['task_number']}. ${status['human_task']} (${status['human_state']}) : ${status['score']} / ${status['max_score']} ${status['human_task']} (${status['human_state']}) ${status['score']} / ${status['max_score']}
% if status['state'] == 'initial':
<span class="unanswered" id="status"></span>
% elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'correct':
<span class="correct" id="status"></span>
% elif status['state'] in ['done', 'post_assessment'] and status['correct'] == 'incorrect':
<span class="incorrect" id="status"></span>
% elif status['state'] == 'assessing':
<span class="grading" id="status"></span>
% endif
%if status['type']=="openended" and status['state'] in ['done', 'post_assessment']: %if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
<a href="#results" class="show-results-button"> Show results</a> <a href="#results" class="show-results-button"> Show results</a>
%endif %endif
......
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