Author: david
Date: Thu Oct 27 17:16:35 2011
New Revision: 10223

Log:
Show all contact information

Modified:
   trunk/apps/qubit/modules/contactinformation/templates/_edit.php
   trunk/lib/model/QubitContactInformation.php

Modified: trunk/apps/qubit/modules/contactinformation/templates/_edit.php
==============================================================================
--- trunk/apps/qubit/modules/contactinformation/templates/_edit.php     Thu Oct 
27 17:15:45 2011        (r10222)
+++ trunk/apps/qubit/modules/contactinformation/templates/_edit.php     Thu Oct 
27 17:16:35 2011        (r10223)
@@ -18,7 +18,7 @@
     </caption><thead>
       <tr>
         <th style="width: 60%">
-          <?php echo __('Contact person') ?>
+          <?php echo __('Contact information') ?>
         </th><th style="width: 15%">
           <?php echo __('Primary') ?>
         </th><th style="text-align: center; width: 10%">
@@ -29,7 +29,7 @@
       <?php foreach ($resource->contactInformations as $item): ?>
         <tr class="<?php echo 0 == @++$row % 2 ? 'even' : 'odd' ?> 
related_obj_<?php echo $item->id ?>" id="<?php echo url_for(array($item, 
'module' => 'contactinformation')) ?>">
           <td>
-            <?php echo $item->contactPerson ?>
+            <?php echo $item->getContactInformationString() ?>
           </td><td>
             <input type="checkbox"<?php echo $item->primaryContact ? " 
checked=\"checked\"" : "" ?> disabled="disabled" />
           </td><td style="text-align: center">

Modified: trunk/lib/model/QubitContactInformation.php
==============================================================================
--- trunk/lib/model/QubitContactInformation.php Thu Oct 27 17:15:45 2011        
(r10222)
+++ trunk/lib/model/QubitContactInformation.php Thu Oct 27 17:16:35 2011        
(r10223)
@@ -52,7 +52,7 @@
     $string .= ($this->getRegion()) ? ', '.$this->getRegion() : '';
     $string .= ($this->getCountryCode()) ? '<br/>'.$this->getCountryCode().'' 
: '';
     $string .= ($this->getPostalCode()) ? '   '.$this->getPostalCode(): '';
-    $string .= ($this->getTelephone()) ? '<p> telephone number: 
'.$this->getTelephone().'<br/>' : '';
+    $string .= ($this->getTelephone()) ? '<p>telephone number: 
'.$this->getTelephone().'<br/>' : '';
     $string .= ($this->getFax()) ? 'fax number: '.$this->getFax().'<br/>' : '';
     $string .= ($this->getEmail()) ? 'email: '.$this->getEmail().'<br/>' : '';
     $string .= ($this->getWebsite()) ? 'website: <a 
href="'.$this->getWebsite().'">'.$this->getWebsite().'</a>' : '';

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

Reply via email to