From c8959cbab4637ba13a5dae7c0450231ac60b449c Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 30 Aug 2018 11:50:11 -0400
Subject: [PATCH] Updates from main plugin

For member list view file.
---
 glm-member-db/views/front/members/list.html | 9 +++++++++
 style.css                                   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 54d30c9..fa0b8a8 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -170,8 +170,17 @@
                         {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}
                     </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}
+>>>>>>> Stashed changes
                     {if $m.categories && $settings.list_map_show_categories}
                         <div class="glm-member-list-items">
                             <b>{$terms.term_member_cap} Categories</b>
diff --git a/style.css b/style.css
index 72c664f..310d636 100644
--- a/style.css
+++ b/style.css
@@ -3,5 +3,5 @@ Theme Name: BaragaCounty
 Author: Gaslight Media
 Author URI: http://www.gaslightmedia.com
 Description: A theme for BaragaCounty
-Version: 1.0.27
+Version: 1.0.28
 */
-- 
2.17.1