Index: pro-bachkim-filespace/sourcecode/assets/js/manager.js
===================================================================
--- pro-bachkim-filespace/sourcecode/assets/js/manager.js	(revision 285)
+++ pro-bachkim-filespace/sourcecode/assets/js/manager.js	(revision 286)
@@ -297,4 +297,5 @@
                     uploadStart();
                     upload_init();
+
                 }
 
@@ -421,11 +422,10 @@
                         buttons: {
                             success: {
-                                label: "Xong",
-                                className: "btn-success",
+                                label: "Táº£i lÃªn",
+                                className: "btn btn-primary",
                                 callback: function () {
-                                   
+
                                 }
                             },
-                            
                         }
                     };
@@ -433,4 +433,75 @@
                     return bootbox.dialog(promptOptions);
                 }
+
+
+                var upload_init = function () {
+                    var ul = $('#upload ul');
+
+                    $('#drop a').click(function () {
+                        $(this).parent().find('input').click();
+                    });
+                    $('#upload').fileupload({
+                         dropZone: $('#drop'),
+                        add: function (e, data) {
+
+                            var tpl = $('<li class="working"><input type="text" value="0" data-width="48" data-height="48"' +
+                                    ' data-fgColor="#0788a5" data-readOnly="1" data-bgColor="#3e4043" /><p></p><span></span></li>');
+                            tpl.find('p').text(data.files[0].name)
+                                    .append('<i>' + formatFileSize(data.files[0].size) + '</i>');
+                            data.context = tpl.appendTo(ul);
+                            tpl.find('input').knob();
+                            tpl.find('span').click(function () {
+
+                                if (tpl.hasClass('working')) {
+                                    jqXHR.abort();
+                                }
+
+                                tpl.fadeOut(function () {
+                                    tpl.remove();
+                                });
+
+                            });
+                            //alert(JSON.stringify(data, null, 4));
+                            var jqXHR = data.submit();
+                        },
+                        progress: function (e, data) {
+
+                            // Calculate the completion percentage of the upload
+                            var progress = parseInt(data.loaded / data.total * 100, 10);
+
+                            // Update the hidden input field and trigger a change
+                            // so that the jQuery knob plugin knows to update the dial
+                            data.context.find('input').val(progress).change();
+
+                            if (progress == 100) {
+                                data.context.removeClass('working');
+                            }
+                        },
+                        fail: function (e, data) {
+                            // Something has gone wrong!
+                            data.context.addClass('error');
+                        }
+
+                    });
+                    $(document).on('drop dragover', function (e) {
+                        e.preventDefault();
+                    });
+                    function formatFileSize(bytes) {
+                        if (typeof bytes !== 'number') {
+                            return '';
+                        }
+
+                        if (bytes >= 1000000000) {
+                            return (bytes / 1000000000).toFixed(2) + ' GB';
+                        }
+
+                        if (bytes >= 1000000) {
+                            return (bytes / 1000000).toFixed(2) + ' MB';
+                        }
+
+                        return (bytes / 1000).toFixed(2) + ' KB';
+                    }
+
+                };
 
                 var createFolder = function (parent, name) {
Index: pro-bachkim-filespace/sourcecode/assets/js/script.js
===================================================================
--- pro-bachkim-filespace/sourcecode/assets/js/script.js	(revision 285)
+++ pro-bachkim-filespace/sourcecode/assets/js/script.js	(revision 286)
@@ -1,96 +1,0 @@
-
-function upload_init(){
-    var ul = $('#upload ul');
-
-    $('#drop a').click(function(){
-        // Simulate a click on the file input button
-        // to show the file browser dialog
-
-        $(this).parent().find('input').click();
-    });
-
-    // Initialize the jQuery File Upload plugin
-    $('#upload').fileupload({
-
-        // This element will accept file drag/drop uploading
-        dropZone: $('#drop'),
-
-        // This function is called when a file is added to the queue;
-        // either via the browse button, or via drag/drop:
-        add: function (e, data) {
-
-            var tpl = $('<li class="working"><input type="text" value="0" data-width="48" data-height="48"'+
-                ' data-fgColor="#0788a5" data-readOnly="1" data-bgColor="#3e4043" /><p></p><span></span></li>');
-
-            // Append the file name and file size
-            tpl.find('p').text(data.files[0].name)
-                         .append('<i>' + formatFileSize(data.files[0].size) + '</i>');
-
-            // Add the HTML to the UL element
-            data.context = tpl.appendTo(ul);
-
-            // Initialize the knob plugin
-            tpl.find('input').knob();
-
-            // Listen for clicks on the cancel icon
-            tpl.find('span').click(function(){
-
-                if(tpl.hasClass('working')){
-                    jqXHR.abort();
-                }
-
-                tpl.fadeOut(function(){
-                    tpl.remove();
-                });
-
-            });
-
-            // Automatically upload the file once it is added to the queue
-            var jqXHR = data.submit();
-        },
-
-        progress: function(e, data){
-
-            // Calculate the completion percentage of the upload
-            var progress = parseInt(data.loaded / data.total * 100, 10);
-
-            // Update the hidden input field and trigger a change
-            // so that the jQuery knob plugin knows to update the dial
-            data.context.find('input').val(progress).change();
-
-            if(progress == 100){
-                data.context.removeClass('working');
-            }
-        },
-
-        fail:function(e, data){
-            // Something has gone wrong!
-            data.context.addClass('error');
-        }
-
-    });
-
-
-    // Prevent the default action when a file is dropped on the window
-    $(document).on('drop dragover', function (e) {
-        e.preventDefault();
-    });
-
-    // Helper function that formats the file sizes
-    function formatFileSize(bytes) {
-        if (typeof bytes !== 'number') {
-            return '';
-        }
-
-        if (bytes >= 1000000000) {
-            return (bytes / 1000000000).toFixed(2) + ' GB';
-        }
-
-        if (bytes >= 1000000) {
-            return (bytes / 1000000).toFixed(2) + ' MB';
-        }
-
-        return (bytes / 1000).toFixed(2) + ' KB';
-    }
-
-};
