aboutsummaryrefslogtreecommitdiff
path: root/views/default/tidypics/forms/upload.php
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/tidypics/forms/upload.php')
-rw-r--r--views/default/tidypics/forms/upload.php14
1 files changed, 11 insertions, 3 deletions
diff --git a/views/default/tidypics/forms/upload.php b/views/default/tidypics/forms/upload.php
index 077e90b1e..6e755612c 100644
--- a/views/default/tidypics/forms/upload.php
+++ b/views/default/tidypics/forms/upload.php
@@ -15,9 +15,17 @@
if ($quota) {
$image_repo_size_md = get_metadata_byname($album->container_guid, "image_repo_size");
$image_repo_size = (int)$image_repo_size_md->value;
- $image_repo_size = round($image_repo_size / 1024 / 1024);
- if ($image_repo_size > $quota)
+ $image_repo_size = $image_repo_size / 1024 / 1024;
+ $quote_percentage = round(100 * ($image_repo_size / $quota));
+ // for small quotas, so one decimal place
+ if ($quota < 10) {
+ $image_repo_size = sprintf('%.1f', $image_repo_size);
+ } else {
+ $image_repo_size = round($image_repo_size);
+ }
+ if ($image_repo_size > $quota) {
$image_repo_size = $quota;
+ }
}
?>
@@ -32,7 +40,7 @@
<?php
if ($quota) {
?>
- <i><?php echo elgg_echo("tidypics:quota") . ' ' . $image_repo_size . '/' . $quota . ' MB'; ?></i><br />
+ <i><?php echo elgg_echo("tidypics:quota") . ' ' . $image_repo_size . '/' . $quota . " MB ({$quote_percentage}%)"; ?></i><br />
<?php
}
?>