From 775cd40cfa982ff60b798af3426ba6fb32454927 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Tue, 12 Jun 2018 11:24:51 -0400 Subject: [PATCH] Revert "Updating list view for members" This reverts commit 0934679673bbf3b842005d345bddc5e255fb73d3. --- glm-member-db/views/front/members/list.html | 35 ++++++--------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html index d38d163..1103758 100644 --- a/glm-member-db/views/front/members/list.html +++ b/glm-member-db/views/front/members/list.html @@ -104,6 +104,14 @@ {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')} + {if $settings.list_show_list && !$blankStart} + {if $settings.list_header_text} +

{$settings.list_header_text}

+ {else} +

List of {$terms.term_member_plur_cap}

+ {/if} + {if $haveMembers} + {foreach $mapItems as $m}
@@ -183,15 +191,6 @@
{/foreach} - {if $settings.list_show_list && !$blankStart} - {if $settings.list_header_text} -

{$settings.list_header_text}

- {else} -

List of {$terms.term_member_plur_cap}

- {/if} - {if $haveMembers} - -
{$terms.term_member_plur_cap} found: {$membersFound}
{apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')} @@ -549,9 +548,7 @@ //}); //} - - {if $mapItems} - var markers = []; + {if $haveMembers} {foreach $mapItems as $m} {if $m.lat != 0 && $m.lon != 0} @@ -561,7 +558,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|escape}', descr: $('#map_info_' + {$m.id}).html(), memberID: {$m.member} }); @@ -574,24 +571,12 @@ 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