From b574c1e4bd5c1d5dad426931d4adb7f65c959f1a Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 13 Jun 2018 12:58:05 -0400
Subject: [PATCH] Updating the member list view file for no profile flag in
 profiles.

New flag in member profile for no profile page. Which turns off linking
to the profile page on front.
---
 glm-member-db/views/front/members/list.html | 41 ++++++++++-----------
 style.css                                   |  2 +-
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 5ffa399..4688e14 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -136,7 +136,7 @@
                 </div>
             {/if}
             <div class="glm-map-member-name">
-                {if $settings.list_map_show_detaillink}
+                {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}">{$m.member_name}</a>
                 {else}
                     {$m.member_name}
@@ -152,7 +152,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*}
@@ -216,14 +216,12 @@
     <ul class="row">
     {foreach $members as $member}
         <li class="glm-member-list-record columns small-12 medium-6 large-4">
-            <a class="anchorWrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
+            <a class="anchorWrapper"{if $settings.list_show_detail_link && !$member.has_no_profile.value} href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/"{else} style="cursor: default;"{/if}>
                 {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
                 <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}
-                    <div class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
-                    {/if}
+                    <div class="glm-member-list-image-wrapper"{if $settings.list_show_detail_link && !$member.has_no_profile.value} href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/"{/if}>
 
                     {if $member.featured}
                     <div class="glm-member-list-featured-tag">
@@ -242,20 +240,9 @@
                     {else}
                         <div class="glm-member-list-missing-image"></div>
                     {/if}
-                    {if $settings.list_show_detail_link}
                     </div>
-                    {/if}
                     <div class="glm-member-list-info-wrapper">
-                        <h4 class="glm-member-title">
-                            {if $settings.list_show_detail_link}
-<!--                                <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">-->
-                                    {$member.member}
-<!--                                </a>-->
-                            {else}
-                                {$member.member}
-                            {/if}
-
-                        </h4>
+                        <h4 class="glm-member-title"> {$member.member} </h4>
                         <div class="glm-member-list-description small-12 columns">
                             <div>
                             {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
@@ -300,7 +287,6 @@
                         {/if}
                     {/if}
 
-<!--                    <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">View More</a></li>-->
                     {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
                 </ul>
             </div>
@@ -336,7 +322,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}
+                    {if $settings.list_show_detail_link && !$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>
                     {else}
                         {$member.member}
@@ -571,6 +557,7 @@
                     //}
 
             {if $mapItems}
+                    var markers = [];
                 {foreach $mapItems as $m}
                   {if $m.lat != 0 && $m.lon != 0}
 
@@ -580,7 +567,7 @@
                         position: new google.maps.LatLng({$m.lat}, {$m.lon}),
                         draggable: false,
                         animation: google.maps.Animation.DROP,
-                        title: '{$m.member|escape}',
+                            title: '{$m.member_name|escape:quotes}',
                         descr: $('#map_info_' + {$m.id}).html(),
                         memberID: {$m.member}
                     });
@@ -593,12 +580,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);
 
diff --git a/style.css b/style.css
index 6bf1b43..61f6799 100644
--- a/style.css
+++ b/style.css
@@ -4,7 +4,7 @@ Theme URI: http://underscores.me/
 Author: Underscores.me
 Author URI: http://underscores.me/
 Description: Description
-Version: 1.0.26
+Version: 1.0.27
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: wmta
-- 
2.17.1