From 2f83c3c353e97439862827f8e1aebd6146d12879 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 14 Jun 2018 08:57:30 -0400
Subject: [PATCH] Update member list view

For new has_no_profile flag.
---
 glm-member-db/views/front/members/list.html | 30 +++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 040aeb0..83ba5e4 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -116,7 +116,7 @@
                     </div>
                 {/if}
                 <div class="glm-map-member-name">
-                    {if $settings.list_map_show_detaillink && "Simple" !== $map_member_type}
+                    {if $settings.list_map_show_detaillink && "Simple" !== $map_member_type && !$m.has_no_profile}
                         <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/{if $settings.enable_multiple_profiles}{$m.id}/{/if}">{$m.member_name}</a>
                     {else}
                         {$m.member_name}
@@ -132,7 +132,7 @@
                             {if $m.city}{$m.city}{if $m.state}, {/if}{/if}{if $m.state}{$m.state}{/if}{if $m.zip} {$m.zip}{/if}
                         {/if}
                         {if $m.country && $settings.list_map_show_country}
-                            <br>{$m.country}
+                            {$m.country}
                         {/if}
                     </p>
                 {/if} {*list_map_show_address*}
@@ -229,7 +229,7 @@
                 <div class="glm-member-db-border-wrap">
                     {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
 
-                    {if $settings.list_show_detail_link && "Simple" !== $member_type}
+                    {if $settings.list_show_detail_link && "Simple" !== $member_type && !$member.has_no_profile.value}
                     <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
                     {/if}
 
@@ -250,12 +250,12 @@
                     {else}
                         <div class="glm-member-list-missing-image"></div>
                     {/if}
-                    {if $settings.list_show_detail_link && "Simple" !== $member_type}
+                    {if $settings.list_show_detail_link && "Simple" !== $member_type && !$member.has_no_profile.value}
                     </a>
                     {/if}
                     <div class="glm-member-list-info-wrapper">
                         <h4 class="glm-member-title">
-                            {if $settings.list_show_detail_link && "Simple" !== $member_type}
+                            {if $settings.list_show_detail_link && "Simple" !== $member_type && !$member.has_no_profile.value}
                                 <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">
                                     {$member.member}
                                 </a>
@@ -325,7 +325,7 @@
  <!-- Member name, address, and basic information -->
                     {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)}
                     <h4 class="glm-member-title">
-                        {if $settings.list_show_detail_link && "Simple" !== $member_type}
+                        {if $settings.list_show_detail_link && "Simple" !== $member_type && !$member.has_no_profile.value}
                             <a class="glm-member-title-inner" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">{$member.member}</a>
                         {else}
                             <span class="glm-member-title-inner">{$member.member}</span>
@@ -389,7 +389,7 @@
                     {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
                     {if $member.short_descr && $settings.list_show_short_descr}
                         {$member.short_descr|nl2br}
-                        {if $settings.list_show_detail_link && "Simple" !== $member_type}
+                        {if $settings.list_show_detail_link && "Simple" !== $member_type && !$member.has_no_profile.value}
                             <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">More</a>
                         {/if}
                     {/if}
@@ -559,7 +559,9 @@
                             //});
                         //}
 
+
                 {if $mapItems}
+                    var markers = [];
                     {foreach $mapItems as $m}
                       {if $m.lat != 0 && $m.lon != 0}
 
@@ -569,7 +571,7 @@
                             position: new google.maps.LatLng({$m.lat}, {$m.lon}),
                             draggable: false,
                             animation: google.maps.Animation.DROP,
-                            title: '{$m.name|escape:quotes}',
+                            title: '{$m.member_name|escape:quotes}',
                             descr: $('#map_info_' + {$m.id}).html(),
                             memberID: {$m.member}
                         });
@@ -582,12 +584,24 @@
                             infowindow.open(map,this);
                         });
 
+                        markers.push(marker);
+
                         // Extend the map bounds to include this marker
                         bounds.extend(marker.position);
 
                      {/if}
                     {/foreach}
 
+                    {if $settings.use_cluster_markers}
+                        var markerCluster = new MarkerClusterer(map, markers,
+                        {
+                            imagePath: '{$baseUrl}/js/googleMapsMarkerClusterer/images/m',
+                            gridSize: 30,
+                            maxZoom: 14,
+                            minimunClusterSize: 3
+                        });
+                    {/if}
+
                         // Fit map to bounds of all markers
                         map.fitBounds(bounds);
 
-- 
2.17.1