Author: david
Date: 2008-11-11 15:26:50 -0800 (Tue, 11 Nov 2008)
New Revision: 1575
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/showRadAction.class.php
trunk/qubit/apps/qubit/modules/informationobject/templates/showRadSuccess.php
Log:
Final tweaks to showRad - move fields, update labels. Completes Issue #441.
Modified:
trunk/qubit/apps/qubit/modules/informationobject/actions/showRadAction.class.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/actions/showRadAction.class.php
2008-11-11 23:21:25 UTC (rev 1574)
+++
trunk/qubit/apps/qubit/modules/informationobject/actions/showRadAction.class.php
2008-11-11 23:26:50 UTC (rev 1575)
@@ -36,8 +36,8 @@
parent::execute($request);
// add RAD specific commands
- $this->radNotes = $this->informationObject->getNotesByTaxonomy($options =
array('noteTypeId' => 'QubitTaxonomy::RAD_NOTE_ID'));
- $this->radTitleNotes =
$this->informationObject->getNotesByTaxonomy($options = array('noteTypeId' =>
'QubitTaxonomy::RAD_TITLE_NOTE_ID'));
+ $this->radNotes = $this->informationObject->getNotesByTaxonomy($options =
array('taxonomyId' => QubitTaxonomy::RAD_NOTE_ID));
+ $this->radTitleNotes =
$this->informationObject->getNotesByTaxonomy($options = array('taxonomyId' =>
QubitTaxonomy::RAD_TITLE_NOTE_ID));
$infoObject = $this->informationObject;
Modified:
trunk/qubit/apps/qubit/modules/informationobject/templates/showRadSuccess.php
===================================================================
---
trunk/qubit/apps/qubit/modules/informationobject/templates/showRadSuccess.php
2008-11-11 23:21:25 UTC (rev 1574)
+++
trunk/qubit/apps/qubit/modules/informationobject/templates/showRadSuccess.php
2008-11-11 23:26:50 UTC (rev 1575)
@@ -3,6 +3,7 @@
<table class="detail">
<tbody>
+<!-- 1.1 Title and statement of responsibility area -->
<?php if ($informationObject->getTitle(array('sourceCulture' => true))): ?>
<tr><td colspan="2" class="headerCell">
<?php if ($editCredentials) echo
link_to(QubitRad::getLabel($informationObject),
'informationobject/editRad/?id='.$informationObject->getId());
@@ -49,6 +50,17 @@
</tr>
<?php endif; ?>
+<?php if (count($radTitleNotes) > 0) : ?>
+ <tr>
+ <th><?php echo __('title notes'); ?></th>
+ <td>
+ <?php foreach ($radTitleNotes as $radTitleNote): ?>
+ <?php echo $radTitleNote->getType().':
'.nl2br($radTitleNote->getContent(array('cultureFallback' => true))); ?><br />
+ <?php endforeach; ?>
+ </td>
+ </tr>
+<?php endif; ?>
+
<?php if ($informationObject->getLevelOfDescriptionId()) : ?>
<tr>
<th><?php echo __('level of description'); ?></th>
@@ -69,7 +81,9 @@
<td><?php echo QubitRad::getReferenceCode($informationObject) ?></td>
</tr>
<?php endif; ?>
+<!-- End 1.1 -->
+<!-- 1.2 Edition area -->
<?php if (strlen($value =
$informationObject->getEdition(array('cultureFallback' => true))) > 0) : ?>
<tr>
<th><?php echo __('edition statement'); ?></th>
@@ -83,8 +97,9 @@
<td><?php echo $value; ?></td>
</tr>
<?php endif; ?>
+<!-- End 1.2 -->
-<!-- 1.3 PROPERTIES -->
+<!-- 1.3 Class of material specific details area -->
<?php if (strlen($value =
$radStatementOfScaleCartographic->getValue(array('cultureFallback' => true))) >
0) : ?>
<tr>
<th><?php echo __('statement of scale (cartographic)'); ?></th>
@@ -119,10 +134,9 @@
<td><?php echo $value; ?></td>
</tr>
<?php endif; ?>
-<!-- END 1.3 PROPERTIES -->
+<!-- End 1.3 -->
-
-<!-- Dates -->
+<!-- 1.4 Dates of creation area -->
<?php if (count($informationObject->getDates()) > 0) : ?>
<tr>
<th><?php echo __('dates'); ?></th>
@@ -147,25 +161,6 @@
</tr>
<?php endif; ?>
-<?php if (strlen($value =
$informationObject->getExtentAndMedium(array('cultureFallback' => true))) > 0)
: ?>
- <tr>
- <th><?php echo __('extent and medium'); ?></th>
- <td><?php echo nl2br($value); ?></td>
- </tr>
-<?php endif; ?>
-
-<?php if ($digitalObject = $informationObject->getDigitalObject()): ?>
-<tr><th><?php echo sfConfig::get('app_ui_label_digitalobject') ?></th>
- <td>
- <?php include_component('digitalobject', 'show', array(
- 'digitalObject'=>$digitalObject,
- 'usageType'=>QubitTerm::THUMBNAIL_ID,
- 'link'=>'digitalobject/show?id='.$digitalObject->getId()
- )); ?>
- </td>
-</tr>
-<?php endif; ?>
-
<?php foreach ($creators as $creator): ?>
<tr>
<th><?php echo __('name of creator') ?></th>
@@ -185,7 +180,17 @@
</td>
</tr>
<?php endforeach; ?>
+<!-- End 1.4 -->
+<!-- 1.5 Physical description area -->
+<?php if (strlen($value =
$informationObject->getExtentAndMedium(array('cultureFallback' => true))) > 0)
: ?>
+ <tr>
+ <th><?php echo __('extent of descriptive unit, other physical details,
dimensions, and accompanying material'); ?></th>
+ <td><?php echo nl2br($value); ?></td>
+ </tr>
+<?php endif; ?>
+<!-- End 1.5 -->
+
<!-- 1.6 Publisher's series area -->
<?php if (strlen($value =
$radTitleProperOfPublishersSeries->getValue(array('cultureFallback' => true)))
> 0) : ?>
<tr>
@@ -233,7 +238,7 @@
<!-- 1.7 Archival description area -->
<?php if (strlen($value =
$informationObject->getArchivalHistory(array('cultureFallback' => true))) > 0)
: ?>
<tr>
- <th><?php echo __('archival history'); ?></th>
+ <th><?php echo __('custodial history'); ?></th>
<td><?php echo nl2br($value); ?></td>
</tr>
<?php endif; ?>
@@ -246,11 +251,6 @@
<?php endif; ?>
<!-- End 1.7 -->
-<?php if (count($physicalObjects) && $editCredentials): ?>
- <?php include_partial('physicalobject/show',
- array('informationObject'=>$informationObject,
'physicalObjects'=>$physicalObjects)); ?>
-<?php endif; ?>
-
<!-- 1.8 Archival description area -->
<?php if (strlen($value =
$informationObject->getPhysicalCharacteristics(array('cultureFallback' =>
true))) > 0) : ?>
<tr>
@@ -336,18 +336,29 @@
<?php endif; ?>
<?php if (strlen($value =
$informationObject->getRelatedUnitsOfDescription(array('cultureFallback' =>
true))) > 0) : ?>
-<tr>
-<th><?php echo __('associated material, related groups of records in different
fonds, related groups of records in the same fonds'); ?></th>
-<td><?php echo nl2br($value); ?></td>
-</tr>
+ <tr>
+ <th><?php echo __('associated material, related groups of records in
different fonds, related groups of records in the same fonds'); ?></th>
+ <td><?php echo nl2br($value); ?></td>
+ </tr>
<?php endif; ?>
<?php if (strlen($value =
$informationObject->getAccruals(array('cultureFallback' => true))) > 0) : ?>
-<tr>
-<th><?php echo __('accruals'); ?></th>
-<td><?php echo nl2br($value); ?></td>
-</tr>
+ <tr>
+ <th><?php echo __('accruals'); ?></th>
+ <td><?php echo nl2br($value); ?></td>
+ </tr>
<?php endif; ?>
+
+<?php if (count($radNotes) > 0) : ?>
+ <tr>
+ <th><?php echo __('other notes'); ?></th>
+ <td>
+ <?php foreach ($radNotes as $note): ?>
+ <?php echo $note->getType().':
'.nl2br($note->getContent(array('cultureFallback' => true))); ?><br />
+ <?php endforeach; ?>
+ </td>
+ </tr>
+<?php endif; ?>
<!-- End 1.8 -->
<!-- 1.9 Standard number area -->
@@ -361,105 +372,136 @@
<!-- Access Points-->
<?php if (count($subjectAccessPoints) > 0) : ?>
-<tr>
-<th><?php echo __('subject access points'); ?></th>
-<td>
- <?php foreach ($subjectAccessPoints as $subject): ?>
- <?php echo link_to($subject->getTerm(),
'term/browse?termId='.$subject->getTermId()); ?><br />
- <?php endforeach; ?>
-</td></tr>
+ <tr>
+ <th><?php echo __('subject access points'); ?></th>
+ <td>
+ <?php foreach ($subjectAccessPoints as $subject): ?>
+ <?php echo link_to($subject->getTerm(),
'term/browse?termId='.$subject->getTermId()); ?><br />
+ <?php endforeach; ?>
+ </td>
+ </tr>
<?php endif; ?>
<?php if (count($placeAccessPoints) > 0) : ?>
-<tr>
-<th><?php echo __('place access points'); ?></th>
-<td>
- <?php foreach ($placeAccessPoints as $place): ?>
- <?php echo link_to($place->getTerm(),
'term/browse?termId='.$place->getTermId()); ?><br />
- <?php endforeach; ?>
-</td></tr>
+ <tr>
+ <th><?php echo __('place access points'); ?></th>
+ <td>
+ <?php foreach ($placeAccessPoints as $place): ?>
+ <?php echo link_to($place->getTerm(),
'term/browse?termId='.$place->getTermId()); ?><br />
+ <?php endforeach; ?>
+ </td>
+ </tr>
<?php endif; ?>
<?php if (count($nameAccessPoints) > 0 ) : ?>
-<tr>
-<th><?php echo __('name access points'); ?></th>
-<td>
- <?php foreach ($nameAccessPoints as $name): ?>
- <?php echo link_to($name->getActor(),
'actor/show?id='.$name->getActorId()) ?>
- <?php echo ' ('.$name->getType()->getRole().')' ?>
- <br />
- <?php endforeach; ?>
-</td></tr>
+ <tr>
+ <th><?php echo __('name access points'); ?></th>
+ <td>
+ <?php foreach ($nameAccessPoints as $name): ?>
+ <?php echo link_to($name->getActor(),
'actor/show?id='.$name->getActorId()) ?>
+ <?php echo ' ('.$name->getType()->getRole().')' ?>
+ <br />
+ <?php endforeach; ?>
+ </td>
+ </tr>
<?php endif; ?>
<!-- End Access Points-->
<!-- Control Area -->
-<?php if (count($notes) > 0) : ?>
-<tr>
-<th><?php echo __('notes'); ?></th>
-<td>
- <?php foreach ($notes as $note): ?>
- <?php echo $note->getType().':
'.nl2br($note->getContent(array('cultureFallback' => true))); ?><br />
- <?php endforeach; ?>
-</td>
-</tr>
-<?php endif; ?>
-
<?php if ($informationObject->getDescriptionIdentifier()): ?>
- <tr><th><?php echo __('description identifier')?></th>
- <td><?php echo $informationObject->getDescriptionIdentifier() ?></td></tr>
+ <tr>
+ <th><?php echo __('description record identifier')?></th>
+ <td><?php echo $informationObject->getDescriptionIdentifier() ?></td>
+ </tr>
<?php endif; ?>
<?php if (strlen($value =
$informationObject->getInstitutionResponsibleIdentifier(array('cultureFallback'
=> true))) > 0) : ?>
- <tr><th><?php echo __('institution identifier')?></th>
- <td><?php echo $value ?></td></tr>
+ <tr>
+ <th><?php echo __('institution identifier')?></th>
+ <td><?php echo $value ?></td>
+ </tr>
<?php endif; ?>
<?php if (strlen($value = $informationObject->getRules(array('cultureFallback'
=> true))) > 0) : ?>
- <tr><th><?php echo __('rules')?></th>
- <td><?php echo nl2br($value) ?></td></tr>
+ <tr>
+ <th><?php echo __('rules or conventions')?></th>
+ <td><?php echo nl2br($value) ?></td>
+ </tr>
<?php endif; ?>
<?php if ($informationObject->getDescriptionStatusId()): ?>
- <tr><th><?php echo __('status')?></th><td>
- <?php echo
$informationObject->getDescriptionStatus()->getName(array('cultureFallback' =>
true)) ?>
- </td></tr>
+ <tr>
+ <th><?php echo __('status')?></th>
+ <td><?php echo
$informationObject->getDescriptionStatus()->getName(array('cultureFallback' =>
true)) ?></td>
+ </tr>
<?php endif; ?>
<?php if ($informationObject->getDescriptionDetailId()): ?>
- <tr><th><?php echo __('detail')?></th><td>
- <?php echo
$informationObject->getDescriptionDetail()->getName(array('cultureFallback' =>
true)) ?>
- </td></tr>
+ <tr>
+ <th><?php echo __('detail')?></th>
+ <td><?php echo
$informationObject->getDescriptionDetail()->getName(array('cultureFallback' =>
true)) ?></td>
+ </tr>
<?php endif; ?>
<?php if (strlen($value =
$informationObject->getRevisionHistory(array('cultureFallback' => true))) > 0)
: ?>
- <tr><th><?php echo __('dates of creation revision deletion')?></th><td>
- <?php echo nl2br($value) ?>
- </td></tr>
+ <tr>
+ <th><?php echo __('dates of creation, revision and deletion')?></th>
+ <td><?php echo nl2br($value) ?></td>
+ </tr>
<?php endif; ?>
<?php if (count($descriptionLanguageCodes) > 0): ?>
- <tr><th><?php echo __('language of description')?></th><td>
- <?php foreach ($descriptionLanguageCodes as $languageCode): ?>
- <?php echo
format_language($languageCode->getValue(array('sourceCulture'=>true))) ?><br />
- <?php endforeach; ?>
- </td></tr>
+ <tr>
+ <th><?php echo __('language of description')?></th>
+ <td>
+ <?php foreach ($descriptionLanguageCodes as $languageCode): ?>
+ <?php echo
format_language($languageCode->getValue(array('sourceCulture'=>true))) ?><br />
+ <?php endforeach; ?>
+ </td>
+ </tr>
<?php endif; ?>
<?php if (count($descriptionScriptCodes) > 0): ?>
- <tr><th><?php echo __('script of description')?></th><td>
- <?php foreach ($descriptionScriptCodes as $scriptCode): ?>
- <?php echo
format_script($scriptCode->getValue(array('sourceCulture'=>true))) ?><br />
- <?php endforeach; ?>
- </td></tr>
+ <tr>
+ <th><?php echo __('script of description')?></th>
+ <td>
+ <?php foreach ($descriptionScriptCodes as $scriptCode): ?>
+ <?php echo
format_script($scriptCode->getValue(array('sourceCulture'=>true))) ?><br />
+ <?php endforeach; ?>
+ </td>
+ </tr>
<?php endif; ?>
<?php if (strlen($value =
$informationObject->getSources(array('cultureFallback' => true))) > 0) : ?>
- <tr><th><?php echo __('sources')?></th>
- <td><?php echo nl2br($value) ?></td></tr>
+ <tr>
+ <th><?php echo __('sources')?></th>
+ <td><?php echo nl2br($value) ?></td>
+ </tr>
<?php endif; ?>
<!-- End Control Area -->
+<!-- Digital Object Area -->
+<?php if ($digitalObject = $informationObject->getDigitalObject()): ?>
+<tr><th><?php echo sfConfig::get('app_ui_label_digitalobject') ?></th>
+ <td>
+ <?php include_component('digitalobject', 'show', array(
+ 'digitalObject'=>$digitalObject,
+ 'usageType'=>QubitTerm::THUMBNAIL_ID,
+ 'link'=>'digitalobject/show?id='.$digitalObject->getId()
+ )); ?>
+ </td>
+</tr>
+<!-- End Digital Object Area -->
+
+<!-- Physical Object Area -->
+<?php if (count($physicalObjects) && $editCredentials): ?>
+ <?php include_partial('physicalobject/show',
+ array('informationObject'=>$informationObject,
'physicalObjects'=>$physicalObjects)); ?>
+<?php endif; ?>
+
+<?php endif; ?>
+<!-- End Physical Object Area -->
+
</tbody>
</table>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
