Author: david
Date: Tue Aug 30 13:44:16 2011
New Revision: 9630
Log:
New plan for refreshing upload limit display after update via YUI dialog
Added:
trunk/apps/qubit/modules/repository/templates/editUploadLimitSuccess.php
Modified:
trunk/apps/qubit/modules/repository/actions/editUploadLimitAction.class.php
trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
trunk/apps/qubit/modules/repository/templates/_uploadLimit.php
Modified:
trunk/apps/qubit/modules/repository/actions/editUploadLimitAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/editUploadLimitAction.class.php
Tue Aug 30 13:33:11 2011 (r9629)
+++ trunk/apps/qubit/modules/repository/actions/editUploadLimitAction.class.php
Tue Aug 30 13:44:16 2011 (r9630)
@@ -45,15 +45,5 @@
}
$this->resource->save();
-
- //$request->getResponse()->setHttpHeader('Content-Type',
'application/json; charset=utf-8');
-
- $output = array('response' => array(
- 'status' => 'ok',
- 'uploadLimit' => $this->resource->uploadLimit,
- 'uploadLimitType' => $uploadLimit['type']
- ));
-
- return $this->renderText(json_encode($output));
}
}
Modified:
trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
Tue Aug 30 13:33:11 2011 (r9629)
+++ trunk/apps/qubit/modules/repository/actions/uploadLimitComponent.class.php
Tue Aug 30 13:44:16 2011 (r9630)
@@ -20,14 +20,6 @@
class RepositoryUploadLimitComponent extends sfComponent
{
public
- $diskUsage,
- $uploadLimit,
- $diskUsagePercent,
- $msgs = array(
- 'limited' => '%du% of %limit% <abbr title="1 GB = 1 000 000 000
bytes">GB</abbr> (%dupercent%%)',
- 'disabled' => 'Upload is disabled',
- 'unlimited' => '%du% <abbr title="1 GB = 1 000 000 000 bytes">GB</abbr>
of <em>Unlimited</em>'
- ),
// Usage bar
$usageBarDisplay = 'none',
$usageBarPixels = 0,
@@ -64,7 +56,7 @@
}
// Default color for "disk usage" bar is green
- $this->usageBarColor = $usageBarColor['default'];
+ $this->usageBarColor = $this->usageBarColors['default'];
// Calc progress bar and percentages values for usage limit > 0
if (0 < $this->resource->uploadLimit)
@@ -73,10 +65,10 @@
$this->usageBarDisplay = 'block';
// Calc percent
- $dup = $du / floatval($this->resource->uploadLimit) * 100;
+ $dup = $this->diskUsage / floatval($this->resource->uploadLimit) * 100;
// Get display values
- if (0 < $dup && 1 > $dup)
+ if (0 <= $dup && 1 > $dup)
{
$this->diskUsagePercent = '< 1';
$this->usageBarPixels = '1';
Modified: trunk/apps/qubit/modules/repository/templates/_uploadLimit.php
==============================================================================
--- trunk/apps/qubit/modules/repository/templates/_uploadLimit.php Tue Aug
30 13:33:11 2011 (r9629)
+++ trunk/apps/qubit/modules/repository/templates/_uploadLimit.php Tue Aug
30 13:44:16 2011 (r9630)
@@ -9,19 +9,22 @@
<div style="height: 10px; width: <?php echo $barPixels ?>px;
background-color: <?php echo $barColor ?>;"></div>
</div>
-<?php if (0 < floatval($resource->uploadLimit)): ?>
- <?php echo __($msgs['limited'], array('%du%' => $diskUsage, '%limit%' =>
$resource->uploadLimit, '%dupercent%' => $diskUsagePercent)) ?>
-<?php elseif (0 == $resource->uploadLimit): ?>
- <?php echo __($msgs['disabled']) ?>
+<?php if (0 < floatval($uploadLimit)): ?>
+ <?php echo __('%du% of %limit% <abbr title="1 GB = 1 000 000 000
bytes">GB</abbr> (%percent%%)', array('%du%' => $diskUsage, '%limit%' =>
$uploadLimit, '%percent%' => $diskUsagePercent)) ?>
+<?php elseif (0 == $uploadLimit): ?>
+ <?php echo __('Upload is disabled') ?>
<?php else: ?>
- <?php echo __($msgs['unlimited'], array('%du%' => $diskUsage)) ?>
+ <?php echo __('%du% <abbr title="1 GB = 1 000 000 000 bytes">GB</abbr> of
<em>Unlimited</em>', array('%du%' => $diskUsage)) ?>
<?php endif; // Limited, disabled, unlimited disk usage ?>
+<?php if ($sf_user->hasCredential('administrator')): ?>
<?php echo __('( %1%edit%2% )', array('%1%' => '<a href="#"
id="editUlLink">', '%2%' => '</a>')) ?>
+<?php endif; ?>
</div>
</div>
+<?php if ($sf_user->hasCredential('administrator')): ?>
<!-- Edit upload limit -->
<!-- NOTE YUI dialog wraps this *entire* div -->
<div class="section" id="editUploadLimit">
@@ -106,3 +109,4 @@
//]]>
</script>
+<?php endif; // Edit dialog for admins only ?>
Added: trunk/apps/qubit/modules/repository/templates/editUploadLimitSuccess.php
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/apps/qubit/modules/repository/templates/editUploadLimitSuccess.php
Tue Aug 30 13:44:16 2011 (r9630)
@@ -0,0 +1 @@
+<?php include_component('repository', 'uploadLimit', array('resource' =>
$resource)) ?>
--
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.
