Author: david
Date: Wed Aug 24 16:24:38 2011
New Revision: 9591
Log:
Cosmetic changes. Use two decimal places for disk usage figure. Fix
whitespace. Rename progressBar.
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
Wed Aug 24 16:21:04 2011 (r9590)
+++ trunk/apps/qubit/modules/repository/actions/contextMenuComponent.class.php
Wed Aug 24 16:24:38 2011 (r9591)
@@ -43,16 +43,15 @@
// Filter draft descriptions
$criteria = QubitAcl::addFilterDraftsCriteria($criteria);
-
// Disk usage display value
$du = floatval($this->resource->getDiskUsage()) / pow(2, 30);
- if (0 < $du && 0.1 > $du)
+ if (0 < $du && 0.01 > $du)
{
- $this->diskUsage = '< 0.1';
+ $this->diskUsage = '< 0.01';
}
else
{
- $this->diskUsage = round($du, 1);
+ $this->diskUsage = round($du, 2);
}
$this->barColor = '#390'; // Default progress bar color is green
Modified: trunk/apps/qubit/modules/repository/templates/_contextMenu.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/_contextMenu.php Wed Aug
24 16:21:04 2011 (r9590)
+++ trunk/apps/qubit/modules/repository/templates/_contextMenu.php Wed Aug
24 16:24:38 2011 (r9591)
@@ -4,7 +4,7 @@
<h3><?php echo __('Disk quota used') ?></h3>
<div>
- <div class="usageBar" style="margin-top: 5px; background-color: #CCC;
height: 10px; width: 200px">
+ <div class="progressBar" style="margin-top: 5px; 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> allowed (%3%%)',
array('%1%' => $diskUsage, '%2%' => sfConfig::get('app_repository_quota'),
'%3%' => $diskUsagePercent)) ?>
--
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.