Author: jablko
Date: Fri Oct 22 16:30:57 2010
New Revision: 8390
Log:
Rollback commit 8015, fixes issue 1815
Modified:
trunk/apps/qubit/modules/search/actions/descriptionUpdatesAction.class.php
(props changed)
trunk/apps/qubit/modules/search/templates/descriptionUpdatesSuccess.php
(props changed)
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/indexSuccess.php
Modified:
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/indexSuccess.php
==============================================================================
---
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/indexSuccess.php
Fri Oct 22 16:19:28 2010 (r8389)
+++
trunk/plugins/sfIsaarPlugin/modules/sfIsaarPlugin/templates/indexSuccess.php
Fri Oct 22 16:30:57 2010 (r8390)
@@ -71,75 +71,28 @@
<?php $relatedActor = $item->getOpposedObject($resource->id) ?>
<div class="field">
<h3><?php echo __('Related entity') ?></h3>
-
<div>
- <table class="inline" style="margin-bottom: 5px;">
+ <?php echo link_to($relatedActor, array($relatedActor, 'module' =>
'actor')) ?><?php if (isset($relatedActor->datesOfExistence)): ?> <span
class="note2">(<?php echo
render_value($relatedActor->getDatesOfExistence(array('cultureFallback' =>
true))) ?>)</span><?php endif; ?>
- <tr>
- <th style="text-align: left; padding: 1px;">
- <?php echo __('Authorized form of name') ?>
- </th>
- </tr><tr>
- <td>
- <?php echo link_to($relatedActor, array($relatedActor, 'module' =>
'actor')) ?><?php if (isset($relatedActor->datesOfExistence)): ?> <span
class="note2">(<?php echo
render_value($relatedActor->getDatesOfExistence(array('cultureFallback' =>
true))) ?>)</span><?php endif; ?>
- </td>
- </tr>
-
- <?php if (isset($relatedActor->descriptionIdentifier)): ?>
- <tr>
- <th style="text-align: left; padding: 1px;">
- <?php echo __('Identifier of the related entity') ?>
- </th>
- </tr><tr>
- <td>
- <?php echo render_value($relatedActor->descriptionIdentifier) ?>
- </td>
- </tr>
- <?php endif; ?>
+ <?php echo render_show(__('Identifier of the related entity'),
render_value($relatedActor->descriptionIdentifier)) ?>
- <?php if (isset($item->type)): ?>
- <tr>
- <th style="text-align: left; padding: 1px;">
- <?php echo __('Category of the relationship') ?>
- </th>
- </tr><tr>
- <td>
- <?php echo render_value($item->type) ?>
- </td>
- </tr>
- <?php endif; ?>
+ <?php echo render_show(__('Category of the relationship'),
render_value($item->type)) ?>
- <?php if ((null !== $dateDisplayNote =
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID)) || 0 <
count($dateArray = $item->getDates())): ?>
- <tr>
- <th style="text-align: left; padding: 1px;">
- <?php echo __('Dates of the relationship') ?>
- </th>
- </tr><tr>
- <td>
- <?php if (null !== $dateDisplayNote && 0 < strlen($dateDisplay =
$dateDisplayNote->getContent(array('cultureFallback' => true)))): ?>
- <?php echo render_value($dateDisplay) ?>
- <?php elseif (1 < count($dateArray = $item->getDates())): ?>
- <?php echo __('%1% - %2%', array('%1%' =>
Qubit::renderDate($dateArray['start']), '%2%' =>
Qubit::renderDate($dateArray['end']))) ?>
- <?php else: ?>
- <?php echo Qubit::renderDate(array_shift($dateArray)) ?>
- <?php endif; ?>
- </td>
- </tr>
- <?php endif; ?>
+ <div class="field">
+ <h3><?php echo __('Dates of the relationship') ?></h3>
+ <div>
+ <?php if (null !== $note =
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DATE_DISPLAY_ID)): ?>
+ <?php echo render_value($note->getContent(array('cultureFallback'
=> true))) ?>
+ <?php elseif (1 < count($dateArray = $item->getDates())): ?>
+ <?php echo __('%1% - %2%', array('%1%' =>
Qubit::renderDate($dateArray['start']), '%2%' =>
Qubit::renderDate($dateArray['end']))) ?>
+ <?php else: ?>
+ <?php echo Qubit::renderDate(array_shift($dateArray)) ?>
+ <?php endif; ?>
+ </div>
+ </div>
- <?php if (null !== $descriptionOfRelationship =
$item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID)): ?>
- <tr>
- <th style="text-align: left; padding: 1px;">
- <?php echo __('Description of relationship') ?>
- </th>
- </tr><tr>
- <td>
- <?php echo
render_value($descriptionOfRelationship->getContent(array('cultureFallback' =>
true))) ?>
- </td>
- </tr>
- <?php endif; ?>
+ <?php echo render_show(__('Description of relationship'),
render_value($item->getNoteByTypeId(QubitTerm::RELATION_NOTE_DESCRIPTION_ID)))
?>
- </table>
</div>
</div>
<?php endforeach; ?>
--
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.
