Merge git://gitorious.org/owncloud/owncloud

Conflicts:
	files/css/files.css
	files/js/files.js

diff --cc files/css/files.css
index 8e3a767721eb5081f6bbb4c753cc07d68462ed09,96bc711a4b994665555a533f3cc1f044432ea07b..4d2b749bf8c8bc53d200ca76e05438ae09ff64f8
--- 1/files/css/files.css
--- 2/files/css/files.css
+++ b/files/css/files.css
@@@ -38,13 -36,13 +38,13 @@@
  /* FILE TABLE */
  #emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
  table { position:relative; top:37px; width:100%; }
- tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; }
- tbody tr { background-color:#fff; }
+ tbody tr { background-color:#fff; height:2.5em; }
+ 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 { 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.extention, span.uploading, td.date { color:#999; }
 +span.extention { opacity:0; -webkit-transition:opacity 500ms; -moz-transition:opacity 500ms; -o-transition:opacity 500ms; transition:opacity 500ms; }
 +tr:hover span.extention { opacity:1; }
  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; }

diff --cc files/index.php
Simple merge

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

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

diff --cc files/js/files.js
index 6eed25dfe994a2d9526888f4b0b55b8733a45c32,1c0a40c23684447e75f609b4ba0b0ea815730b37..89101ce4b8fdabe2cb7af94c18d1b787a5590a51
--- 1/files/js/files.js
--- 2/files/js/files.js
+++ b/files/js/files.js
@@@ -286,75 -189,45 +285,74 @@@ $(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(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(filename,'Pending',date,true);
                                        }
                                }
 -                      }else{
 -                              var filename=this.value.split('\\').pop(); //ie prepends C:\fakepath\ in front of the filename
 -                              FileList.addFile(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)
        if(navigator.userAgent.search(/konqueror/i)==-1){
                $('.file_upload_start').attr('multiple','multiple')

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

diff --cc files/templates/part.list.php
index a86632bafc83e2da43fa9873492dc77bca6a46fd,5a5941fc7ae8f13ec6843c10407a331e64e71913..b2db4cbb8df00127ae7d5e6236500705a6af7e40
--- 1/files/templates/part.list.php
--- 2/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@@ -18,13 -18,9 +18,13 @@@
                                                <?php if($file['type'] == 'dir'):?>
                                                        <?php echo htmlspecialchars($file['name']);?>
                                                <?php else:?>
-                                                       <?php echo htmlspecialchars($file['basename']);?><span class='extention'><?php echo $file['extention'];?></span>
+                                                       <?php echo htmlspecialchars($file['basename']);?><span class='extension'><?php echo $file['extension'];?></span>
                                                <?php endif;?>
                                        </span>
 +                                      <?php if($file['type'] == 'dir'):?>
 +                                              <span class="uploadtext" currentUploads="0">
 +                                              </span>
 +                                      <?php endif;?>
                                        </a>
                                </td>
                                <td class="filesize" title="<?php echo human_file_size($file['size']); ?>" style="color:rgb(<?php echo $simple_size_color.','.$simple_size_color.','.$simple_size_color ?>)"><?php echo $simple_file_size; ?></td>