From 4d89f5093c8957041dd159f813461e665d60ab61 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 30 Aug 2018 13:36:57 -0400
Subject: [PATCH] fix template markup

for smarty
---
 glm-member-db/views/front/members/list.html | 99 ++++++++++-----------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/glm-member-db/views/front/members/list.html b/glm-member-db/views/front/members/list.html
index 9008202..cf0909e 100644
--- a/glm-member-db/views/front/members/list.html
+++ b/glm-member-db/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}
                 <!--  Leaflet Map -->
                 <link rel="stylesheet" href="https://unpkg.com/leaflet@1.3.3/dist/leaflet.css" integrity="sha512-Rksm5RenBEKSKFjgI3a41vrjkw4EVPlJ3+OiI65vTjIdo9brlAacEuKOiQ5OFh7cOI1bkDwLqdLw3Zg0cRJAAQ==" crossorigin=""/>
                 <script src="https://unpkg.com/leaflet@1.3.3/dist/leaflet.js" integrity="sha512-tAGcCfR4Sc5ZP5ZoVz0quoZDYX5aCtEm/eu1KhSLj2c9eFrylXZknQYmxUssFaVJKvvc0dJQixhGjG2yXWiV9Q==" crossorigin=""></script>
@@ -12,8 +12,8 @@
                 <link rel="stylesheet" href="{$jsUrl}/Leaflet.loading/src/Control.Loading.css" />
                 <script src="{$jsUrl}/Leaflet.loading/src/Control.Loading.js"></script>
             {/if}
-            
-            {if $settings.selected_map_interface == 2}            
+
+            {if $settings.selected_map_interface == 2}
                 <!-- Google Map -->
                 <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
             {/if}
@@ -136,12 +136,12 @@
         {apply_filters('glm-member-db-front-members-list-mapTop', '')}
         <div id="glm-locationMap-container">
 
-            {if $settings.selected_map_interface == 1} 
+            {if $settings.selected_map_interface == 1}
                 <!--  Leaflet Map -->
                 <div id="LeafletMapContainer" style="height: 400px; width: 90%; border: 1px black solid; z-index: +0; margin: 0 auto;"></div>
             {/if}
-            
-            {if $settings.selected_map_interface == 2}            
+
+            {if $settings.selected_map_interface == 2}
                 <!-- Google Map -->
                 <div id="glm-locationMap" class="glm-map">(map loads here)</div>
             {/if}
@@ -210,7 +210,6 @@
                             </ul>
                         </div>
                     {/if}
-     {/literal} -->
     <!-- Not using credit cards for now  {literal}
                     {if $m.cc_type && $settings.list_map_show_creditcards}
                         <div class="glm-member-list-items">
@@ -559,13 +558,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
@@ -579,14 +578,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 &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.gaslightmedia.com/">Gaslight Media</a>',
@@ -594,8 +593,8 @@
                    maxZoom: leafletMaxZoom,
                    id: 'nothot'
                 }).addTo(leafletMap);
-    
-    
+
+
             {if $mapItems}
 
               {if $settings.use_cluster_markers}
@@ -607,7 +606,7 @@
                     maxClusterRadius: clusterRadiusMax
                 });
               {/if}
-        
+
                 var mapContainerWidth = Number(leafletMap._container.clientWidth);
                 var maxPopupWidth = .65 * mapContainerWidth;
                 if (maxPopupWidth > 600) {
@@ -615,51 +614,51 @@
                 }
                 var mapContainerHeight = Number(leafletMap._container.clientHeight);
                 var maxPopupHeight = .7 * mapContainerHeight;
-                            
+
               {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(), {
                         maxWidth: maxPopupWidth,
                         maxHeight: maxPopupHeight
                     })
                     .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.x -= 20;                                         // Bump a bit to the right to avoid resize buttons
                     px.y -= e.popup._container.clientHeight/2;          // Position more toward the center
                     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}),
@@ -667,11 +666,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}
@@ -684,11 +683,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) {
@@ -711,13 +710,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,
@@ -728,7 +727,7 @@
                         descr: $('#map_info_' + {$m.id}).html(),
                         memberID: {$m.member}
                     });
-    
+
                     // Add a click listener for this marker
                     marker.addListener('click', function() {
                             infowindow.setOptions({
@@ -736,15 +735,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,
                     {
@@ -754,10 +753,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) {
@@ -767,13 +766,13 @@
                     });
 
              } // initMap
-                    
+
         {else}
 
 
         {/if} // havemembers
 
-      {/if}                
+      {/if}
 
     {/if}   // settings.list_show_map
 
@@ -804,7 +803,7 @@
             initMap();
             mapInitialized = true;
         {/if}
-            
+
             // Processes click-through counts for website links
             $('.glm-member-list-website-link').on('click', function() {
 
-- 
2.17.1