Further fixes for save modals.

app/templates/editor/level/save.jade

@@ -1,9 +1,6 @@
 extends /templates/modal/save_version
 
-block modal-header-content
-  h3(data-i18n="editor.save_view_title") Save New Version
-
-block content
+block modal-body-content
   h3= "Level: " + level.get('name') + " - " + (levelNeedsSave ? "Modified" : "Not Modified")
   if levelNeedsSave
     form#save-level-form.form-horizontal

app/templates/modal/contact.jade

@@ -1,11 +1,9 @@
-block modal-header-content
-  h3(data-i18n="contact.contact_modal_title") Contact
+extends /templates/modal/modal_base
 
-.modal-header
-  .button.close(type="button", data-dismiss="modal", aria-hidden="true") ×
+block modal-header-content
   h3(data-i18n="contact.contact_us") Contact CodeCombat...
 
-.modal-body
+block modal-body-content
   p
     span(data-i18n="contact.welcome") Good to hear from you! Use this form to send us email. 
     span(data-i18n="contact.contribute_prefix") If you're interested in contributing, check out our 
@@ -25,7 +23,7 @@ block modal-header-content
       .controls
         textarea#contact-message.input-block-level(name="message", rows=8)
 
-.modal-footer
+block modal-footer-content
   span.sending-indicator.pull-left.hide(data-i18n="contact.sending") Sending...
   a(href='#', data-dismiss="modal", aria-hidden="true", data-i18n="forms.cancel").btn Cancel
   button.btn.btn-primary#contact-submit-button(data-i18n="contact.send") Send Feedback

app/templates/modal/save_version.jade

@@ -1,6 +1,9 @@
-.modal-header
+extends /templates/modal/modal_base
+
+block modal-header-content
   h3(data-i18n="save.save_version_title") Save New Version
-.modal-body
+
+block modal-body-content
   form.form-horizontal
     .control-group
       label.control-label(for="commitMessage") Commit Message
@@ -11,7 +14,11 @@
       .controls
         input#major-version.input-large(name="version-is-major", type="checkbox")
         span.help-block
-.modal-footer
+
+block modal-body-wait-content
+  h3 Saving...
+
+block modal-footer-content
   #accept-cla-wrapper.alert.alert-info
     | To save changes, first you must agree to  
     strong#cla-link our CLA
@@ -20,7 +27,3 @@
     
   button.btn(data-dismiss="modal") Cancel
   button.btn.btn-primary#save-version-button Save
-.modal-body.wait.hide
-  h3 Saving...
-  .progress.progress-striped.active
-    .bar

app/views/modal/contact_modal.coffee

@@ -22,6 +22,7 @@ contactSchema =
 module.exports = class ContactView extends View
   id: "contact-modal"
   template: template
+  closeButton: true
 
   events:
     "click #contact-submit-button": "contact"