Merge pull request #1298 from MITx/feature/christina/misc

Escape text being passed to markdown editor, delete copied (and unused) JS code

cms/templates/export.html

@@ -52,42 +52,3 @@
   </div>
 </div>
 </%block>
-
-<%block name="jsextra">
-<script>
-(function() {
-    
-var bar = $('.progress-bar');
-var fill = $('.progress-fill');
-var percent = $('.percent');
-var status = $('#status');
-var submitBtn = $('.submit-button');
-   
-$('form').ajaxForm({
-    beforeSend: function() {
-        status.empty();
-        var percentVal = '0%';
-        bar.show();
-        fill.width(percentVal);
-        percent.html(percentVal);
-        submitBtn.hide();
-    },
-    uploadProgress: function(event, position, total, percentComplete) {
-        var percentVal = percentComplete + '%';
-        fill.width(percentVal);
-        percent.html(percentVal);
-    },
-    complete: function(xhr) {
-      if (xhr.status == 200) {
-        alert('Your import was successful.');
-        window.location = '${successful_import_redirect_url}';
-      }
-      else
-        alert('Your import has failed.\n\n' + xhr.responseText);
-        submitBtn.show();
-        bar.hide();
-    }
-  }); 
-})();       
-</script>
-</%block>
\ No newline at end of file

cms/templates/widgets/problem-edit.html

@@ -24,7 +24,7 @@
                 <li><a href="#" class="cheatsheet-toggle" data-tooltip="Toggle Cheatsheet">?</a></li>
             </ul>
         </div>
-        <textarea class="markdown-box">${markdown}</textarea>
+        <textarea class="markdown-box">${markdown | h}</textarea>
         %endif
         <textarea class="xml-box" rows="8" cols="40">${data | h}</textarea>
     </div>