diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-01-07 12:23:29 +0100 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2013-01-07 12:23:29 +0100 |
| commit | 3bb7ee521f38e1ab1fc7cd160dc3d0ae77f0433e (patch) | |
| tree | 84485582ac7a7f041381a2440955ebeb96d35da8 /apps/files | |
| parent | da442b024c50160be58281975a6fabe2d86a61a7 (diff) | |
| download | nextcloud-server-3bb7ee521f38e1ab1fc7cd160dc3d0ae77f0433e.tar.gz nextcloud-server-3bb7ee521f38e1ab1fc7cd160dc3d0ae77f0433e.zip | |
attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index
Diffstat (limited to 'apps/files')
| -rw-r--r-- | apps/files/js/files.js | 4 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 6d19a341e9e..038660e6e49 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -322,6 +322,7 @@ $(document).ready(function() { if ($.assocArraySize(uploadingFiles[dirName]) == 0) { delete uploadingFiles[dirName]; } + //TODO update file upload size limit var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext') var currentUploads = parseInt(uploadtext.attr('currentUploads')); @@ -375,6 +376,7 @@ $(document).ready(function() { if(size==t('files','Pending')){ $('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size); } + //TODO update file upload size limit FileList.loadingDone(file.name, file.id); } else { Files.cancelUpload(this.files[0].name); @@ -407,8 +409,10 @@ $(document).ready(function() { if(size==t('files','Pending')){ $('tr').filterAttr('data-file',file.name).find('td.filesize').text(file.size); } + //TODO update file upload size limit FileList.loadingDone(file.name, file.id); } else { + //TODO Files.cancelUpload(/*where do we get the filename*/); $('#notification').text(t('files', response.data.message)); $('#notification').fadeIn(); $('#fileList > tr').not('[data-mime]').fadeOut(); diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 3bcb865ccdb..2e0772443f2 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -14,7 +14,8 @@ data-type='web'><p><?php echo $l->t('From link');?></p></li> </ul> </div> - <div id="upload" class="button"> + <div id="upload" class="button" + title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>"> <form data-upload-id='1' id="data-upload-form" class="file_upload_form" @@ -31,8 +32,7 @@ value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir"> <input type="file" id="file_upload_start" name='files[]'/> - <a href="#" class="svg" onclick="return false;" - title="<?php echo $l->t('Upload') . ' max. '.$_['uploadMaxHumanFilesize'] ?>"></a> + <a href="#" class="svg" onclick="return false;"></a> </form> </div> <div id="uploadprogresswrapper"> |