From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 13 Jun 2018 20:49:55 +0000 (-0400)
Subject: Update from main plugin view files.
X-Git-Tag: v1.0.6^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=edaa3029f2c70c0e0a4f728bed4158c22cedbda2;p=WP-Themes%2Fcoldwater.git

Update from main plugin view files.

Updating the list view with new flag for has_no_profile.
---

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 139dd18..3cbf210 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/views/front/members/list.html
@@ -104,14 +104,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">
@@ -122,7 +114,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}
@@ -138,7 +130,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*}
@@ -191,6 +183,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', '')}
@@ -250,7 +251,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>
@@ -314,7 +315,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}
@@ -548,7 +549,9 @@
                             //});
                         //}
 
-                {if $haveMembers}
+
+                {if $mapItems}
+                    var markers = [];
                     {foreach $mapItems as $m}
                       {if $m.lat != 0 && $m.lon != 0}
 
@@ -558,7 +561,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}
                         });
@@ -571,12 +574,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 7b267a5..7c43382 100644
--- a/style.css
+++ b/style.css
@@ -3,5 +3,5 @@ Theme Name: Coldwater
 Author: Gaslight Media
 Author URI: http://www.gaslightmedia.com
 Description: A theme for coldwater
-Version: 1.0.5
+Version: 1.0.6
 */