issue #50 partly styling the new uploader

1 files changed, 12 insertions, 9 deletions

diff --git a/lib/scripts/fileuploaderextended.js b/lib/scripts/fileuploaderextended.js
index fd2104e8e..822c32958 100644
--- a/lib/scripts/fileuploaderextended.js
+++ b/lib/scripts/fileuploaderextended.js
@@ -74,20 +74,20 @@ qq.FileUploaderExtended = function(o){
         listElement: null,
 
         template: '<div class="qq-uploader">' +
-                '<div class="qq-upload-drop-area"><span>Drop files here to upload</span></div>' +
-                '<div class="qq-upload-button">Upload a file</div>' +
+                '<div class="qq-upload-drop-area"><span>' + LANG.media_drop + '</span></div>' +
+                '<div class="qq-upload-button">' + LANG.media_select + '</div>' +
                 '<ul class="qq-upload-list"></ul>' +
-                '<label class="check" for="dw__ow"><input id="dw__ow" type="checkbox" value="1" name="ow"><span>Overwrite existing file</span></label>' +
-                '<div><input class="button" type="submit" value="Upload" id="mediamanager__upload_button"></div>' +
+                '<label class="check" for="dw__ow"><input id="dw__ow" type="checkbox" value="1" name="ow"><span>' + LANG.media_overwrt + '</span></label>' +
+                '<div><input class="button" type="submit" value="' + LANG.media_upload_btn + '" id="mediamanager__upload_button"></div>' +
              '</div>',
 
         // template for one item in file list
         fileTemplate: '<li>' +
-                '<span class="qq-upload-file"></span>' +
-                '<label>Upload as (optional): <input class="qq-upload-name-input" type="text"></label>' +
+                '<span class="qq-upload-file qq-upload-file-hidden"></span>' +
+                '<input class="qq-upload-name-input edit" type="text">' +
                 '<span class="qq-upload-spinner-hidden"></span>' +
                 '<span class="qq-upload-size"></span>' +
-                '<a class="qq-upload-cancel" href="#">Cancel</a>' +
+                '<a class="qq-upload-cancel" href="#">' + LANG.media_cancel + '</a>' +
                 '<span class="qq-upload-failed-text">Failed</span>' +
             '</li>',
 
@@ -154,14 +154,17 @@ qq.extend(qq.FileUploaderExtended.prototype, {
         var nameInput = this._find(item, 'nameInput');
         var fileElement = this._find(item, 'file');
         qq.setText(fileElement, nameInput.value);
-        qq.remove(nameInput.parentNode);
+        qq.removeClass(fileElement, 'qq-upload-file-hidden');
+        qq.remove(nameInput);
+        jQuery('.qq-upload-button, #mediamanager__upload_button').remove();
+        jQuery('#dw__ow').parent().remove();
 
         if (result.success){
             qq.addClass(item, this._classes.success);
         } else {
             qq.addClass(item, this._classes.fail);
             var fail = this._find(item, 'failedText');
-            qq.setText(fail, result.error);
+            if (result.error) qq.setText(fail, result.error);
         }
     }