mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hide quota bar if unlimited quota (#16049) 

Hide quota bar if unlimited quota
This commit is contained in:
John Molakvoæ 2019-07-01 12:39:58 +02:00 committed by GitHub
parent 7fbfa5cd99 5c3fc44f33
commit 41ccf5e8c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/lib/Controller/ViewController.php
View File

@ -227,7 +227,7 @@ class ViewController extends Controller {
$nav->assign('navigationItems', $navItems);
$nav->assign('usage', \OC_Helper::humanFileSize($storageInfo['used']));
$nav->assign('usage', \OC_Helper::humanFileSize(ceil($storageInfo['used'] / 102400) * 102400));
if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
$totalSpace = $this->l10n->t('Unlimited');
} else {

37
apps/files/templates/appnavigation.php
View File

@ -9,26 +9,23 @@
}
?>
<li id="quota"
class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?><?php
if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
?>has-tooltip" title="<?php p($_['usage_relative'] . '%, ');
p($l->t('%s of %s used', [$_['usage'], $_['total_space']]));
} ?>">
<a href="#" class="icon-quota svg">
<p id="quotatext"><?php
if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
p($l->t('%1$s%% of %2$s used', [round($_['usage_relative'], 1), $_['total_space']]));
} else {
p($l->t('%s used', [$_['usage']]));
} ?></p>
<div class="quota-container">
<progress value="<?php p($_['usage_relative']); ?>"
max="100"
<?php if ($_['usage_relative'] > 80): ?> class="warn" <?php endif; ?>></progress>
</div>
</a>
</li>
<?php if($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
<li id="quota" class="pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>">
<a href="#" class="icon-quota svg">
<p><?php p($l->t('%s used', [$_['usage']])); ?></p>
</a>
</li>
<?php else: ?>
<li id="quota" class="has-tooltip pinned <?php p($pinned === 0 ? 'first-pinned ' : '') ?>"
title="<?php p($l->t('%s%% of %s used', [$_['usage_relative'], $_['total_space']])); ?>">
<a href="#" class="icon-quota svg">
<p id="quotatext"><?php p($l->t('%1$s of %2$s used', [$_['usage'], $_['total_space']])); ?></p>
<div class="quota-container">
<progress value="<?php p($_['usage_relative']); ?>" max="100" class="<?= ($_['usage_relative'] > 80) ? 'warn' : '' ?>"></progress>
</div>
</a>
</li>
<?php endif; ?>
</ul>
<div id="app-settings">
<div id="app-settings-header">