Author: david
Date: Fri Aug 26 14:56:51 2011
New Revision: 9608
Log:
Display disk usage and limit based on current repository.upload_limit
Modified:
trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
trunk/apps/qubit/modules/repository/templates/_contextMenu.php
Modified:
trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Fri Aug 26 14:45:17 2011 (r9607)
+++ trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Fri Aug 26 14:56:51 2011 (r9608)
@@ -43,36 +43,40 @@
// Filter draft descriptions
$criteria = QubitAcl::addFilterDraftsCriteria($criteria);
- // Disk usage display value
- $du = floatval($this->resource->getDiskUsage()) / pow(2, 30);
- if (0 < $du && 0.01 > $du)
+ // Show current disk usage vs. limit for repository
+ if (0 < $this->resource->uploadLimit)
{
- $this->diskUsage = '< 0.01';
- }
- else
- {
- $this->diskUsage = round($du, 2);
- }
+ // Calc disk usage display value
+ $du = floatval($this->resource->getDiskUsage()) / pow(2, 30);
+ if (0 < $du && 0.01 > $du)
+ {
+ $this->diskUsage = '< 0.01';
+ }
+ else
+ {
+ $this->diskUsage = round($du, 2);
+ }
- $this->barColor = '#390'; // Default progress bar is green
+ $this->barColor = '#390'; // Default progress bar is green
- // Calculate disk usage percentages
- $dup = $du / floatval(sfConfig::get('app_repository_quota')) * 100;
- if (0 < $dup && 1 > $dup)
- {
- $this->diskUsagePercent = '< 1';
- $this->barPixels = '1';
- }
- else if (100 < $dup)
- {
- $this->diskUsagePercent = '> 100';
- $this->barPixels = 200;
- $this->barColor = '#C33'; // RED!
- }
- else
- {
- $this->diskUsagePercent = round($dup, 0);
- $this->barPixels = round($dup * 2, 0);
+ // Calculate disk usage percentages
+ $dup = $du / floatval($this->resource->uploadLimit) * 100;
+ if (0 < $dup && 1 > $dup)
+ {
+ $this->diskUsagePercent = '< 1';
+ $this->barPixels = '1';
+ }
+ else if (100 < $dup)
+ {
+ $this->diskUsagePercent = '> 100';
+ $this->barPixels = 200;
+ $this->barColor = '#C33'; // RED!
+ }
+ else
+ {
+ $this->diskUsagePercent = round($dup, 0);
+ $this->barPixels = round($dup * 2, 0);
+ }
}
// Paginate holdings list
Modified: trunk/apps/qubit/modules/repository/templates/_contextMenu.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/_contextMenu.php Fri Aug
26 14:45:17 2011 (r9607)
+++ trunk/apps/qubit/modules/repository/templates/_contextMenu.php Fri Aug
26 14:56:51 2011 (r9608)
@@ -1,4 +1,4 @@
-<?php if (0 < floatval(sfConfig::get('app_repository_quota'))): ?>
+<?php if (0 < floatval($resource->uploadLimit)): ?>
<div>
<h3><?php echo __('Disk quota used') ?></h3>
@@ -7,7 +7,7 @@
<div class="progressBar" style="padding: 1px; background-color: #CCC;
height: 10px; width: 200px">
<div style="height: 10px; width: <?php echo $barPixels ?>px;
background-color: <?php echo $barColor ?>;"></div>
</div>
- <?php echo __('%1% of %2% <a
href="http://en.wikipedia.org/wiki/Gigabyte";>GB</a> (%3%%)', array('%1%' =>
$diskUsage, '%2%' => sfConfig::get('app_repository_quota'), '%3%' =>
$diskUsagePercent)) ?>
+ <?php echo __('%1% of %2% <a
href="http://en.wikipedia.org/wiki/Gigabyte";>GB</a> (%3%%)', array('%1%' =>
$diskUsage, '%2%' => $resource->uploadLimit, '%3%' => $diskUsagePercent)) ?>
</div>
</div>
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
