Author: david
Date: Fri Nov  5 15:32:18 2010
New Revision: 8787

Log:
s/digitalObject/resource/g. Fixes issue #1888.

Modified:
   trunk/apps/qubit/modules/digitalobject/actions/showAudioComponent.class.php
   trunk/apps/qubit/modules/digitalobject/templates/_showAudio.php

Modified: 
trunk/apps/qubit/modules/digitalobject/actions/showAudioComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/showAudioComponent.class.php 
Fri Nov  5 15:28:42 2010        (r8786)
+++ trunk/apps/qubit/modules/digitalobject/actions/showAudioComponent.class.php 
Fri Nov  5 15:32:18 2010        (r8787)
@@ -21,7 +21,7 @@
  * Digital Object audio display component
  *
  * @package    qubit
- * @subpackage digitalObject
+ * @subpackage resource
  * @author     Jesús García Crespo <[email protected]>
  * @version    SVN: $Id
  */
@@ -36,10 +36,10 @@
   public function execute($request)
   {
     // Get representation by usage type
-    $this->representation = 
$this->digitalObject->getRepresentationByUsage($this->usageType);
+    $this->representation = 
$this->resource->getRepresentationByUsage($this->usageType);
 
     // If we can't find a representation for this object, try their parent
-    if (!$this->representation && ($parent = $this->digitalObject->parent))
+    if (!$this->representation && ($parent = $this->resource->parent))
     {
       $this->representation = 
$parent->getRepresentationByUsage($this->usageType);
     }
@@ -56,7 +56,7 @@
     {
       $this->showFlashPlayer = false;
 
-      $this->representation = 
QubitDigitalObject::getGenericRepresentation($this->digitalObject->mimeType, 
$this->usageType);
+      $this->representation = 
QubitDigitalObject::getGenericRepresentation($this->resource->mimeType, 
$this->usageType);
     }
   }
 }

Modified: trunk/apps/qubit/modules/digitalobject/templates/_showAudio.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/templates/_showAudio.php     Fri Nov 
 5 15:28:42 2010        (r8786)
+++ trunk/apps/qubit/modules/digitalobject/templates/_showAudio.php     Fri Nov 
 5 15:32:18 2010        (r8787)
@@ -10,7 +10,7 @@
     </div>
   <?php endif;?>
 
-  <?php if (isset($link) && QubitAcl::check($digitalObject->informationObject, 
'readMaster')): ?>
+  <?php if (isset($link) && QubitAcl::check($resource->informationObject, 
'readMaster')): ?>
     <?php echo link_to(__('Download audio'), $link) ?>
   <?php endif; ?>
 
@@ -22,14 +22,14 @@
 
   <?php else: ?>
 
-    <div class="digitalObject">
+    <div class="resource">
 
-      <div class="digitalObjectRep">
+      <div class="resourceRep">
         <?php echo link_to(image_tag('play'), $link) ?>
       </div>
 
-      <div class="digitalObjectDesc">
-        <?php echo wrap_text($digitalObject->name, 18) ?>
+      <div class="resourceDesc">
+        <?php echo wrap_text($resource->name, 18) ?>
       </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.

Reply via email to