Author: david
Date: 2008-11-13 15:52:37 -0800 (Thu, 13 Nov 2008)
New Revision: 1588

Modified:
   trunk/qubit/apps/qubit/modules/informationobject/templates/editRadSuccess.php
   trunk/qubit/apps/qubit/modules/informationobject/templates/showRadSuccess.php
Log:
Text changes to RAD show/edit templates:
- Simplify labels for "Physcial description" and "Associated / related material"
- Remove section numbers from editRad divs, and use lower-case labels
- Add GMD qualifiers to calls of materials labels (cartographic & philalectic)
- Show admin history in archival description area of editRad template
- Archival description labels - use "Biographical sketch" for family/person 
admin
- Add "finding aids" note to editRad template

Modified: 
trunk/qubit/apps/qubit/modules/informationobject/templates/editRadSuccess.php
===================================================================
--- 
trunk/qubit/apps/qubit/modules/informationobject/templates/editRadSuccess.php   
    2008-11-13 22:43:05 UTC (rev 1587)
+++ 
trunk/qubit/apps/qubit/modules/informationobject/templates/editRadSuccess.php   
    2008-11-13 23:52:37 UTC (rev 1588)
@@ -3,26 +3,26 @@
 
 <div class="pageTitle"><?php echo __('edit archival description'); ?></div>
 
-<?php echo form_tag('informationobject/updateRad', 'multipart=true') ?>
+<form method="post" action="<?php echo url_for('informationobject/updateRad') 
?>" enctype="multipart/form-data">
   <?php echo object_input_hidden_tag($informationObject, 'getId') ?>
   <?php echo input_hidden_tag('collection_type_id', 
QubitTerm::ARCHIVAL_MATERIAL_ID) ?>
 
-  <?php if ($label = QubitRad::getLabel($informationObject, 
array('sourceCulture' => true))): ?>
-    <div class="formHeader">
-      <?php echo link_to($label, 
'informationobject/showRad/?id='.$informationObject->getId()) ?>
-    </div>
-  <?php else: ?>
-    <table class="list" style="height: 25px;"><thead><tr><th></th></tr></table>
-  <?php endif; ?>
+<?php if ($label = QubitRad::getLabel($informationObject, 
array('sourceCulture' => true))): ?>
+  <div class="formHeader">
+    <?php echo link_to($label, 
'informationobject/showRad/?id='.$informationObject->getId()) ?>
+  </div>
+<?php else: ?>
+  <table class="list" style="height: 
25px;"><thead><tr><th>&nbsp;</th></tr></table>
+<?php endif; ?>
 
-  <?php if ($sf_context->getActionName() == 'create'): ?>
+<?php if ($sf_context->getActionName() == 'create'): ?>
   <fieldset class="collapsible">
-  <?php else : ?>
+<?php else : ?>
   <fieldset class="collapsible collapsed">
-  <?php endif; ?>
-
-  <legend><?php echo __('1.1 Title and statement of responsibility area'); 
?></legend>
-
+<?php endif; ?>
+  
+    <!-- title and statement of responsibility area -->
+    <legend><?php echo __('title and statement of responsibility area'); 
?></legend>
     <div class="form-item">
       <label for="title proper"><?php echo __('title proper'); ?></label>
       <?php if (strlen($sourceCultureValue = 
$informationObject->getTitle(array('sourceCulture' => 'true'))) > 0 && 
$sf_user->getCulture() != $informationObject->getSourceCulture()): ?>
@@ -126,10 +126,11 @@
       </div>
     <?php endif; ?>
   </fieldset>
-
-
+  <!-- End title and statement of responsibility area -->
+  
+  <!-- Edition area -->
   <fieldset class="collapsible collapsed">
-    <legend><?php echo __('1.2 Edition area'); ?></legend>
+    <legend><?php echo __('edition area'); ?></legend>
 
     <div class="form-item">
       <label for="edition statement"><?php echo __('edition statement'); 
?></label>
@@ -146,11 +147,12 @@
       <?php endif; ?>
       <?php echo object_input_tag($radEditionStatementOfResponsibility, 
'getValue', array('name' => 'rad_edition_statement_of_responsibility', 'size' 
=> 20)) ?>
     </div>
+  </fieldset>
+  <!-- End edition area -->
 
-   </fieldset>
-
+  <!-- Class of material specific details area -->
   <fieldset class="collapsible collapsed">
-    <legend><?php echo __('1.3 Class of material specific details area'); 
?></legend>
+    <legend><?php echo __('class of material specific details area'); 
?></legend>
 
     <div class="form-item">
       <label for="statement of scale (cartographic)"><?php echo __('statement 
of scale (cartographic)'); ?></label>
@@ -161,7 +163,7 @@
     </div>
 
     <div class="form-item">
-      <label for="statement of projection"><?php echo __('statement of 
projection'); ?></label>
+      <label for="statement of projection"><?php echo __('statement of 
projection (cartographic)'); ?></label>
       <?php if (strlen($sourceCultureValue = 
$radStatementOfProjection->getSourceTextForTranslation($sf_user->getCulture()))):
 ?>
       <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
       <?php endif; ?>
@@ -169,7 +171,7 @@
     </div>
 
     <div class="form-item">
-      <label for="statement of coordinates"><?php echo __('statement of 
coordinates'); ?></label>
+      <label for="statement of coordinates"><?php echo __('statement of 
coordinates (cartographic)'); ?></label>
       <?php if (strlen($sourceCultureValue = 
$radStatementOfCoordinates->getSourceTextForTranslation($sf_user->getCulture()))):
 ?>
       <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
       <?php endif; ?>
@@ -185,50 +187,52 @@
     </div>
 
     <div class="form-item">
-      <label for="issuing jurisdiction and denomination"><?php echo 
__('issuing jurisdiction and denomination'); ?></label>
+      <label for="issuing jurisdiction and denomination"><?php echo 
__('issuing jurisdiction and denomination (philatelic)'); ?></label>
       <?php if (strlen($sourceCultureValue = 
$radIssuingJursidictionAndDenomination->getSourceTextForTranslation($sf_user->getCulture()))):
 ?>
       <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
       <?php endif; ?>
       <?php echo object_input_tag($radIssuingJursidictionAndDenomination, 
'getValue', array('name' => 'rad_issuing_jursidiction_and_denomination', 'size' 
=> 20)) ?>
     </div>
   </fieldset>
-
+  <!-- End class of material specific details area -->
+  
+  <!-- Dates of creation area -->
   <fieldset class="collapsible collapsed">
-    <legend><?php echo __('1.4 Dates of creation area'); ?></legend>
+    <legend><?php echo __('dates of creation area'); ?></legend>
 
-      <table id="actorEvents" class="inline" style="margin-top: 25px;">
-        <tr>
-          <th style="width: 35%;"><?php echo __('Name') ?></th>
-          <th style="width: 25%;"><?php echo __('Role').'/'.__('Event') ?></th>
-          <th style="width: 30%;"><?php echo __('Date(s)') ?></th>
-          <th style="width: 10%">&nbsp;</th>
-        </tr>
-        <?php if(count($actorEvents)): ?>
-        <?php foreach ($actorEvents as $actorEvent): ?>
-        <tr>
-          <?php if ($actorEvent->getActor()): ?>
-            <td>
-              <?php echo $actorEvent->getActor() ?>
-            </td>
-          <?php else: ?>
-            <td></td>
-          <?php endif; ?>
-          <?php if ($actorEvent->getActor()): ?>
+    <table id="actorEvents" class="inline" style="margin-top: 25px;">
+      <tr>
+        <th style="width: 35%;"><?php echo __('Name') ?></th>
+        <th style="width: 25%;"><?php echo __('Role').'/'.__('Event') ?></th>
+        <th style="width: 30%;"><?php echo __('Date(s)') ?></th>
+        <th style="width: 10%">&nbsp;</th>
+      </tr>
+      <?php if(count($actorEvents)): ?>
+      <?php foreach ($actorEvents as $actorEvent): ?>
+      <tr>
+        <?php if ($actorEvent->getActor()): ?>
           <td>
-            <?php echo $actorEvent->getType()->getRole() ?>
+            <?php echo $actorEvent->getActor() ?>
           </td>
-          <?php else: ?>
-            <td><?php echo $actorEvent->getType() ?></td>
-          <?php endif; ?>
-          <td><?php echo $actorEvent->getDateDisplay(array('cultureFallback' 
=> 'true')) ?></td>
-          <td style="text-align: right">
-            <!-- <a href="javascript:editActorEventDialog(<?php echo 
$actorEvent->getId()?>)"><?php echo image_tag('pencil', 'align=top') ?></a> -->
-            <?php echo link_to(image_tag('delete', 'align=top'), 
'informationobject/deleteEvent?eventId='.$actorEvent->getId().'&returnTemplate=rad')
 ?>
-          </td>
-        </tr>
-        <?php endforeach; ?>
+        <?php else: ?>
+          <td></td>
         <?php endif; ?>
-      </table>
+        <?php if ($actorEvent->getActor()): ?>
+        <td>
+          <?php echo $actorEvent->getType()->getRole() ?>
+        </td>
+        <?php else: ?>
+          <td><?php echo $actorEvent->getType() ?></td>
+        <?php endif; ?>
+        <td><?php echo $actorEvent->getDateDisplay(array('cultureFallback' => 
'true')) ?></td>
+        <td style="text-align: right">
+          <!-- <a href="javascript:editActorEventDialog(<?php echo 
$actorEvent->getId()?>)"><?php echo image_tag('pencil', 'align=top') ?></a> -->
+          <?php echo link_to(image_tag('delete', 'align=top'), 
'informationobject/deleteEvent?eventId='.$actorEvent->getId().'&returnTemplate=rad')
 ?>
+        </td>
+      </tr>
+      <?php endforeach; ?>
+      <?php endif; ?>
+    </table>
 
     <!-- add new creation event yui dialog object -->
     <?php echo include_partial('newActorEventDialog') ?>
@@ -283,36 +287,46 @@
       <?php foreach ($creators as $creator): ?>
       <div class="form-item">
       <label>
-      <?php $entityTypeId = $creator->getEntityTypeId() ?>
-      <?php if ($entityTypeId == QubitTerm::CORPORATE_BODY_ID): ?>
-        <?php echo __('Administrative').' ' ?>
-      <?php elseif (($entityTypeId == QubitTerm::PERSON_ID) || ($entityTypeId 
== QubitTerm::FAMILY_ID)): ?>
-        <?php echo __('Biographic').' ' ?>
-      <?php endif; ?>
-        <?php echo __('history').': ' ?></td><td><?php echo $creator ?>
+        <?php $entityTypeId = $creator->getEntityTypeId() ?>
+        <?php if ($entityTypeId == QubitTerm::CORPORATE_BODY_ID): ?>
+          <?php echo __('administrative history').':' ?>
+        <?php elseif (($entityTypeId == QubitTerm::PERSON_ID) || 
($entityTypeId == QubitTerm::FAMILY_ID)): ?>
+          <?php echo __('biographical sketch').':' ?>
+        <?php else: ?>
+          <?php echo __('history').':' ?>
+        <?php endif; ?>
+        <?php echo $creator->getAuthorizedFormOfName(array('culturalFallback' 
=> 'true')) ?>
       </label>
-        <table class="inline" style="margin: 0;"><tr><td><?php echo 
nl2br($creator->getHistory(array('cultureFallback' => 'true'))) ?></td><td 
style="width: 20px;"><?php echo link_to(image_tag('pencil', 'align=top'), 
'actor/edit?id='.$creator->getId().'&informationObjectReroute='.$informationObject->getId())
 ?></td></tr>
-        </table>
-       </div>
+      <table class="inline" style="margin: 0;">
+        <tr>
+          <td><?php echo nl2br($creator->getHistory(array('cultureFallback' => 
'true'))) ?></td>
+          <td style="width: 20px;"><?php echo link_to(image_tag('pencil', 
'align=top'), 
'actor/edit?id='.$creator->getId().'&informationObjectReroute='.$informationObject->getId())
 ?></td>
+        </tr>
+      </table>
+      </div>
       <?php endforeach; ?>
     <?php endif; ?>
    </fieldset>
-
+   <!-- End dates of creation area -->
+  
+   <!-- Physical description area -->
    <fieldset class="collapsible collapsed">
-    <legend><?php echo __('1.5 Physical description area'); ?></legend>
+    <legend><?php echo __('physical description area'); ?></legend>
 
     <div class="form-item">
-      <label for="extent_and_medium"><?php echo __('extent of descriptive 
unit, other physical details, dimensions, and accompanying material'); 
?></label>
+      <label for="extent_and_medium"><?php echo __('physical description'); 
?></label>
       <?php if (strlen($sourceCultureValue = 
$informationObject->getExtentAndMedium(array('sourceCulture' => 'true'))) > 0 
&& $sf_user->getCulture() != $informationObject->getSourceCulture()): ?>
       <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
       <?php endif; ?>
       <?php echo object_textarea_tag($informationObject, 'getExtentAndMedium', 
array('size' => '30x3')) ?>
     </div>
 
-   </fieldset>
-
+  </fieldset>
+  <!-- End physical description area -->
+  
+  <!-- Publisher's series area -->
   <fieldset class="collapsible collapsed">
-    <legend><?php echo __("1.6 Publisher's series area"); ?></legend>
+    <legend><?php echo __("publisher's series area"); ?></legend>
 
     <div class="form-item">
       <label for="Title proper of publisher's series"><?php echo __("Title 
proper of publisher's series"); ?></label>
@@ -361,37 +375,60 @@
       <?php endif; ?>
       <?php echo object_textarea_tag($radNoteOnPublishersSeries, 'getValue', 
array('name' => 'rad_note_on_publishers_series', 'size' => '30x3')) ?>
     </div>
-    </fieldset>
+  </fieldset>
+  <!-- End publisher's series area -->
 
-
+  <!-- Archival description area -->
   <fieldset class="collapsible collapsed">
-    <legend><?php echo __('1.7 Archival description area'); ?></legend>
+    <legend><?php echo __('archival description area'); ?></legend>
 
-   <div class="form-item">
-      <label for="Administrative history / biographical sketch"><?php echo 
__('Administrative history / biographical sketch'); ?></label>
     <div class="form-item">
-    </div>
-
-    <div class="form-item">
-      <label for="Archival history"><?php echo __('custodial history'); 
?></label>
-      <?php if (strlen($sourceCultureValue = 
$informationObject->getArchivalHistory(array('sourceCulture' => 'true'))) > 0 
&& $sf_user->getCulture() != $informationObject->getSourceCulture()): ?>
-      <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
+      <?php if ($creators): ?>
+      <?php foreach ($creators as $creator): ?>
+      <div class="form-item">
+      <label>
+        <?php $entityTypeId = $creator->getEntityTypeId() ?>
+        <?php if ($entityTypeId == QubitTerm::CORPORATE_BODY_ID): ?>
+          <?php echo __('administrative history').':' ?>
+        <?php elseif (($entityTypeId == QubitTerm::PERSON_ID) || 
($entityTypeId == QubitTerm::FAMILY_ID)): ?>
+          <?php echo __('biographical sketch').':' ?>
+        <?php else: ?>
+          <?php echo __('history').':' ?>
+        <?php endif; ?>
+        <?php echo $creator->getAuthorizedFormOfName(array('culturalFallback' 
=> 'true')) ?>
+      </label>
+      <table class="inline" style="margin: 0;">
+        <tr>
+          <td><?php echo nl2br($creator->getHistory(array('cultureFallback' => 
'true'))) ?></td>
+          <td style="width: 20px;"><?php echo link_to(image_tag('pencil', 
'align=top'), 
'actor/edit?id='.$creator->getId().'&informationObjectReroute='.$informationObject->getId())
 ?></td>
+        </tr>
+      </table>
+      </div>
+      <?php endforeach; ?>
       <?php endif; ?>
-       <?php echo object_textarea_tag($informationObject, 
'getArchivalHistory', array('size' => '30x3')) ?>
+  
+      <div class="form-item">
+        <label for="Archival history"><?php echo __('custodial history'); 
?></label>
+        <?php if (strlen($sourceCultureValue = 
$informationObject->getArchivalHistory(array('sourceCulture' => 'true'))) > 0 
&& $sf_user->getCulture() != $informationObject->getSourceCulture()): ?>
+        <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
+        <?php endif; ?>
+         <?php echo object_textarea_tag($informationObject, 
'getArchivalHistory', array('size' => '30x3')) ?>
+      </div>
+  
+      <div class="form-item">
+        <label for="scope_and_content"><?php echo __('scope and content'); 
?></label>
+        <?php if (strlen($sourceCultureValue = 
$informationObject->getScopeAndContent(array('sourceCulture' => 'true'))) > 0 
&& $sf_user->getCulture() != $informationObject->getSourceCulture()): ?>
+        <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
+        <?php endif; ?>
+        <?php echo object_textarea_tag($informationObject, 
'getScopeAndContent', array('size' => '30x3')) ?>
+      </div>
     </div>
-
-    <div class="form-item">
-      <label for="scope_and_content"><?php echo __('scope and content'); 
?></label>
-      <?php if (strlen($sourceCultureValue = 
$informationObject->getScopeAndContent(array('sourceCulture' => 'true'))) > 0 
&& $sf_user->getCulture() != $informationObject->getSourceCulture()): ?>
-      <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
-      <?php endif; ?>
-      <?php echo object_textarea_tag($informationObject, 'getScopeAndContent', 
array('size' => '30x3')) ?>
-    </div>
   </fieldset>
+  <!-- End archival description area -->
 
-
+  <!-- Notes area -->
   <fieldset class="collapsible collapsed">
-    <legend><?php echo __('1.8 Notes area'); ?></legend>
+    <legend><?php echo __('notes area'); ?></legend>
 
     <div class="form-item">
       <label for="physical_characteristics"><?php echo __('physical 
condition'); ?></label>
@@ -475,7 +512,15 @@
     </div>
 
     <div class="form-item">
-      <label for="related_units_of_description"><?php echo __('associated 
material, related groups of records in different fonds, related groups of 
records in the same fonds'); ?></label>
+      <label for="finding_aids"><?php echo __('finding aids'); ?></label>
+      <?php if (strlen($sourceCultureValue = 
$informationObject->getFindingAids(array('sourceCulture' => 'true'))) > 0 && 
$sf_user->getCulture() != $informationObject->getSourceCulture()): ?>
+      <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
+      <?php endif; ?>
+      <?php echo object_textarea_tag($informationObject, 'getFindingAids', 
array('size' => '30x3')) ?>
+    </div>
+
+    <div class="form-item">
+      <label for="related_units_of_description"><?php echo __('associated / 
related material'); ?></label>
       <?php if (strlen($sourceCultureValue = 
$informationObject->getRelatedUnitsOfDescription(array('sourceCulture' => 
'true'))) > 0 && $sf_user->getCulture() != 
$informationObject->getSourceCulture()): ?>
       <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
       <?php endif; ?>
@@ -513,22 +558,24 @@
         </tr>
       </table>
     </div>
-
   </fieldset>
-
+  <!-- End notes area -->
+  
+  <!-- Standard number area -->
   <fieldset class="collapsible collapsed">
-  <legend><?php echo __('1.9 Standard number area'); ?></legend>
+    <legend><?php echo __('standard number area'); ?></legend>
 
-   <div class="form-item">
+    <div class="form-item">
       <label for="statement of coordinates"><?php echo __('standard number'); 
?></label>
       <?php if (strlen($sourceCultureValue = 
$radStandardNumber->getSourceTextForTranslation($sf_user->getCulture()))): ?>
       <div class="default-translation"><?php echo nl2br($sourceCultureValue) 
?></div>
       <?php endif; ?>
       <?php echo object_input_tag($radStandardNumber, 'getValue', array('name' 
=> 'rad_standard_number', 'size' => 20)) ?>
-   </div>
-
+    </div>
   </fieldset>
+  <!-- End standard number area -->
 
+  <!-- Access Points -->
   <fieldset class="collapsible collapsed">
     <legend><?php echo __('access points'); ?></legend>
 
@@ -567,7 +614,9 @@
        <?php echo select_tag('name_id', options_for_select($nameSelectList, 
null, array('include_blank' => true)), array('class'=>'multiInstance')) ?>
     </div>
   </fieldset>
-
+  <!-- End Access Points-->
+  
+  <!-- Control Area -->
   <fieldset class="collapsible collapsed">
     <legend><?php echo __('control area'); ?></legend>
 
@@ -642,16 +691,21 @@
       <?php echo object_textarea_tag($informationObject, 'getSources', 
array('size' => '30x3')) ?>
     </div>
   </fieldset>
-
+  <!-- End Control Area -->
+  
+  <!-- Digital Object Area -->
   <fieldset class="collapsible collapsed">
     <legend><?php echo sfConfig::get('app_ui_label_digitalobject'); ?></legend>
     <?php include_component('digitalobject', 'edit', 
array('informationObject'=>$informationObject)); ?>
   </fieldset>
+  <!-- End Digital Object Area -->
 
+  <!-- Physical Object Area -->  
   <fieldset class="collapsible collapsed">
     <legend><?php echo sfConfig::get('app_ui_label_physicalobject'); 
?></legend>
     <?php include_component('physicalobject', 'edit', 
array('informationObject'=>$informationObject)); ?>
   </fieldset>
+  <!-- End Physical Object Area -->
 
   <?php if ($sf_context->getActionName() == 'create'): ?>
   <!--set initial form focus -->
@@ -661,42 +715,38 @@
   ) ?>
   <?php endif; ?>
 
+  <!-- include empty div at bottom of form to bump the fixed button-block and 
allow user to scroll past it -->
+  <div id="button-block-bump"></div>
 
-
-<!-- include empty div at bottom of form to bump the fixed button-block and 
allow user to scroll past it -->
-<div id="button-block-bump"></div>
-
-<div id="button-block">
-  <div class="menu-action">
-    <?php if ($informationObject->getId()): ?>
-
-    <?php if (($descendantCount = count($informationObject->getDescendants())) 
> 0): ?>
-         <?php $deleteWarning = __('Warning: this %1% has %2% descendants. If 
you proceed, these lower levels will also be deleted. Are you sure you want to 
delete this %1%?', array ('%1%' 
=>sfConfig::get('app_ui_label_informationobject'), '%2%' => $descendantCount)) 
?>
-         &nbsp;<?php echo link_to(__('delete'), 
'informationobject/delete?id='.$informationObject->getId(), 
'post=true&confirm='.$deleteWarning) ?>
+  <div id="button-block">
+    <div class="menu-action">
+      <?php if ($informationObject->getId()): ?>
+  
+      <?php if (($descendantCount = 
count($informationObject->getDescendants())) > 0): ?>
+           <?php $deleteWarning = __('Warning: this %1% has %2% descendants. 
If you proceed, these lower levels will also be deleted. Are you sure you want 
to delete this %1%?', array ('%1%' 
=>sfConfig::get('app_ui_label_informationobject'), '%2%' => $descendantCount)) 
?>
+           &nbsp;<?php echo link_to(__('delete'), 
'informationobject/delete?id='.$informationObject->getId(), 
'post=true&confirm='.$deleteWarning) ?>
+        <?php else: ?>
+        <?php $deleteWarning = __('Are you sure you want to delete this %1% 
permanently?', array('%1%' => 
sfConfig::get('app_ui_label_informationobject'))); ?>
+        <?php if ($digitalObjectCount > 0): ?>
+          <?php $deleteWarning .= ' '.__('This will also delete the related 
%1%.', array('%1%'=>sfConfig::get('app_ui_label_digitalobject'))); ?>
+        <?php endif; ?>
+        &nbsp;<?php echo link_to(__('delete'), 
'informationobject/delete?id='.$informationObject->getId(), 
'post=true&confirm='.$deleteWarning) ?>
+        <?php endif; ?>
+  
+         &nbsp;<?php echo link_to(__('cancel'), 
'informationobject/show?id='.$informationObject->getId()) ?>
       <?php else: ?>
-      <?php $deleteWarning = __('Are you sure you want to delete this %1% 
permanently?', array('%1%' => 
sfConfig::get('app_ui_label_informationobject'))); ?>
-      <?php if ($digitalObjectCount > 0): ?>
-        <?php $deleteWarning .= ' '.__('This will also delete the related 
%1%.', array('%1%'=>sfConfig::get('app_ui_label_digitalobject'))); ?>
+        &nbsp;<?php echo link_to(__('cancel'), 'informationobject/list') ?>
       <?php endif; ?>
-      &nbsp;<?php echo link_to(__('delete'), 
'informationobject/delete?id='.$informationObject->getId(), 
'post=true&confirm='.$deleteWarning) ?>
+  
+      <?php if ($informationObject->getId()): ?>
+        <?php echo my_submit_tag(__('save'), array('style' => 'width: auto;')) 
?>
+      <?php else: ?>
+        <?php echo my_submit_tag(__('create'), array('style' => 'width: 
auto;')) ?>
       <?php endif; ?>
-
-       &nbsp;<?php echo link_to(__('cancel'), 
'informationobject/show?id='.$informationObject->getId()) ?>
-    <?php else: ?>
-      &nbsp;<?php echo link_to(__('cancel'), 'informationobject/list') ?>
-    <?php endif; ?>
-
-    <?php if ($informationObject->getId()): ?>
-      <?php echo my_submit_tag(__('save'), array('style' => 'width: auto;')) ?>
-    <?php else: ?>
-      <?php echo my_submit_tag(__('create'), array('style' => 'width: auto;')) 
?>
-    <?php endif; ?>
+    </div>
+    <div class="menu-extra">
+      <?php echo link_to(__('add new archival description'), 
'informationobject/createRad'); ?>
+      <?php echo link_to(__('list all'), 'informationobject/list'); ?>
+    </div>
   </div>
-
-</form>
-
-<div class="menu-extra">
-  <?php echo link_to(__('add new archival description'), 
'informationobject/createRad'); ?>
-  <?php echo link_to(__('list all'), 'informationobject/list'); ?>
-</div>
-</div>
+</form>
\ No newline at end of file

Modified: 
trunk/qubit/apps/qubit/modules/informationobject/templates/showRadSuccess.php
===================================================================
--- 
trunk/qubit/apps/qubit/modules/informationobject/templates/showRadSuccess.php   
    2008-11-13 22:43:05 UTC (rev 1587)
+++ 
trunk/qubit/apps/qubit/modules/informationobject/templates/showRadSuccess.php   
    2008-11-13 23:52:37 UTC (rev 1588)
@@ -3,7 +3,7 @@
 <table class="detail">
 <tbody>
 
-<!-- 1.1 Title and statement of responsibility area -->
+<!-- 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());
@@ -81,9 +81,9 @@
     <td><?php echo QubitRad::getReferenceCode($informationObject) ?></td>
   </tr>
 <?php endif; ?>
-<!-- End 1.1 -->
+<!-- End title and statement of responsibility area -->
 
-<!-- 1.2 Edition area -->
+<!-- Edition area -->
 <?php if (strlen($value = 
$informationObject->getEdition(array('cultureFallback' => true))) > 0) : ?>
   <tr>
     <th><?php echo __('edition statement'); ?></th>
@@ -97,9 +97,9 @@
     <td><?php echo $value; ?></td>
   </tr>
 <?php endif; ?>
-<!-- End 1.2 -->
+<!-- End edition area -->
 
-<!-- 1.3 Class of material specific details area -->
+<!-- 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>
@@ -109,14 +109,14 @@
 
 <?php if (strlen($value = 
$radStatementOfProjection->getValue(array('cultureFallback' => true))) > 0) : ?>
   <tr>
-    <th><?php echo __('statement of projection'); ?></th>
+    <th><?php echo __('statement of projection (cartographic)'); ?></th>
     <td><?php echo $value; ?></td>
   </tr>
 <?php endif; ?>
 
 <?php if (strlen($value = 
$radStatementOfCoordinates->getValue(array('cultureFallback' => true))) > 0) : 
?>
   <tr>
-    <th><?php echo __('statement of coordinates'); ?></th>
+    <th><?php echo __('statement of coordinates (cartographic)'); ?></th>
     <td><?php echo $value; ?></td>
   </tr>
 <?php endif; ?>
@@ -130,13 +130,13 @@
 
 <?php if (strlen($value = 
$radIssuingJursidictionAndDenomination->getValue(array('cultureFallback' => 
true))) > 0) : ?>
   <tr>
-    <th><?php echo __('issuing jurisdiction and denomination'); ?></th>
+    <th><?php echo __('issuing jurisdiction and denomination (philatelic)'); 
?></th>
     <td><?php echo $value; ?></td>
   </tr>
 <?php endif; ?>
-<!-- End 1.3 -->
+<!-- End class of material specific details area -->
 
-<!-- 1.4 Dates of creation area -->
+<!-- Dates of creation area -->
 <?php if (count($informationObject->getDates()) > 0) : ?>
   <tr>
     <th><?php echo __('dates'); ?></th>
@@ -167,31 +167,38 @@
   <td><?php echo link_to($creator, 'actor/show?id='.$creator->getId()); ?>
     <?php if ($existence = 
$creator->getDatesOfExistence(array('cultureFallback' => true))) echo ' 
('.$existence.')'; ?>
   <?php if ($history = $creator->getHistory(array('cultureFallback' => 
true))): ?>
-    <table class="detail" style="margin-top: 5px;"><tr><th style="text-align: 
left; padding: 1px;">
-    <?php if ($creator->getEntityTypeId() == QubitTerm::CORPORATE_BODY_ID): ?>
-      <?php echo __('Administrative').' ' ?>
-    <?php else: ?>
-      <?php echo __('Biographic').' ' ?>
-    <?php endif; ?>
-      <?php echo __('history') ?></th></tr>
+    <table class="detail" style="margin-top: 5px;">
+      <tr><th style="text-align: left; padding: 1px;">
+        <?php $entityTypeId = $creator->getEntityTypeId() ?>
+        <?php switch ($entityTypeId) {
+          case QubitTerm::CORPORATE_BODY_ID:
+            echo __('administrative history');
+            break;
+          case QubitTerm::PERSON_ID:
+          case QubitTerm::FAMILY_ID:
+            echo __('biographical sketch');
+            break;
+          default:
+            echo __('history');
+        } ?></th></tr>
       <tr><td><?php echo nl2br($history); ?></td></tr>
     </table>
   <?php endif; ?>
   </td>
   </tr>
 <?php endforeach; ?>
-<!-- End 1.4 -->
+<!-- End dates of creation area -->
 
-<!-- 1.5 Physical description area -->
+<!-- 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>
+    <th><?php echo __('physical description'); ?></th>
     <td><?php echo nl2br($value); ?></td>
   </tr>
 <?php endif; ?>
-<!-- End 1.5 -->
+<!-- End physical description area -->
 
-<!-- 1.6 Publisher's series area -->
+<!-- Publisher's series area -->
 <?php if (strlen($value = 
$radTitleProperOfPublishersSeries->getValue(array('cultureFallback' => true))) 
> 0) : ?>
   <tr>
     <th><?php echo __('title proper of publisher\'s series'); ?></th>
@@ -233,9 +240,9 @@
     <td><?php echo $value; ?></td>
   </tr>
 <?php endif; ?>
-<!-- End 1.6 -->
+<!-- End publisher's series area -->
 
-<!-- 1.7 Archival description area -->
+<!-- Archival description area -->
 <?php if (strlen($value = 
$informationObject->getArchivalHistory(array('cultureFallback' => true))) > 0) 
: ?>
   <tr>
     <th><?php echo __('custodial history'); ?></th>
@@ -249,9 +256,9 @@
     <td><?php echo nl2br($value); ?></td>
   </tr>
 <?php endif; ?>
-<!-- End 1.7 -->
+<!-- End archival description area -->
 
-<!-- 1.8 Archival description area -->
+<!-- Notes area -->
 <?php if (strlen($value = 
$informationObject->getPhysicalCharacteristics(array('cultureFallback' => 
true))) > 0) : ?>
 <tr>
   <th><?php echo __('physical condition'); ?></th>
@@ -282,43 +289,38 @@
 
 <?php if (count($languageCodes) > 0) : ?>
 <tr>
-<th><?php echo __('language of material'); ?></th>
-<td>
-      <?php foreach ($languageCodes as $languageCode): ?>
-    <?php echo 
format_language($languageCode->getValue(array('sourceCulture'=>true))); ?><br />
-  <?php endforeach; ?>
-</td></tr>
+  <th><?php echo __('language of material'); ?></th>
+  <td>
+        <?php foreach ($languageCodes as $languageCode): ?>
+      <?php echo 
format_language($languageCode->getValue(array('sourceCulture'=>true))); ?><br />
+    <?php endforeach; ?>
+  </td>
+</tr>
 <?php endif; ?>
 
 <?php if (count($scriptCodes) > 0) : ?>
-<tr>
-<th><?php echo __('script of material'); ?></th>
-<td>
+  <tr>
+    <th><?php echo __('script of material'); ?></th>
+    <td>
       <?php foreach ($scriptCodes as $scriptCode): ?>
-    <?php echo 
format_script($scriptCode->getValue(array('sourceCulture'=>true))); ?><br />
-  <?php endforeach; ?>
-</td></tr>
+      <?php echo 
format_script($scriptCode->getValue(array('sourceCulture'=>true))); ?><br />
+      <?php endforeach; ?>
+    </td>
+  </tr>
 <?php endif; ?>
 
-<?php if (strlen($value = 
$informationObject->getFindingAids(array('cultureFallback' => true))) > 0) : ?>
-<tr>
-<th><?php echo __('finding aids'); ?></th>
-<td><?php echo nl2br($value); ?></td>
-</tr>
-<?php endif; ?>
-
 <?php if (strlen($value = 
$informationObject->getLocationOfOriginals(array('cultureFallback' => true))) > 
0) : ?>
-<tr>
-<th><?php echo __('location of originals'); ?></th>
-<td><?php echo nl2br($value); ?></td>
-</tr>
+  <tr>
+    <th><?php echo __('location of originals'); ?></th>
+    <td><?php echo nl2br($value); ?></td>
+  </tr>
 <?php endif; ?>
 
 <?php if (strlen($value = 
$informationObject->getLocationOfCopies(array('cultureFallback' => true))) > 0) 
: ?>
-<tr>
-<th><?php echo __('availability of other formats'); ?></th>
-<td><?php echo nl2br($value); ?></td>
-</tr>
+  <tr>
+    <th><?php echo __('availability of other formats'); ?></th>
+    <td><?php echo nl2br($value); ?></td>
+  </tr>
 <?php endif; ?>
 
 <?php if (strlen($value = 
$informationObject->getAccessConditions(array('cultureFallback' => true))) > 0) 
: ?>
@@ -335,9 +337,16 @@
   </tr>
 <?php endif; ?>
 
+<?php if (strlen($value = 
$informationObject->getFindingAids(array('cultureFallback' => true))) > 0) : ?>
+  <tr>
+    <th><?php echo __('finding aids'); ?></th>
+    <td><?php echo nl2br($value); ?></td>
+  </tr>
+<?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>
+    <th><?php echo __('associated / related material'); ?></th>
     <td><?php echo nl2br($value); ?></td>
   </tr>
 <?php endif; ?>
@@ -359,18 +368,18 @@
     </td>
   </tr>
 <?php endif; ?>
-<!-- End 1.8 -->
+<!-- End notes area -->
 
-<!-- 1.9 Standard number area -->
+<!-- Standard number area -->
 <?php if (strlen($value = $radStandardNumber->getValue(array('cultureFallback' 
=> true))) > 0) : ?>
   <tr>
     <th><?php echo __('standard number'); ?></th>
     <td><?php echo $value; ?></td>
   </tr>
 <?php endif; ?>
-<!-- End 1.9 -->
+<!-- End standard number area -->
 
-<!-- Access Points-->
+<!-- Access Points -->
 <?php if (count($subjectAccessPoints) > 0) : ?>
   <tr>
     <th><?php echo __('subject access points'); ?></th>


--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---

Reply via email to