aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2022-08-10 11:23:27 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2022-08-10 11:23:27 +0200
commit4c837dadf2cd8cb33621ded1da4b4ac9c3a2b5f3 (patch)
tree83b26ae4f543d624639a43bfb09e408fedaae1c9
parentf6bdaac88e9300199f5fa4eb91fc868d042d185d (diff)
downloadnextcloud-server-4c837dadf2cd8cb33621ded1da4b4ac9c3a2b5f3.tar.gz
nextcloud-server-4c837dadf2cd8cb33621ded1da4b4ac9c3a2b5f3.zip
Show usage percenteage in the tooltip
The tooltip of the initial quota display showed the usage percenteage and the total available space. However, the total available space was redundant, as it was shown just below. The tooltip of the updated quota display showed the usage percenteage, but based on the quota rather than the total available space, so there was a mismatch between the tooltip and the bar below. Now the tooltip of the initial and the updated quota display both show just the usage percenteage based on the total available space. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
-rw-r--r--apps/files/js/files.js2
-rw-r--r--apps/files/lib/Helper.php2
-rw-r--r--apps/files/templates/appnavigation.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 38663e13faf..8f456273f69 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -104,7 +104,7 @@
var humanUsed = OC.Util.humanFileSize(response.data.used, true);
var humanTotal = OC.Util.humanFileSize(response.data.total, true);
if (response.data.quota > 0) {
- $('#quota').attr('data-original-title', Math.floor(response.data.used/response.data.quota*1000)/10 + '%');
+ $('#quota').attr('data-original-title', t('files', '{used}%', {used: Math.round(response.data.usedSpacePercent)}));
$('#quota progress').val(response.data.usedSpacePercent);
$('#quotatext').html(t('files', '{used} of {quota} used', {used: humanUsed, quota: humanTotal}));
} else {
diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php
index 22744e5940f..1d9591cafe0 100644
--- a/apps/files/lib/Helper.php
+++ b/apps/files/lib/Helper.php
@@ -60,7 +60,7 @@ class Helper {
'quota' => $storageInfo['quota'],
'total' => $storageInfo['total'],
'used' => $storageInfo['used'],
- 'usedSpacePercent' => (int)$storageInfo['relative'],
+ 'usedSpacePercent' => $storageInfo['relative'],
'owner' => $storageInfo['owner'],
'ownerDisplayName' => $storageInfo['ownerDisplayName'],
'mountType' => $storageInfo['mountType'],
diff --git a/apps/files/templates/appnavigation.php b/apps/files/templates/appnavigation.php
index 9c875d9530c..9ff680d6a8d 100644
--- a/apps/files/templates/appnavigation.php
+++ b/apps/files/templates/appnavigation.php
@@ -17,7 +17,7 @@
</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']])); ?>">
+ title="<?php p($l->t('%s%%', [round($_['usage_relative'])])); ?>">
<a href="#" class="icon-quota svg quota-navigation-item">
<p id="quotatext" class="quota-navigation-item__text"><?php p($l->t('%1$s of %2$s used', [$_['usage'], $_['total_space']])); ?></p>
<div class="quota-navigation-item__container">