From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 30 Aug 2018 15:43:15 +0000 (-0400)
Subject: Updates again for map popups.
X-Git-Tag: v2.10.41^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=bec63e1d620493a3e7be62e84c0aa21ce4f4bd42;p=WP-Plugins%2Fglm-member-db.git

Updates again for map popups.

Chuck only meant for descr to be removed not short one.
---

diff --git a/index.php b/index.php
index c5930460..dd491328 100644
--- a/index.php
+++ b/index.php
@@ -3,7 +3,7 @@
  * Plugin Name: GLM Associate - Members Plugin
  * Plugin URI: http://www.gaslightmedia.com/
  * Description: Gaslight Media GLM Associate core plugin and Members database.
- * Version: 2.10.40
+ * Version: 2.10.41
  * Author: Gaslight Media
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -19,7 +19,7 @@
  * @package glmMembersDatabase
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 2.10.40
+ * @version 2.10.41
  */
 
 $GLOBALS['glmAssociateMemTracker'] = memory_get_usage();
@@ -47,7 +47,7 @@ if (!defined('ABSPATH')) {
  *
  */
 
-define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.40');
+define('GLM_MEMBERS_PLUGIN_VERSION', '2.10.41');
 define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.38');
 
 // Check if plugin version is not current in WordPress option and if needed updated it
diff --git a/views/front/members/list.html b/views/front/members/list.html
index 9cdc33a4..24ea2aee 100755
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -164,17 +164,18 @@
                 <div class="glm-member-list-info">
                     <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.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}
+     {/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}
-    <!-- Not using Description for now - Use short descr for maps {literal}
-                    {if $m.descr && $settings.list_map_show_descr}{$m.descr|nl2br}<br>{/if}
-                    {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr|truncate:250}<br>{/if}
                     {if $m.categories && $settings.list_map_show_categories}
                         <div class="glm-member-list-items">
                             <b>{$terms.term_member_cap} Categories</b>
@@ -187,7 +188,6 @@
                             </ul>
                         </div>
                     {/if}
-     {/literal} -->
     <!-- Not using credit cards for now  {literal}
                     {if $m.cc_type && $settings.list_map_show_creditcards}
                         <div class="glm-member-list-items">