diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss index d8072bb1b3..b2139d3b31 100644 --- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss +++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss @@ -43,6 +43,17 @@ section.combined-open-ended { } } +section.legend-container { + .legenditem { + color: #FFFFFF; + background-color : #000000; + font-size: .9em; + padding: 2px; + display: inline; + width: 20%; + } +} + section.combined-open-ended-status { .statusitem { @@ -59,12 +70,12 @@ section.combined-open-ended-status { .show-results-button { font: 1em monospace; } - } + } .statusitem-current { background-color: #B2B2B2; color: #222; - } + } span { &.unanswered { diff --git a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee index 377d08cd13..504a1c2fd3 100644 --- a/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee +++ b/common/lib/xmodule/xmodule/js/src/combinedopenended/display.coffee @@ -397,13 +397,13 @@ class @CombinedOpenEnded window.queuePollerID = window.setTimeout(@poll, 10000) setup_file_upload: => - if window.File and window.FileReader and window.FileList and window.Blob - if @accept_file_upload == "True" - @can_upload_files = true - @file_upload_area.html('') - @file_upload_area.show() - else - @gentle_alert 'File uploads are required for this question, but are not supported in this browser. Try the newest version of google chrome. Alternatively, if you have uploaded the image to the web, you can paste a link to it into the answer box.' + if @accept_file_upload == "True" + if window.File and window.FileReader and window.FileList and window.Blob + @can_upload_files = true + @file_upload_area.html('') + @file_upload_area.show() + else + @gentle_alert 'File uploads are required for this question, but are not supported in this browser. Try the newest version of google chrome. Alternatively, if you have uploaded the image to the web, you can paste a link to it into the answer box.' hide_file_upload: => if @accept_file_upload == "True" diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html index db5edc2159..4e298f8ec7 100644 --- a/lms/templates/combined_open_ended.html +++ b/lms/templates/combined_open_ended.html @@ -1,9 +1,5 @@
-
- ${status | n} -
-

${display_name}

@@ -17,6 +13,10 @@
+
+ ${status | n} +
+
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html index d41d2dc718..fc517bfbba 100644 --- a/lms/templates/combined_open_ended_status.html +++ b/lms/templates/combined_open_ended_status.html @@ -1,5 +1,5 @@
-
+
% for i in xrange(0,len(legend_list)): <%legend_title=legend_list[i]['name'] %> <%legend_image=legend_list[i]['image'] %>