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

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 {

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('<input type="file" class="file-upload-box">')
-          @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('<input type="file" class="file-upload-box">')
+        @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"

lms/templates/combined_open_ended.html

@@ -1,9 +1,5 @@
 <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>
 
     <div class="item-container">
@@ -17,6 +13,10 @@
         <input type="button" value="Reset" class="reset-button" name="reset"/>
         <input type="button" value="Next Step" class="next-step-button" name="reset"/>
     </div>
+    <div class="status-container">
+        ${status | n}
+    </div>
+
     <div class="combined-rubric-container">
     </div>
 

lms/templates/combined_open_ended_status.html

@@ -1,5 +1,5 @@
 <div class="status-elements">
-    <section name="legend-container">
+    <section class="legend-container">
         % for i in xrange(0,len(legend_list)):
             <%legend_title=legend_list[i]['name'] %>
             <%legend_image=legend_list[i]['image'] %>