Author: sevein
Date: Wed Sep 21 16:40:18 2011
New Revision: 9784
Log:
Move contactInformation component to contactinformation module and some
cleanups!
Added:
trunk/apps/qubit/modules/contactinformation/templates/_contactInformation.php
- copied, changed from r9775,
trunk/apps/qubit/modules/actor/templates/_contactInformation.php
Deleted:
trunk/apps/qubit/modules/actor/templates/_contactInformation.php
Modified:
trunk/apps/qubit/modules/rightsholder/templates/indexSuccess.php
trunk/plugins/qtAccessionPlugin/modules/donor/templates/indexSuccess.php
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
Copied and modified:
trunk/apps/qubit/modules/contactinformation/templates/_contactInformation.php
(from r9775, trunk/apps/qubit/modules/actor/templates/_contactInformation.php)
==============================================================================
--- trunk/apps/qubit/modules/actor/templates/_contactInformation.php Wed Sep
21 11:19:59 2011 (r9775, copy source)
+++
trunk/apps/qubit/modules/contactinformation/templates/_contactInformation.php
Wed Sep 21 16:40:18 2011 (r9784)
@@ -1,74 +1,92 @@
-<div class="agent">
- <?php echo render_value($contactInformation->contactPerson) ?>
-</div>
+<div class="field">
-<div class="adr">
+ <h3><?php echo __('Contact information') ?></h3>
- <div class="field">
- <h3><?php echo __('Street address') ?></h3>
- <div class="street-address">
- <?php echo render_value($contactInformation->streetAddress) ?>
- </div>
- </div>
+ <div class="vcard">
- <div class="field">
- <h3><?php echo __('Locality') ?></h3>
- <div class="locality">
- <?php echo
render_value($contactInformation->getCity(array('cultureFallback' => true))) ?>
- </div>
- </div>
+ <h3><?php echo $contactInformation->getContactType(array('cultureFallback'
=> true)) ?><?php if ($contactInformation->primaryContact): ?> (<?php echo
__('Primary contact') ?>)<?php endif; ?></h3>
- <div class="field">
- <h3><?php echo __('Region') ?></h3>
- <div class="region">
- <?php echo
render_value($contactInformation->getRegion(array('cultureFallback' => true)))
?>
+ <div class="agent">
+ <?php echo render_value($contactInformation->contactPerson) ?>
</div>
- </div>
- <div class="field">
- <h3><?php echo __('Country name') ?></h3>
- <div class="country-name">
- <?php echo format_country($contactInformation->countryCode) ?>
+ <div class="field adr">
+
+ <h3><?php echo __('Address') ?></h3>
+
+ <div>
+
+ <div class="field">
+ <h3><?php echo __('Street address') ?></h3>
+ <div class="street-address">
+ <?php echo render_value($contactInformation->streetAddress) ?>
+ </div>
+ </div>
+
+ <div class="field">
+ <h3><?php echo __('Locality') ?></h3>
+ <div class="locality">
+ <?php echo
render_value($contactInformation->getCity(array('cultureFallback' => true))) ?>
+ </div>
+ </div>
+
+ <div class="field">
+ <h3><?php echo __('Region') ?></h3>
+ <div class="region">
+ <?php echo
render_value($contactInformation->getRegion(array('cultureFallback' => true)))
?>
+ </div>
+ </div>
+
+ <div class="field">
+ <h3><?php echo __('Country name') ?></h3>
+ <div class="country-name">
+ <?php echo format_country($contactInformation->countryCode) ?>
+ </div>
+ </div>
+
+ <div class="field">
+ <h3><?php echo __('Postal code') ?></h3>
+ <div class="postal-code">
+ <?php echo render_value($contactInformation->postalCode) ?>
+ </div>
+ </div>
+
+ </div>
+
</div>
- </div>
- <div class="field">
- <h3><?php echo __('Postal code') ?></h3>
- <div class="postal-code">
- <?php echo render_value($contactInformation->postalCode) ?>
+ <div class="field">
+ <h3><?php echo __('Telephone') ?></h3>
+ <div class="tel">
+ <?php echo render_value($contactInformation->telephone) ?>
+ </div>
</div>
- </div>
-</div>
+ <div class="field tel">
+ <h3 class="type"><?php echo __('Fax') ?></h3>
+ <div>
+ <?php echo render_value($contactInformation->fax) ?>
+ </div>
+ </div>
-<div class="field">
- <h3><?php echo __('Telephone') ?></h3>
- <div class="tel">
- <?php echo render_value($contactInformation->telephone) ?>
- </div>
-</div>
+ <div class="field">
+ <h3><?php echo __('Email') ?></h3>
+ <div class="email">
+ <?php echo render_value($contactInformation->email) ?>
+ </div>
+ </div>
-<div class="field tel">
- <h3 class="type"><?php echo __('Fax') ?></h3>
- <div>
- <?php echo render_value($contactInformation->fax) ?>
- </div>
-</div>
+ <div class="field">
+ <h3><?php echo __('URL') ?></h3>
+ <div class="url">
+ <?php echo render_value($contactInformation->website) ?>
+ </div>
+ </div>
-<div class="field">
- <h3><?php echo __('Email') ?></h3>
- <div class="email">
- <?php echo render_value($contactInformation->email) ?>
- </div>
-</div>
+ <div class="note">
+ <?php echo
render_value($contactInformation->getNote(array('cultureFallback' => true))) ?>
+ </div>
-<div class="field">
- <h3><?php echo __('URL') ?></h3>
- <div class="url">
- <?php echo render_value($contactInformation->website) ?>
</div>
-</div>
-<div class="note">
- <?php echo render_value($contactInformation->getNote(array('cultureFallback'
=> true))) ?>
</div>
Modified: trunk/apps/qubit/modules/rightsholder/templates/indexSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/rightsholder/templates/indexSuccess.php Wed Sep
21 16:16:20 2011 (r9783)
+++ trunk/apps/qubit/modules/rightsholder/templates/indexSuccess.php Wed Sep
21 16:40:18 2011 (r9784)
@@ -19,16 +19,7 @@
<h2><?php echo __('Contact area') ?></h2>
<?php foreach ($resource->contactInformations as $contactItem): ?>
- <div class="field">
- <h3><?php echo __('Contact information') ?></h3>
- <div class="vcard">
-
- <h3><?php echo $contactItem->getContactType(array('cultureFallback' =>
true)) ?><?php if ($contactItem->primaryContact): ?> (<?php echo __('Primary
contact') ?>)<?php endif; ?></h3>
-
- <?php echo get_partial('actor/contactInformation',
array('contactInformation' => $contactItem)) ?>
-
- </div>
- </div>
+ <?php echo get_partial('contactinformation/contactInformation',
array('contactInformation' => $contactItem)) ?>
<?php endforeach; ?>
</div> <!-- /.section#contactArea -->
Modified:
trunk/plugins/qtAccessionPlugin/modules/donor/templates/indexSuccess.php
==============================================================================
--- trunk/plugins/qtAccessionPlugin/modules/donor/templates/indexSuccess.php
Wed Sep 21 16:16:20 2011 (r9783)
+++ trunk/plugins/qtAccessionPlugin/modules/donor/templates/indexSuccess.php
Wed Sep 21 16:40:18 2011 (r9784)
@@ -19,16 +19,7 @@
<h2><?php echo __('Contact area') ?></h2>
<?php foreach ($resource->contactInformations as $contactItem): ?>
- <div class="field">
- <h3><?php echo __('Contact information') ?></h3>
- <div class="vcard">
-
- <h3><?php echo $contactItem->getContactType(array('cultureFallback' =>
true)) ?><?php if ($contactItem->primaryContact): ?> (<?php echo __('Primary
contact') ?>)<?php endif; ?></h3>
-
- <?php echo get_partial('actor/contactInformation',
array('contactInformation' => $contactItem)) ?>
-
- </div>
- </div>
+ <?php echo get_partial('contactinformation/contactInformation',
array('contactInformation' => $contactItem)) ?>
<?php endforeach; ?>
</div> <!-- /.section#contactArea -->
Modified:
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
==============================================================================
---
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
Wed Sep 21 16:16:20 2011 (r9783)
+++
trunk/plugins/sfIsdiahPlugin/modules/sfIsdiahPlugin/templates/indexSuccess.php
Wed Sep 21 16:40:18 2011 (r9784)
@@ -53,16 +53,7 @@
<?php echo link_to_if(SecurityPriviliges::editCredentials($sf_user,
'repository'), '<h2>'.__('Contact area').'</h2>', array($resource, 'module' =>
'repository', 'action' => 'edit'), array('anchor' => 'contactArea', 'title' =>
__('Edit contact area'))) ?>
<?php foreach ($resource->contactInformations as $contactItem): ?>
- <div class="field">
- <h3><?php echo __('Contact information') ?></h3>
- <div class="vcard">
-
- <h3><?php echo $contactItem->getContactType(array('cultureFallback' =>
true)) ?><?php if ($contactItem->primaryContact): ?> (<?php echo __('Primary
contact') ?>)<?php endif; ?></h3>
-
- <?php echo get_partial('actor/contactInformation',
array('contactInformation' => $contactItem)) ?>
-
- </div>
- </div>
+ <?php echo get_partial('contactinformation/contactInformation',
array('contactInformation' => $contactItem)) ?>
<?php endforeach; ?>
</div> <!-- /.section#contactArea -->
--
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.
