From 0feb8f66bcacb43c11ede7cd5e34e5fe5693f6dc Mon Sep 17 00:00:00 2001 From: Vik Paruchuri Date: Fri, 8 Feb 2013 23:59:39 -0500 Subject: [PATCH] Fix colors on legend, add random assessment --- .../xmodule/xmodule/combined_open_ended_rubric.py | 2 ++ .../xmodule/css/combinedopenended/display.scss | 3 +-- common/static/images/random_grading_icon.png | Bin 0 -> 724 bytes lms/templates/combined_open_ended_legend.html | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 common/static/images/random_grading_icon.png diff --git a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py index 162a188c72..02c253f555 100644 --- a/common/lib/xmodule/xmodule/combined_open_ended_rubric.py +++ b/common/lib/xmodule/xmodule/combined_open_ended_rubric.py @@ -4,6 +4,7 @@ from lxml import etree log = logging.getLogger(__name__) GRADER_TYPE_IMAGE_DICT = { + '8B' : '/static/images/random_grading_icon.png', 'SA' : '/static/images/self_assessment_icon.png', 'PE' : '/static/images/peer_grading_icon.png', 'ML' : '/static/images/ml_grading_icon.png', @@ -12,6 +13,7 @@ GRADER_TYPE_IMAGE_DICT = { } HUMAN_GRADER_TYPE = { + '8B' : 'Magic-8-Ball-Assessment', 'SA' : 'Self-Assessment', 'PE' : 'Peer-Assessment', 'IN' : 'Instructor-Assessment', diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss index b2139d3b31..6a9e9ad2a5 100644 --- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss +++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss @@ -45,8 +45,7 @@ section.combined-open-ended { section.legend-container { .legenditem { - color: #FFFFFF; - background-color : #000000; + background-color : #d4d4d4; font-size: .9em; padding: 2px; display: inline; diff --git a/common/static/images/random_grading_icon.png b/common/static/images/random_grading_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d3737e61b071e91e14b4e891bc82aae510cbf177 GIT binary patch literal 724 zcmV;_0xSKAP){PO6&?Q|;gbps*x~iR|gCvIN6i5ha9!8V+ zi2l9j!!LwhxPI5`J?B0(ZES2{XJ-dmW@cud%kx%rRdjCZJ{SEh`a|MRbZj=8g%wXk zz!{gz^?7Aw#o_gOVKSL891d}Lc{zW4d>pCQ>tA!Z+;<86CPZUmOsqhh7O{UuqtW$v zJdSWU48PxxX0wS>sf2@r1Ki%;;_U1Uhlhu_xVR`te9|zCp{^jaw6wGyi^Y&gB$Okc z&!f}nAel_UVzHo7slem$AQ%kd;o%`6zhxxsi&?U>=TD(f2+PaM3behwjbgEgR4S#2 zgj|tWtyVZ34)}aN=J+Tr&YQ(ZM`?=mkwAiay&kTwuhpvw zrRrZC?V{*kS)qkh2$>#`YKtWk#P#we87mRxCBC%CB{t
+ Legend
% for i in xrange(0,len(legend_list)): <%legend_title=legend_list[i]['name'] %>