Merge pull request #1343 from MITx/feature/christina/tiny-mce

Make code inline instead of block.

common/lib/xmodule/xmodule/js/src/html/edit.coffee

@@ -20,13 +20,17 @@ class @HTMLEditingDescriptor
       theme : "advanced",
       skin: 'studio',
       schema: "html5",
+      # Necessary to preserve relative URLs to our images.
+      convert_urls : false,
       # TODO: we should share this CSS with studio (and LMS)
       content_css : "/static/css/tiny-mce.css",
-      # Disable h4, h5, and h6 styles as we don't have CSS for them.
       formats : {
+        # Disable h4, h5, and h6 styles as we don't have CSS for them.
         h4: {},
         h5: {},
-        h6: {}
+        h6: {},
+        # tinyMCE does block level for code by default
+        code: {inline: 'code'}
       },
       # Disable visual aid on borderless table.
       visual:false,
@@ -50,7 +54,7 @@ class @HTMLEditingDescriptor
 
   @setupTinyMCE: (ed) ->
     ed.addButton('wrapAsCode', {
-      title : 'Code Block',
+      title : 'Code',
       image : '/static/images/ico-tinymce-code.png',
       onclick : () ->
         ed.formatter.toggle('code')