From ef124d9b7e45fbb4d38491bcaa1e17fc51ebb17c Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Mon, 27 Aug 2018 10:54:14 -0400 Subject: [PATCH] Change Web site to Website. For the map popups in list view. --- views/front/members/list.html | 102 +++++++++++++++++----------------- 1 file changed, 51 insertions(+), 51 deletions(-) diff --git a/views/front/members/list.html b/views/front/members/list.html index d4362232..ada6f590 100755 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -3,7 +3,7 @@ {if $settings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if} "> - {if $settings.selected_map_interface == 1} + {if $settings.selected_map_interface == 1} @@ -12,8 +12,8 @@ {/if} - - {if $settings.selected_map_interface == 2} + + {if $settings.selected_map_interface == 2} {/if} @@ -116,12 +116,12 @@ {apply_filters('glm-member-db-front-members-list-mapTop', '')}
- {if $settings.selected_map_interface == 1} + {if $settings.selected_map_interface == 1}
{/if} - - {if $settings.selected_map_interface == 2} + + {if $settings.selected_map_interface == 2}
(map loads here)
{/if} @@ -165,7 +165,7 @@

{if $m.phone && $settings.list_map_show_phone}Phone: {apply_filters('glm_associate_phone_filter', $m.phone)}
{/if} {if $m.toll_free && $settings.list_map_show_tollfree}{apply_filters('glm_associate_phone_filter', $m.toll_free)}
{/if} - {if $m.url && $settings.list_map_show_url}Web site: {$m.url}
{/if} + {if $m.url && $settings.list_map_show_url}Website: {$m.url}
{/if} {if $m.email && $settings.list_map_show_email}E-Mail Address: {$m.email}
{/if} {if $m.region && $settings.list_map_show_region}Region: {$m.region}{/if}

@@ -228,7 +228,7 @@ {apply_filters('glm-member-db-front-members-list-listHeaderBottom', '')} - +
{if $settings.list_show_search_alpha}
@@ -523,13 +523,13 @@ /* * Map operations */ - + var startLat = $('#glmLat').val(); var startLon = $('#glmLng').val(); var defZoom = Number({$settings.maps_default_zoom}); - - {if $settings.selected_map_interface == 1} - + + {if $settings.selected_map_interface == 1} + /* * Leaflet Map * API reference: https://leafletjs.com/reference-1.3.2.html @@ -543,14 +543,14 @@ var leafletMaxZoom = 19; var clusterRadiusMax = 40; var geocoder; - + // Loading features var loadingControl = L.Control.loading({ separate: true, delayIndicator: 500 }); leafletMap.addControl(loadingControl); - + // Init Map L.tileLayer(leafletTileServer, { attribution: 'Map data © OpenStreetMap contributors, CC-BY-SA, Imagery © Gaslight Media', @@ -558,8 +558,8 @@ maxZoom: leafletMaxZoom, id: 'nothot' }).addTo(leafletMap); - - + + {if $mapItems} {if $settings.use_cluster_markers} @@ -571,48 +571,48 @@ maxClusterRadius: clusterRadiusMax }); {/if} - - + + {foreach $mapItems as $m} {if $m.lat != 0 && $m.lon != 0} - - // Create marker for this member and and to Feature Group + + // Create marker for this member and and to Feature Group var leafletMarker = L.marker([{$m.lat}, {$m.lon}], { title: '{$m.member_name|escape:quotes}' }) .bindPopup($('#map_info_' + {$m.id}).html()) .addTo(markerGroup); - + {/if} - {/foreach} - + {/foreach} + leafletMap.addLayer(markerGroup); - + // Get outer bounds of all markers in the Feature Group - leafletMap.fitBounds(markerGroup.getBounds()); - + leafletMap.fitBounds(markerGroup.getBounds()); + {/if} // havemembers - + // When a marker is clicked, display the pop-up near the center of the map. - + leafletMap.on('popupopen', function(e) { var px = leafletMap.project(e.popup._latlng); px.y -= e.popup._container.clientHeight/2; leafletMap.panTo(leafletMap.unproject(px),{ animate: true }); }); - + } {/if} - - {if $settings.selected_map_interface == 2} - + + {if $settings.selected_map_interface == 2} + /* * Google Maps * API reference: https://developers.google.com/maps/documentation/javascript/reference */ - + function initMap() { - + // Create a Google Map object var map = new google.maps.Map(document.getElementById('glm-locationMap'), { center: new google.maps.LatLng({$settings.maps_default_lat}, {$settings.maps_default_lon}), @@ -620,11 +620,11 @@ disableDefaultUI: false, mapTypeId: google.maps.MapTypeId.MAP, }); - + var center = map.getCenter(); google.maps.event.trigger(map, "resize"); map.setCenter(center); - + var currentScroll = $(window).scrollTop(); // get current position var mapTop = $("#glm-locationMap-container").offset().top-10; {if $settings.list_show_search}fixmeTop = $('#glm-member-list-filters-button').offset().top;{/if} @@ -637,11 +637,11 @@ scrollTop: $("#glm-locationMap-container").offset().top-100 }, 400); } - + var geocoder = new google.maps.Geocoder(); var bounds = new google.maps.LatLngBounds(); var infowindow = new google.maps.InfoWindow(); - + // Don't Try HTML5 to get user geolocation //if(navigator.geolocation) { //navigator.geolocation.getCurrentPosition(function(position) { @@ -664,13 +664,13 @@ //}); //}); //} - - + + {if $mapItems} var markers = []; {foreach $mapItems as $m} {if $m.lat != 0 && $m.lon != 0} - + // Create a marker for this member var marker = new google.maps.Marker({ map: map, @@ -681,7 +681,7 @@ descr: $('#map_info_' + {$m.id}).html(), memberID: {$m.member} }); - + // Add a click listener for this marker marker.addListener('click', function() { infowindow.setOptions({ @@ -689,15 +689,15 @@ }); 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, { @@ -707,10 +707,10 @@ minimunClusterSize: 3 }); {/if} - + // Fit map to bounds of all markers map.fitBounds(bounds); - + // Check for first map idle (completely loaded) - Check max zoom var mapLoadedListener = google.maps.event.addListener(map, 'idle', function() { if (map.getZoom() > 14) { @@ -720,13 +720,13 @@ }); } // initMap - + {else} {/if} // havemembers - {/if} + {/if} {/if} // settings.list_show_map @@ -745,7 +745,7 @@ initMap(); mapInitialized = true; {/if} - + // Processes click-through counts for website links $('.glm-member-list-website-link').on('click', function() { -- 2.17.1