Author: jablko
Date: Wed Sep 16 14:05:39 2009
New Revision: 3349
Log:
Rollback revisions 3257, 2773, and 2770, move links to edit digital object and
physical storage pages from context menu to actions
Modified:
trunk/apps/qubit/modules/informationobject/templates/_actions.php
trunk/apps/qubit/modules/informationobject/templates/_contextMenu.php
Modified: trunk/apps/qubit/modules/informationobject/templates/_actions.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/_actions.php Wed Sep
16 14:05:13 2009 (r3348)
+++ trunk/apps/qubit/modules/informationobject/templates/_actions.php Wed Sep
16 14:05:39 2009 (r3349)
@@ -6,7 +6,17 @@
<li><?php echo link_to(__('Delete'), array('module' =>
'informationobject', 'action' => 'delete', 'id' => $informationObject->id),
array('title' => __('Delete information object'))) ?></li>
<?php endif; ?>
<?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <li><?php echo link_to(__('Edit'), array('module' => 'informationobject',
'action' => 'edit', 'id' => $informationObject->id)) ?></li>
+ <li><?php echo link_to(__('Edit archival description'), array('module' =>
'informationobject', 'action' => 'edit', 'id' => $informationObject->id))
?></li>
+ <?php endif; ?>
+ <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
+ <?php if (0 < count($informationObject->digitalObjects)): ?>
+ <li><?php echo link_to(__('Edit digital object'), array('module' =>
'digitalobject', 'action' => 'edit', 'id' =>
$informationObject->digitalObjects[0]->id)) ?></li>
+ <?php else: ?>
+ <li><?php echo link_to(__('Upload digital object'), array('module' =>
'digitalobject', 'action' => 'create', 'informationObject' =>
$informationObject->id)) ?></li>
+ <?php endif; ?>
+ <?php endif; ?>
+ <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
+ <li><?php echo link_to(__('Edit physical storage'), array('module' =>
'informationobject', 'action' => 'editPhysicalObjects', 'id' =>
$informationObject->id)) ?></li>
<?php endif; ?>
<li><?php echo link_to(__('List'), array('module' => 'informationobject',
'action' => 'list', 'id' => $informationObject->parentId)) ?></li>
</ul>
Modified: trunk/apps/qubit/modules/informationobject/templates/_contextMenu.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/_contextMenu.php
Wed Sep 16 14:05:13 2009 (r3348)
+++ trunk/apps/qubit/modules/informationobject/templates/_contextMenu.php
Wed Sep 16 14:05:39 2009 (r3349)
@@ -34,9 +34,8 @@
</ul>
<?php endif; ?>
- <?php include_component('digitalobject', 'imageflow', array('thumbnails'
=> $thumbnails)) ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <?php echo link_to('Edit', array('module' => 'digitalobject', 'action'
=> 'edit', 'id' => $informationObject->id)) ?>
+ <?php if (count($thumbnails) > 1): ?>
+ <?php include_component('digitalobject', 'imageflow', array('thumbnails'
=> $thumbnails)) ?>
<?php endif; ?>
<?php if (count($informationObjects) > 1): ?>
@@ -46,11 +45,9 @@
<?php include_component('informationobject', 'treeView',
array('informationObjects' => $informationObjects)) ?>
<?php endif; ?>
- <?php include_component('physicalobject', 'contextMenu',
array('physicalObjects' => $physicalObjects, 'informationObject' =>
$informationObject)) ?>
- <?php if (SecurityPriviliges::editCredentials($sf_user,
'informationObject')): ?>
- <?php echo link_to('Edit', array('module' => 'informationobject',
'action' => 'editPhysicalObjects', 'id' => $informationObject->id)) ?>
+ <?php if (count($physicalObjects)): ?>
+ <?php include_component('physicalobject', 'contextMenu',
array('physicalObjects' => $physicalObjects, 'informationObject' =>
$informationObject)) ?>
<?php endif; ?>
-
<div class="label"><?php echo __('export') ?></div>
<ul><li><?php echo link_to(__('Dublin Core 1.1 XML'), array('module' =>
'informationobject', 'action' => 'exportDc', 'id' => $informationObject->id))
?></li>
<li><?php echo link_to(__('EAD 2002 XML'), array('module' =>
'informationobject', 'action' => 'exportEad', 'id' => $informationObject->id))
?></li>
@@ -58,4 +55,4 @@
</ul>
</div>
-</div>
+</div>
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
