Fixed display of top fields in contact list view

diff --git a/glm-member-db-contacts/views/front/contacts/list.html b/glm-member-db-contacts/views/front/contacts/list.html
index 19bb22b..40b2acf 100644 (file)
--- a/glm-member-db-contacts/views/front/contacts/list.html
+++ b/glm-member-db-contacts/views/front/contacts/list.html
@@ -92,7 +92,6 @@ and open the template in the editor.
                                     <div class="small-12 medium-6 columns">
                                         {if $contact.primary_contact.value == true}
 
-                                            {if $contact.title}<div class="glm-contact-info-title">{$contact.title}</div>{/if}
                                             {if $contacts_with_subs !== false}
                                                 {foreach $contacts_with_subs as $contact_with_subs}
                                                     <!-- Check whether the current contact ID is one of the parent elements -->
@@ -127,20 +126,29 @@ and open the template in the editor.
                                     </div>
                                     <div class="small-12 medium-6 columns">
                                         {$phone = apply_filters( 'glm_custom_fields', 'Phone on Website', $contact.id )}
-                                        {if $phone}<div class="glm-contact-info-work-phone"><span class="field-title">Phone: </span>{$phone}</div>{/if}
+                                        {if $phone}<div class="glm-contact-info-work-phone"><span class="field-title">Phone </span>{$phone}</div>{/if}
                                         {$fax = apply_filters( 'glm_custom_fields', 'Fax on Website', $contact.id )}
-                                        {if $fax}<div class="glm-contact-info-fax"><span class="field-title">Fax: </span>{$fax}</div>{/if}
+                                        {if $fax}<div class="glm-contact-info-fax"><span class="field-title">Fax </span>{$fax}</div>{/if}
                                         {$email = apply_filters( 'glm_custom_fields', 'Email on Website', $contact.id )}
 
-                                        {if $email}<div class="glm-contact-info-email">Email: <a href="mailto:{$email}" target="_top">{$email}</a></div>{/if}
-                                        {if $contact.alt_email}<div class="glm-contact-info-alt-email"><span class="field-title">Alt Email: </span><a href="mailto:{$contact.alt_email}" target="_top">{$contact.alt_email}</a></div>{/if}
-                                        {if $contact.url}<div class="glm-contact-info-url"><span class="field-title">Website: </span></span><a href="{$contact.url}" target="_top">{$contact.url}</a></div>{/if}
+                                        {if $email}<div class="glm-contact-info-email">Email <a href="mailto:{$email}" target="_top">{$email}</a></div>{/if}
+                                        {if $contact.alt_email}<div class="glm-contact-info-alt-email"><span class="field-title">Alt Email </span><a href="mailto:{$contact.alt_email}" target="_top">{$contact.alt_email}</a></div>{/if}
+                                        {if $contact.url}<div class="glm-contact-info-url"><span class="field-title">Website </span></span><a href="{$contact.url}" target="_top">{$contact.url}</a></div>{/if}
                                     </div>
                                     <div class="small-12 columns">
-                                        {$company = apply_filters( 'glm_custom_fields', 'Company Name', $contact.id )}
-                                        {if $company}<div class="glm-contact-info-org"><span class="field-title">Company Name: </span>{$company}</div>{/if}a
-                                        {$position = apply_filters( 'glm_custom_fields', 'Company Position', $contact.id )}
-                                        {if $position}<div class="glm-contact-info-descr"><span class="field-title">Company Position: </span>{$position}</div>{/if}
+                                        
+                                        {if $contact.org
+                                        }<div class="glm-contact-info-org">
+                                            <span class="field-title">Company Name </span>
+                                            <span class="field-value">{$contact.org}</span>
+                                        </div>
+                                        {/if}
+                                        {if $contact.title}
+                                        <div class="glm-contact-info-descr">
+                                            <span class="field-title">Company Position </span>
+                                            <span class="field-value">{$contact.title}</span>
+                                        </div>
+                                        {/if}
                                     </div>
                                 </div>
                             </div>
@@ -275,7 +283,7 @@ and open the template in the editor.
                         {/if}
                         {if $contact.business_publish.value == true}
                                 <div class="organization-info section-container">
-                                    <h3 class="section-title">Organization/Company Information</h3>
+                                    <h3 class="section-title">Organization / Company Information</h3>
                                     <div class="section-data">
                                         {if $contact.org}
                                         <div class="section-field">
@@ -432,26 +440,20 @@ and open the template in the editor.
 
                         {/if}
                                 <div class="custom-info section-container">
-                                    <h3 class="section-title">
-                                        {apply_filters('get_glm_custom_field_tab_name', 'Custom Fields')}
-                                    </h3>
+                                    <h3 class="section-title">{ get_option("glm_field_contact_tab_name")'}></h3>
                                     <div class="section-data">
-                                        {$customFieldGroups = apply_filters('get_glm_custom_grouped_fields','glm-member-db-contacts',$contact.id)}
-
-                                        {if $customFieldGroups}
-                                            {foreach  $customFieldGroups as $customFields}
-                                                {if !empty($customFields[0].field_data)}
-                                                    {foreach $customFields as $field}
-                                                        {if $field.field_data}
-                                                            <div class="glm-member-detail-custom-field">
-                                                                <div class="row">
-                                                                    <span class="glm-member-detail-custom-field-name small-12 medium-5 columns">{$field.field_name}</span>
-                                                                    <span class="glm-member-detail-custom-field-data small-12 medium-7 columns">{$field.field_data}</span>
-                                                                </div>
-
-                                                            </div>
-                                                        {/if}
-                                                    {/foreach}
+                                        {$customFields = apply_filters('get_glm_custom_fields','glm-member-db-contacts',$contact.id)}
+                                        
+                                        {if !empty($customFields[0].field_data)}            
+                                            {foreach $customFields as $field}
+                                                {if $field.field_data}
+                                                    <div class="glm-member-detail-custom-field">
+                                                        <div class="row">
+                                                            <span class="glm-member-detail-custom-field-name small-12 medium-5 columns">{$field.field_name}</span>
+                                                            <span class="glm-member-detail-custom-field-data small-12 medium-7 columns">{$field.field_data}</span>
+                                                        </div>
+                                                        
+                                                    </div>
                                                 {/if}
                                             {/foreach}
                                         {/if}