summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2019-01-03 21:17:28 +0100
committerGitHub <noreply@github.com>2019-01-03 21:17:28 +0100
commit03bab63d11cf72b9a5404c744a4df7bd7191788b (patch)
treecac618e007a860f475ad559cb7cfd650f8a37c86
parentaad32771f8f4eaa8684fee049cc3ce91be139608 (diff)
parentd3171a80e0e6ad3da878d0612067664dad5423e1 (diff)
downloadnextcloud-server-03bab63d11cf72b9a5404c744a4df7bd7191788b.tar.gz
nextcloud-server-03bab63d11cf72b9a5404c744a4df7bd7191788b.zip
Merge pull request #10887 from nextcloud/feature/10124/quota-takes-too-much-space-v2
Implemented short quota-design v2
-rw-r--r--apps/files/templates/appnavigation.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index c6361d0ca4f..fecaa8401a9 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -12,12 +12,13 @@
<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'] . '%');
+ ?>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', [$_['usage'], $_['total_space']]));
+ p($l->t('%1$s%% of %2$s used', [round($_['usage_relative'], 1), $_['total_space']]));
} else {
p($l->t('%s used', [$_['usage']]));
} ?></p>