Reset modal when closed by clicking outside of it

cms/static/js/views/assets.js

@@ -1,6 +1,6 @@
 $(document).ready(function() {
     $('.uploads .upload-button').bind('click', showUploadModal);
-    $('.upload-modal .close-button').bind('click', resetUploadModal);
+    $('.upload-modal .close-button').bind('click', hideModal);
     $('.upload-modal .choose-file-button').bind('click', showFileSelectionMenu);
     $('.remove-asset-button').bind('click', removeAsset);
 });
@@ -52,6 +52,7 @@ function removeAsset(e){
 
 function showUploadModal(e) {
     e.preventDefault();
+    resetUploadModal();
     resetUploadBar();
     $modal = $('.upload-modal').show();
     $('.upload-modal .file-chooser').fileupload({
@@ -108,7 +109,6 @@ function resetUploadModal() {
     $('.upload-modal .choose-file-button').html(gettext('Choose File'));
     $('.upload-modal .embeddable-xml-input').val('');
     $('.upload-modal .embeddable').hide();
-    hideModal();
 }
 
 function showUploadFeedback(event, percentComplete) {

cms/templates/asset_index.html

@@ -118,7 +118,7 @@
   <div class="upload-modal modal">
     <a href="#" class="close-button"><span class="close-icon"></span></a>
       <div class="modal-body">
-        <h1>S{_("Upload New File")}</h1>
+        <h1>${_("Upload New File")}</h1>
         <p class="file-name"></a>
         <div class="progress-bar">
           <div class="progress-fill"></div>
@@ -129,7 +129,7 @@
       </div>
         <form class="file-chooser" action="${upload_asset_callback_url}"
                                 method="post" enctype="multipart/form-data">
-          <a href="#" class="choose-file-button">Choose File</a>
+          <a href="#" class="choose-file-button">${_("Choose File")}</a>
           <input type="file" class="file-input" name="files[]" multiple>
         </form>
       </div>