markup adjustments to contact list

Cottage #-sign added. Summer/winter address more selective about
whether to show up (will now even if only state is filled in, for
example). Fixed some br tag placement

diff --git a/glm-member-db-contacts/views/front/contacts/list.html b/glm-member-db-contacts/views/front/contacts/list.html
index 1e4a9e6..e341142 100644 (file)
--- a/glm-member-db-contacts/views/front/contacts/list.html
+++ b/glm-member-db-contacts/views/front/contacts/list.html
@@ -84,10 +84,11 @@ and open the template in the editor.
                                 
                                 {if apply_filters('glm_custom_fields', 'cottage', $contact.id)}
                                 <div class="glm-row field-container">
-                                    <span class="list-field-key">Cottage:&nbsp;</span>
+                                    <span class="list-field-key">Cottage #:&nbsp;</span>
                                     <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}
                                 <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}
@@ -95,14 +96,21 @@ and open the template in the editor.
                                     {if $contact.city.name}<span class="glm-contact-info-city">{$contact.city.name},</span>{/if}
                                     {if $contact.state.name}<span class="glm-contact-info-state">{$contact.state.name}</span>{/if}
                                     {if $contact.zip}<span class="glm-contact-info-zip">{$contact.zip}</span>{/if}
-                                    {if $contact.office_phone}<br><span class="glm-contact-info-phone"><b>Summer Phone:&nbsp;</b>{$contact.office_phone}</span>{/if}
-                                    {if $contact.fax}<div class="glm-contact-info-fax">{$contact.fax}</div>{/if}
                                 </div>
-                                
-                                {if apply_filters('glm_custom_fields', 'winter address', $contact.id)}
+                                {/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 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)
+                                    || apply_filters('glm_custom_fields', 'winter state', $contact.id)
+                                    || apply_filters('glm_custom_fields', 'winter zip', $contact.id)
+                                }
                                 <div class="list-field-winter-address">
                                     <span class="list-field-key">Winter Address:&nbsp;</span><br>
-                                    <span class="list-field-value">{apply_filters('glm_custom_fields', 'winter address', $contact.id)}</span><br>
+                                    {if apply_filters('glm_custom_fields', 'winter address', $contact.id)}
+                                        <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>
                                     {/if}