From 94ec8ee500a7c8a2f92f38ed72be1bbaa37c7362 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 29 Aug 2018 14:53:59 -0400
Subject: [PATCH] Update list view for theme

For phone numbers and the limit on short-desc
---
 glm-member-db/views/front/members/list.html | 22 ++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index d69b31c..ce7fecc 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -211,14 +211,14 @@ Search Terms:
                 {/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}
+                        {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.url && $settings.list_map_show_url}<a href="{$m.url}"{if $settings.list_map_show_url_newtarget} target="_blank"{/if}>Website</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}
                     </p>
                     {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}<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>
@@ -717,6 +717,13 @@ Search Terms:
                 });
               {/if}
 
+                var mapContainerWidth = Number(leafletMap._container.clientWidth);
+                var maxPopupWidth = .65 * mapContainerWidth;
+                if (maxPopupWidth > 600) {
+                    maxPopupWidth = 600;
+                }
+                var mapContainerHeight = Number(leafletMap._container.clientHeight);
+                var maxPopupHeight = .7 * mapContainerHeight;
 
               {foreach $mapItems as $m}
                 {if $m.lat != 0 && $m.lon != 0}
@@ -724,7 +731,8 @@ Search Terms:
                 // Create marker for this member and and to Feature Group
                 var leafletMarker = L.marker([{$m.lat}, {$m.lon}], { title:  '{$m.member_name|escape:quotes}' })
                     .bindPopup($('#map_info_' + {$m.id}).html(), {
-                        maxWidth: 600
+                        maxWidth: maxPopupWidth,
+                        maxHeight: maxPopupHeight
                     })
                     .addTo(markerGroup);
 
@@ -742,8 +750,8 @@ Search Terms:
 
                 leafletMap.on('popupopen', function(e) {
                     var px = leafletMap.project(e.popup._latlng);
-                    px.x -= 20;
-                    px.y -= e.popup._container.clientHeight/2;
+                    px.x -= 20;                                         // Bump a bit to the right to avoid resize buttons
+                    px.y -= e.popup._container.clientHeight/2;          // Position more toward the center
                     leafletMap.panTo(leafletMap.unproject(px),{ animate: true });
                 });
 
-- 
2.17.1