From 58c8f21ad52a974d780eb2bc67512289ccf76fc9 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 13 Jun 2018 14:48:03 -0400
Subject: [PATCH] Updating the list view for members

Update from main plugin for new has_no_profile flag in the member info
---
 glm-member-db/views/front/members/list.html | 51 +++++++++++++--------
 style.css                                   |  2 +-
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index cc77774..fceee1f 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -128,14 +128,6 @@
     {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
 
 
- {if $settings.list_show_list && !$blankStart}
-    {if $settings.list_header_text}
-        <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
-    {else}
-        <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
-    {/if}
-    {if $haveMembers}
-
      <!-- Member information displayed in map bubbles -->
         {foreach $mapItems as $m}
             <div id="map_info_{$m.id}" class="glm-hidden">
@@ -146,10 +138,10 @@
                     </div>
                 {/if}
                 <div class="glm-map-member-name">
-                    {if $settings.list_map_show_detaillink}
-                        <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$m.member_slug}/{if $settings.enable_multiple_profiles}{$m.id}/{/if}">{$m.name}</a>
+                    {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.name}
+                        {$m.member_name}
                     {/if}
                 </div>
                 {if $settings.list_map_show_address}
@@ -162,7 +154,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*}
@@ -215,6 +207,15 @@
             </div> <!-- End of information displayed in map bubbles -->
         {/foreach}
 
+ {if $settings.list_show_list && !$blankStart}
+    {if $settings.list_header_text}
+        <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
+    {else}
+        <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
+    {/if}
+    {if $haveMembers}
+
+
         <div id="glm-member-list-terms">{$terms.term_member_plur_cap} found: {$membersFound}<br></div>
 
         {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')}
@@ -248,7 +249,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}
+                    {if $settings.list_show_detail_link && !$member.has_no_profile.value}
                     <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
                     {/if}
 
@@ -274,7 +275,7 @@
                     {/if}
                     <div class="glm-member-list-info-wrapper">
                         <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>
@@ -338,7 +339,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}
@@ -572,7 +573,9 @@
                             //});
                         //}
 
-                {if $haveMembers}
+
+                {if $mapItems}
+                    var markers = [];
                     {foreach $mapItems as $m}
                       {if $m.lat != 0 && $m.lon != 0}
 
@@ -582,7 +585,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}
                         });
@@ -595,12 +598,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);
 
@@ -640,4 +655,4 @@
     </div><!-- glm-member-db-list-view -->
 {include file='front/footer.html'}
 <!-- if not generic view passed in member list shortcode-->
-{/if}
\ No newline at end of file
+{/if}
diff --git a/style.css b/style.css
index ee534d0..8f9e5f7 100644
--- a/style.css
+++ b/style.css
@@ -3,5 +3,5 @@ Theme Name: MiGCSA
 Author: Gaslight Media
 Author URI: http://www.gaslightmedia.com
 Description: A theme for MiGCSA
-Version: 1.0.14
+Version: 1.0.15
 */
-- 
2.17.1