From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 30 Aug 2018 15:53:56 +0000 (-0400)
Subject: Merge tag 'v1.0.28' into develop
X-Git-Tag: v1.0.29^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=455c1fbedd28ca94d4931d95d42ac89f27f22a63;p=WP-Themes%2Fbaragacounty.git

Merge tag 'v1.0.28' into develop

Version 1.0.28
---

455c1fbedd28ca94d4931d95d42ac89f27f22a63
diff --cc glm-member-db/views/front/members/list.html
index b627260,fa0b8a8..9a64a10
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@@ -163,15 -163,20 +163,17 @@@
                      </p>
                  {/if} {*list_map_show_address*}
                  <div class="glm-member-list-info">
 -                    <p>
 -                        {if $m.phone && $settings.list_map_show_phone}<b>Phone:</b> {apply_filters('glm_associate_phone_filter', $m.phone)}<br>{/if}
 -                        {if $m.toll_free && $settings.list_map_show_tollfree}{apply_filters('glm_associate_phone_filter', $m.toll_free)}<br>{/if}
 -                        {if $m.url && $settings.list_map_show_url}<b>Website:</b> <a href="{$m.url}"{if $settings.list_map_show_url_newtarget} target="_blank"{/if}>{$m.url}</a><br>{/if}
 +                    <p class="glm-member-list-map-info">
 +                        {if $m.phone && $settings.list_map_show_phone}<b>Phone:</b> <a href="tel:{apply_filters('glm_associate_phone_filter_tel', $m.phone)}">{apply_filters('glm_associate_phone_filter', $m.phone)}</a><br>{/if}
 +                        {if $m.toll_free && $settings.list_map_show_tollfree}<a href="tel:{apply_filters('glm_associate_phone_filter_tel', $m.toll_free)}">{apply_filters('glm_associate_phone_filter', $m.toll_free)}</a><br>{/if}
                          {if $m.email && $settings.list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$m.email}">{$m.email}</a><br>{/if}
                          {if $m.region && $settings.list_map_show_region}<b>Region:</b> {$m.region}{/if}
 +                        {if $m.url && $settings.list_map_show_url}<a href="{$m.url}"{if $settings.list_map_show_url_newtarget} target="_blank"{/if}>Website</a><br>{/if}
                      </p>
+     <!-- Not using Description for now - Use short descr for maps {literal}
                      {if $m.descr && $settings.list_map_show_descr}{$m.descr|nl2br}<br>{/if}
 -<<<<<<< Updated upstream
--                    {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr}<br>{/if}
 -=======
+      {/literal} -->
+                     {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr|truncate:200}<br>{/if}
                      {if $settings.list_map_show_detaillink && !$m.has_no_profile}
                          <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/{if $settings.enable_multiple_profiles}{$m.id}/{/if}">More Info</a>
                      {/if}