diff options
author | Vincent Petry <pvince81@owncloud.com> | 2014-05-12 19:54:20 +0200 |
---|---|---|
committer | Vincent Petry <pvince81@owncloud.com> | 2014-05-15 17:51:04 +0200 |
commit | 6fd084243b65a556d4775209ba3916145ef5912a (patch) | |
tree | 6162c2af1861d8e3b8bbf1340ac55c4affc5ad61 /apps/files/list.php | |
parent | 9d38e3602b2faf37d861729c52690ce51b8fee97 (diff) | |
download | nextcloud-server-6fd084243b65a556d4775209ba3916145ef5912a.tar.gz nextcloud-server-6fd084243b65a556d4775209ba3916145ef5912a.zip |
Fixed many issues, clean up
- fixed upload and storage statistics
- fixed infinite scroll to use the correct contain for scroll detection
- fixed unit test that sometimes fail for rename case
- controls are now sticky again
- fixed selection overlay to be aligned with the table
- fixed "select all" checkbox that had id conflicts
- fixed public page
- fixed global actions permissions detection
- fix when URL contains an invalid view id
- viewer mode now hides the sidebar (ex: text editor)
- added unit tests for trashbin
- clean up storage info in template (most is retrieved via ajax call now)
Diffstat (limited to 'apps/files/list.php')
-rw-r--r-- | apps/files/list.php | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/apps/files/list.php b/apps/files/list.php index 78b1b072b88..e583839b251 100644 --- a/apps/files/list.php +++ b/apps/files/list.php @@ -21,29 +21,17 @@ * */ - // Check if we are a user OCP\User::checkLoggedIn(); -// dummy, will be refreshed with an ajax call -$dir = '/'; - -// information about storage capacities -// FIXME: storage info -/* -$storageInfo=OC_Helper::getStorageInfo($dir, $dirInfo); +$config = \OC::$server->getConfig(); +// TODO: move this to the generated config.js $publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes'); $uploadLimit=OCP\Util::uploadLimit(); -$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir, $freeSpace); -$freeSpace=$storageInfo['free']; -*/ +// renders the controls and table headers template $tmpl = new OCP\Template('files', 'list', ''); -$tmpl->assign('usedSpacePercent', (int)$storageInfo['relative']); -$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize); // minimium of freeSpace and uploadLimit -$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize)); $tmpl->assign('uploadLimit', $uploadLimit); // PHP upload limit -$tmpl->assign('freeSpace', $freeSpace); $tmpl->assign('publicUploadEnabled', $publicUploadEnabled); $tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true))); $tmpl->printPage(); |