Commit dbfc77e4 by Vik Paruchuri

Add in legend, move status bar, fix js where it was constantly displaying a message

parent 70f71857
...@@ -43,6 +43,17 @@ section.combined-open-ended { ...@@ -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 { section.combined-open-ended-status {
.statusitem { .statusitem {
......
...@@ -397,8 +397,8 @@ class @CombinedOpenEnded ...@@ -397,8 +397,8 @@ class @CombinedOpenEnded
window.queuePollerID = window.setTimeout(@poll, 10000) window.queuePollerID = window.setTimeout(@poll, 10000)
setup_file_upload: => setup_file_upload: =>
if window.File and window.FileReader and window.FileList and window.Blob
if @accept_file_upload == "True" if @accept_file_upload == "True"
if window.File and window.FileReader and window.FileList and window.Blob
@can_upload_files = true @can_upload_files = true
@file_upload_area.html('<input type="file" class="file-upload-box">') @file_upload_area.html('<input type="file" class="file-upload-box">')
@file_upload_area.show() @file_upload_area.show()
......
<section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}"> <section id="combined-open-ended" class="combined-open-ended" data-ajax-url="${ajax_url}" data-allow_reset="${allow_reset}" data-state="${state}" data-task-count="${task_count}" data-task-number="${task_number}" data-accept-file-upload = "${accept_file_upload}">
<div class="status-container">
${status | n}
</div>
<h2>${display_name}</h2> <h2>${display_name}</h2>
<div class="item-container"> <div class="item-container">
...@@ -17,6 +13,10 @@ ...@@ -17,6 +13,10 @@
<input type="button" value="Reset" class="reset-button" name="reset"/> <input type="button" value="Reset" class="reset-button" name="reset"/>
<input type="button" value="Next Step" class="next-step-button" name="reset"/> <input type="button" value="Next Step" class="next-step-button" name="reset"/>
</div> </div>
<div class="status-container">
${status | n}
</div>
<div class="combined-rubric-container"> <div class="combined-rubric-container">
</div> </div>
......
<div class="status-elements"> <div class="status-elements">
<section name="legend-container"> <section class="legend-container">
% for i in xrange(0,len(legend_list)): % for i in xrange(0,len(legend_list)):
<%legend_title=legend_list[i]['name'] %> <%legend_title=legend_list[i]['name'] %>
<%legend_image=legend_list[i]['image'] %> <%legend_image=legend_list[i]['image'] %>
......
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