Browse Source

typos, indentation and remove of unused code

tags/v7.0.0alpha2
Thomas Müller 10 years ago
parent
commit
535302b25e
3 changed files with 7 additions and 7 deletions
  1. 1
    1
      apps/files/js/filelist.js
  2. 5
    6
      apps/files/lib/helper.php
  3. 1
    0
      apps/files/templates/index.php

+ 1
- 1
apps/files/js/filelist.js View File

@@ -976,7 +976,7 @@ window.FileList = {
OC.dialogs.alert(t('files', 'Error moving file'), t('files', 'Error'));
}
$td.css('background-image', oldBackgroundImage);
});
});
});

},

+ 5
- 6
apps/files/lib/helper.php View File

@@ -18,12 +18,12 @@ class Helper
$storageInfo = \OC_Helper::getStorageInfo($dir);

$l = new \OC_L10N('files');
$maxUploadFilesize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
$maxHumanFilesize = \OCP\Util::humanFileSize($maxUploadFilesize);
$maxHumanFilesize = $l->t('Upload (max. %s)', array($maxHumanFilesize));
$maxUploadFileSize = \OCP\Util::maxUploadFilesize($dir, $storageInfo['free']);
$maxHumanFileSize = \OCP\Util::humanFileSize($maxUploadFileSize);
$maxHumanFileSize = $l->t('Upload (max. %s)', array($maxHumanFileSize));

return array('uploadMaxFilesize' => $maxUploadFilesize,
'maxHumanFilesize' => $maxHumanFilesize,
return array('uploadMaxFilesize' => $maxUploadFileSize,
'maxHumanFilesize' => $maxHumanFileSize,
'freeSpace' => $storageInfo['free'],
'usedSpacePercent' => (int)$storageInfo['relative']);
}
@@ -36,7 +36,6 @@ class Helper
*/
public static function determineIcon($file) {
if($file['type'] === 'dir') {
$dir = $file['directory'];
$icon = \OC_Helper::mimetypeIcon('dir');
$absPath = $file->getPath();
$mount = \OC\Files\Filesystem::getMountManager()->find($absPath);

+ 1
- 0
apps/files/templates/index.php View File

@@ -1,3 +1,4 @@
<?php /** @var $l OC_L10N */ ?>
<div id="controls">
<div class="actions creatable hidden">
<?php if(!isset($_['dirToken'])):?>

Loading…
Cancel
Save