Revert "Updating list view for members"

This reverts commit 0934679673bbf3b842005d345bddc5e255fb73d3.

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index d38d163..1103758 100644 (file)
--- 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}
+        <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">
@@ -183,15 +191,6 @@
             </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', '')}
@@ -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);