Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make status bar, minor CSS fixes

Browse Source
This commit is contained in:
Vik Paruchuri
2013-02-07 14:03:43 -05:00
parent b1726dae99
commit 1cf8326b32
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
common/lib/xmodule/xmodule/css/combinedopenended/display.scss
View File

@@ -47,10 +47,11 @@ section.combined-open-ended-status {
.statusitem {
color: #2C2C2C;
font-size: 1em;
background-color : #d4d4d4;
font-size: .9em;
padding: 0px;
display: block;
width: 70%;
display: inline;
width: 20%;
.show-results {
margin-top: .3em;
text-align:right;
@@ -61,7 +62,7 @@ section.combined-open-ended-status {
}
.statusitem-current {
background-color: #d4d4d4;
background-color: #B2B2B2;
color: #222;
}

1
lms/static/sass/course/_rubric.scss
View File

@@ -21,7 +21,6 @@
{
position: relative;
font-size: .9em;
background-color: white;
display: block;
}
.grade {

13
lms/templates/combined_open_ended_status.html
View File

@@ -1,5 +1,4 @@
%if status_list[0]['state'] != 'initial':
<h4>Status</h4>
<div class="status-elements">
<section id="combined-open-ended-status" class="combined-open-ended-status">
%for i in xrange(0,len(status_list)):
@@ -10,17 +9,7 @@
<div class="statusitem" data-status-number="${i}">
%endif
${status['task_number']}. ${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
${status['human_task']} (${status['human_state']}) ${status['score']} / ${status['max_score']}
%if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
<a href="#results" class="show-results-button"> Show results</a>
%endif