More updates for member directory.

Remove the space before the , CGCS
Remove commas after city
Use State value (abbr) and not full state name

diff --git a/glm-member-db-contacts/views/front/contacts/list.html b/glm-member-db-contacts/views/front/contacts/list.html
index aeb54c0..9eaa4db 100644 (file)
--- a/glm-member-db-contacts/views/front/contacts/list.html
+++ b/glm-member-db-contacts/views/front/contacts/list.html
@@ -67,6 +67,7 @@ and open the template in the editor.
             showing {$start} through {$lastDisplayed} of {$filteredContactsFound}
         {/if}
 
+        {debug}
 
         {$contacts_with_subs = apply_filters("get_contacts_with_subs", $contacts)}
 
@@ -140,10 +141,7 @@ and open the template in the editor.
                                         {if $contact_title}
                                         <div class="glm-contact-info-descr">
                                             <span class="field-value">
-                                                {$contact_title}
-                                                {if $cgcs == 'Yes'}
-                                                , CGCS
-                                                {/if}
+                                                {$contact_title}{if $cgcs == 'Yes'}, CGCS{/if}
                                             </span>
                                         </div>
                                         {/if}
@@ -189,10 +187,10 @@ and open the template in the editor.
                                         {/if}
                                         {if $contact_addr1}<div class="glm-contact-info-address1">{$contact_addr1}</div>{/if}
                                         {if $contact_addr2}<div class="glm-contact-info-address2">{$contact_addr2}</div>{/if}
-                                        {if $contact_zip or $contact_city or $contact_state.name}
+                                        {if $contact_zip or $contact_city or $contact_state.value}
                                         <div>
-                                            {if $contact_city}<span class="glm-contact-info-city">{$contact_city},</span>{/if}
-                                            {if $contact_state.name}<span class="glm-contact-info-state">{$contact_state.name}</span>{/if}
+                                            {if $contact_city}<span class="glm-contact-info-city">{$contact_city}</span>{/if}
+                                            {if $contact_state.value}<span class="glm-contact-info-state">{$contact_state.value}</span>{/if}
                                             {if $contact_zip}<span class="glm-contact-info-zip">{$contact_zip}</span>{/if}
                                         </div>
                                         {/if}
@@ -269,10 +267,7 @@ and open the template in the editor.
                                             {if $contact.title}
                                             <div class="section-field">
                                                 <span class="field-value">
-                                                    {$contact.title}
-                                                    {if $cgcs == 'Yes'}
-                                                    , CGCS
-                                                    {/if}
+                                                    {$contact.title}{if $cgcs == 'Yes'}, CGCS{/if}
                                                 </span>
                                             </div>
                                             {/if}
@@ -286,12 +281,12 @@ and open the template in the editor.
 
                                             {if $contact.business_addr1}<div class="glm-contact-info-address1">{$contact.business_addr1}</div>{/if}
                                             {if $contact.business_addr2}<div class="glm-contact-info-address2">{$contact.business_addr2}</div>{/if}
-                                            {if $contact.business_zip or $contact.business_city or $contact.business_state.name}
+                                            {if $contact.business_zip or $contact.business_city or $contact.business_state.value}
                                             <div>
-                                                {if $contact.business_city}<span class="glm-contact-info-city">{$contact.business_city},</span>{/if}
-                                                {if $contact.business_state.name}<span class="glm-contact-info-state">{$contact.business_state.name}</span>{/if}
+                                                {if $contact.business_city}<span class="glm-contact-info-city">{$contact.business_city}</span>{/if}
+                                                {if $contact.business_state.value}<span class="glm-contact-info-state">{$contact.business_state.value}</span>{/if}
                                                 {if $contact.business_zip}<span class="glm-contact-info-zip">{$contact.business_zip}</span>{/if}
-                                                {if $contact.business_country.name}<span class="glm-contact-info-country">, {$contact.business_country.name}</span>{/if}
+                                                {if $contact.business_country.name}<span class="glm-contact-info-country"> {$contact.business_country.name}</span>{/if}
                                             </div>
                                             {/if}
                                     </div>