resolve merge conflicts

diff --cc files/css/files.css
index 2cf4f38fd20f957aff8bb4669594ee9260db3161,5dc7983bec40bc88655ee282c8b363948ed84bdc..b544d08cb1a2dabd5c3e129a5f4c5c55aba20857
--- 1/files/css/files.css
--- 2/files/css/files.css
+++ b/files/css/files.css
@@@ -25,11 -25,13 +25,13 @@@
  #file_newfolder_submit, #file_upload_submit { width:3em; }
  .file_upload_target { display:none; }
  
 -.file_upload_start { opacity:0; filter:alpha(opacity=0); z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
 +.file_upload_start { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; z-index:1; position:absolute; left:0; top:0; width:100%; cursor:pointer;}
  .file_upload_filename.active { border-bottom-right-radius:0 }
  .file_upload_filename { position: relative; z-index:100; padding-left: 0.8em; padding-right: 0.8em; cursor:pointer; border-top-left-radius:0; border-bottom-left-radius:0; }
 -.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; }
 +.file_upload_filename img { position: absolute; top: 0.4em; left: 0.4em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
  
+ #upload { position:absolute; right:13.5em; top:0em; }
+ #upload #uploadprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
  
  .file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
  
@@@ -41,9 -42,9 +43,9 @@@ tbody tr { background-color:#fff; heigh
  tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; }
  tbody tr.selected { background-color:#eee; }
  tbody a { color:#000; }
- span.extension, td.date { color:#999; }
+ span.extension, span.uploading, td.date { color:#999; }
 -span.extension { text-transform:lowercase; opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
 -tr:hover span.extension { opacity:1; }
 +span.extension { text-transform:lowercase; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; }
 +tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
  div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
  div.crumb:first-child { padding-left:1em; }
  div.crumb.last { font-weight:bold; }
@@@ -57,11 -58,13 +59,13 @@@ table th#headerSize, table td.filesize 
  table th#headerDate, table td.date { width:11em; padding:0 .1em 0 1em; text-align:left; }
  table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; }
  table td.filename a.name { display:block; height:1.5em; vertical-align:middle; margin-left:3em; }
 -table tr[data-type="dir"] td.filename a.name {font-weight:bold; }
 +table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
  table td.filename a.name input, table td.filename a.name form { width:100%; cursor:text; }
  table td.filename a, table td.login, table td.logout, table td.download, table td.upload, table td.create, table td.delete { padding:.2em .5em .5em 0; }
- table td.filename .nametext, .modified { float:left; padding:.3em 0; }
- table td.filename .nametext { width:70%; overflow:hidden; }
+ table td.filename .nametext, .uploadtext, .modified { float:left; padding:.3em 0; }
+ // TODO fix usability bug (accidental file/folder selection)
+ //table td.filename .nametext { width:60%; }
+ table td.filename .uploadtext { font-weight:normal; margin-left:.5em; }
  table td.filename form { float:left; font-size:.85em; }
  table thead.fixed tr{ position:fixed; top:6.5em; z-index:49; -moz-box-shadow:0 -3px 7px #ddd; -webkit-box-shadow:0 -3px 7px #ddd; box-shadow:0 -3px 7px #ddd; }
  table thead.fixed { height:2em; }

diff --cc files/js/fileactions.js
Simple merge

diff --cc files/js/filelist.js
Simple merge

diff --cc files/js/files.js
index e6df7e6bfad2830bc86cc266087c2f337446043c,56fff753737f66c101653955943e002ff21eefc3..e13e256efc4f7594fdc261615840c390ca86ffc4
--- 1/files/js/files.js
--- 2/files/js/files.js
+++ b/files/js/files.js
@@@ -191,43 -311,72 +313,72 @@@ $(document).ready(function() 
                                                                $('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size);
                                                        }
                                                        FileList.loadingDone(file.name);
+                                               } else {
+                                                       $('#notification').text(t('files', response.data.message));
+                                                       $('#notification').fadeIn();
+                                                       $('#fileList > tr').not('[data-mime]').fadeOut();
+                                                       $('#fileList > tr').not('[data-mime]').remove();
                                                }
-                                       }
-                                       else{
-                                               $('#notification').text(t('files',response.data.message));
-                                               $('#notification').fadeIn();
-                                               $('#fileList > tr').not('[data-mime]').fadeOut();
-                                               $('#fileList > tr').not('[data-mime]').remove();
-                                       }
+                                       });
                                }
-                       });
-                       form.submit();
-                       var date=new Date();
-                       if(files){
-                               for(var i=0;i<files.length;i++){
-                                       if(files[i].size>0){
-                                               var size=files[i].size;
-                                       }else{
-                                               var size=t('files','Pending');
-                                       }
+                                                                       
+                                       var date=new Date();
                                        if(files){
 -                                                              FileList.addFile(files[i].name,size,date,true);
+                                               for(var i=0;i<files.length;i++){
+                                                       if(files[i].size>0){
+                                                               var size=files[i].size;
+                                                       }else{
+                                                               var size=t('files','Pending');
+                                                       }
+                                                       if(files && !dirName){
 -                                              FileList.addFile(filename,'Pending',date,true);
 +                                              FileList.addFile(getUniqueName(files[i].name),size,date,true);
+                                                       } else if(dirName) {
+                                                               var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
+                                                               var currentUploads = parseInt(uploadtext.attr('currentUploads'));
+                                                               currentUploads += 1;
+                                                               uploadtext.attr('currentUploads', currentUploads);
+                                                               if(currentUploads === 1) {
+                                                                       var img = OC.imagePath('core', 'loading.gif');
+                                                                       var tr=$('tr').filterAttr('data-file',dirName);
+                                                                       tr.find('td.filename').attr('style','background-image:url('+img+')');
+                                                                       uploadtext.text('1 file uploading');
+                                                                       uploadtext.show();
+                                                               } else {
+                                                                       uploadtext.text(currentUploads + ' files uploading')
+                                                               }
+                                                       }
+                                               }
+                                       }else{
+                                               var filename=this.value.split('\\').pop(); //ie prepends C:\fakepath\ in front of the filename
++                              FileList.addFile(getUniqueName(filename),'Pending',date,true);
                                        }
                                }
-                       }else{
-                               var filename=this.value.split('\\').pop(); //ie prepends C:\fakepath\ in front of the filename
-                               FileList.addFile(getUniqueName(filename),'Pending',date,true);
+                       },
+                       fail: function(e, data) {
+                               // TODO: cancel upload & display error notification
+                       },
+                       progress: function(e, data) {
+                               // TODO: show nice progress bar in file row
+                       },
+                       progressall: function(e, data) {
+                               var progress = (data.loaded/data.total)*100;
+                               $('#uploadprogressbar').progressbar('value',progress);
+                       },
+                       start: function(e, data) {
+                               $('#uploadprogressbar').progressbar({value:0});
+                               $('#uploadprogressbar').fadeIn();
+                               if(data.dataType != 'iframe ') {
+                                       $('#upload input.stop').show();
+                               }
+                       },
+                       stop: function(e, data) {
+                               if(data.dataType != 'iframe ') {
+                                       $('#upload input.stop').hide();
+                               }       
+                               $('#uploadprogressbar').progressbar('value',100);
+                               $('#uploadprogressbar').fadeOut();
                        }
- 
-                       //clone the upload form and hide the new one to allow users to start a new upload while the old one is still uploading
-                       var clone=form.clone();
-                       uploadId++;
-                       clone.attr('data-upload-id',uploadId);
-                       clone.attr('target','file_upload_target_'+uploadId);
-                       clone.children('iframe').attr('name','file_upload_target_'+uploadId)
-                       clone.insertBefore(form);
-                       form.hide();
-               }
+               })
        });
  
        //add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)

diff --cc files/templates/index.php
Simple merge