Fix winter address 2, display all phone numbers

diff --git a/glm-member-db-contacts/views/front/contacts/list.html b/glm-member-db-contacts/views/front/contacts/list.html
index e341142..dc788c6 100644 (file)
--- a/glm-member-db-contacts/views/front/contacts/list.html
+++ b/glm-member-db-contacts/views/front/contacts/list.html
@@ -88,7 +88,12 @@ and open the template in the editor.
                                     <span class="list-field-value">{apply_filters('glm_custom_fields', 'cottage', $contact.id)}</span>
                                 </div>
                                 {/if}
-                                {if $contact.addr1 || $contact.addr2 || $contact.city.name || $contact.state.name || $contact.zip}
+                                {if $contact.addr1 
+                                    || $contact.addr2 
+                                    || $contact.city.name 
+                                    || $contact.state.name 
+                                    || $contact.zip
+                                }
                                 <div class="list-field-summer-address">
                                     <span class="list-field-key">Summer Address:</span><br>
                                     {if $contact.addr1}<span class="glm-contact-info-address1">{$contact.addr1}</span><br>{/if}
@@ -98,8 +103,29 @@ and open the template in the editor.
                                     {if $contact.zip}<span class="glm-contact-info-zip">{$contact.zip}</span>{/if}
                                 </div>
                                 {/if}
-                                {if $contact.office_phone}<span class="glm-contact-info-phone"><b>Summer Phone:&nbsp;</b>{$contact.office_phone}</span>{/if}
-                                {if $contact.fax}<span class="glm-contact-info-fax">{$contact.fax}</span>{/if}
+                                {if $contact.office_phone 
+                                    || $contact.home_phone 
+                                    || $contact.mobile_phone 
+                                    || $contact.alternate_phone 
+                                    || $contact.fax
+                                }
+                                    <span class="glm-contact-info-phone list-field-key">Summer Phone:</span><br>
+                                    {if $contact.office_phone}
+                                        <span class="list-field-value">office: {$contact.office_phone}</span><br>
+                                    {/if}
+                                    {if $contact.home_phone}
+                                        <span class="list-field-value">home: {$contact.home_phone}</span><br>
+                                    {/if}
+                                    {if $contact.mobile_phone}
+                                        <span class="list-field-value">mobile: {$contact.mobile_phone}</span><br>
+                                    {/if}
+                                    {if $contact.alternate_phone}
+                                        <span class="list-field-value">alternate: {$contact.alternate_phone}</span><br>
+                                    {/if}
+                                    {if $contact.fax}
+                                        <span class="glm-contact-info-fax list-field-value">fax: {$contact.fax}</span><br>
+                                    {/if}
+                                {/if}
                                 {if apply_filters('glm_custom_fields', 'winter address', $contact.id) 
                                     || apply_filters('glm_custom_fields', 'winter address 2', $contact.id)
                                     || apply_filters('glm_custom_fields', 'winter city', $contact.id)
@@ -112,7 +138,7 @@ and open the template in the editor.
                                         <span class="list-field-value">{apply_filters('glm_custom_fields', 'winter address', $contact.id)}</span><br>
                                     {/if}
                                     {if apply_filters('glm_custom_fields', 'winter address 2', $contact.id)}
-                                        <span class="list-field-value">{apply_filters('glm_custom_fields', 'winter address', $contact.id)}</span><br>
+                                        <span class="list-field-value">{apply_filters('glm_custom_fields', 'winter address 2', $contact.id)}</span><br>
                                     {/if}
                                     {if apply_filters('glm_custom_fields', 'winter city', $contact.id)}
                                         <span class="list-field-value">{apply_filters('glm_custom_fields', 'winter city', $contact.id)},</span>
@@ -126,14 +152,23 @@ and open the template in the editor.
                                 </div>
                                 {/if}
                                 {if apply_filters('glm_custom_fields', 'winter phone', $contact.id)}
-                                    <span class="list-field-key">Winter Phone: </span>
+                                    <span class="list-field-key">Winter Phone: </span><br>
                                     <span class="list-field-value">{apply_filters('glm_custom_fields', 'winter phone', $contact.id)}</span>
                                 {/if}
                                 
-                                {if $contact.email}<div class="glm-contact-info-email list-field-key">Email: <a href="mailto:{$contact.email}" target="_top">{$contact.email}</a></div>{/if}
+                                {if $contact.email}
+                                <div class="glm-contact-info-email">
+                                    <span class="list-field-key">Email:&nbsp;</span>
+                                    <a class="list-field-value" href="mailto:{$contact.email}" target="_top">
+                                        {$contact.email}
+                                    </a>
+                                </div>
+                                {/if}
                                 {if apply_filters('glm_custom_fields', 'email 2', $contact.id)}
                                     <span class="list-field-key">Email 2: </span>
-                                    <span class="list-field-value">{apply_filters('glm_custom_fields', 'email 2', $contact.id)}</span>
+                                    <a class="list-field-value" href="mailto:{apply_filters('glm_custom_fields', 'email 2', $contact.id)}" target="_top">
+                                        {apply_filters('glm_custom_fields', 'email 2', $contact.id)}
+                                    </a>
                                 {/if}
                                 
                             </div>