From 273eaf2e391af0485170d531cafab3264d9f463d Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 26 Jun 2019 15:50:42 -0400
Subject: [PATCH] fix commit errors

---
 glm-member-db/views/front/members/detail.html | 52 +++++++++----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/glm-member-db/views/front/members/detail.html b/glm-member-db/views/front/members/detail.html
index 4f544ad..31bd2fb 100644
--- a/glm-member-db/views/front/members/detail.html
+++ b/glm-member-db/views/front/members/detail.html
@@ -151,7 +151,7 @@
                         <script src="//maps.googleapis.com/maps/api/js?sensor=true&key={$settings.google_maps_api_key}"></script>
                         <script type="text/javascript">var enableDraggable = true;</script>
                         <div id="glm-locationMap" class="glm-map glmgrid-small-12 glmgrid-columns">(map loads here)</div>
-        {/if}   
+        {/if}
                         {apply_filters('glm-member-db-front-members-detail-mapBottom', '', $member.id)}
                     </div>
                     {apply_filters('glm-member-db-front-members-detail-mapAfter', '', $member.id)}
@@ -169,7 +169,7 @@
                         </form>
                     </div>
                     {apply_filters('glm-member-db-front-members-detail-mapButtonsAfter', '', $member.id)}
-                    
+
         {/if}
                 </div>
 
@@ -191,7 +191,7 @@
                     <div id="glm-member-detail-intro-desc">
                         {if $member.short_descr && $settings.detail_show_short_descr}{$member.short_descr|nl2br}{/if}
                     </div>
-                {if 
+                {if
                     $member.descr && $settings.detail_show_descr
                     || $settings.detail_show_coupons && $coupons
                     || $member.amenities && $settings.detail_show_amenities
@@ -220,10 +220,9 @@
                                 <a class="glm-member-detail-link-to-top">Back to top</a>
                             </div>
                         </div>
-<<<<<<< Updated upstream
-                        {/if}
-=======
-{if $settings.profile_accommodation && $member.accommodations}
+                        {/iF}
+
+                    {if $settings.profile_accommodation && $member.accommodations}
                         <div id="glm-member-detail-accommodations-toggle" class="glm-member-detail-content-toggle">Accommodations Info</div>
                         <div id="glm-member-detail-accommodations-container" class="glm-member-detail-content-data">
                             <div id="glm-member-detail-accommodations" >
@@ -239,10 +238,9 @@
                             </div>
                         </div>
                     {/if}
->>>>>>> Stashed changes
-                        
+
                         {apply_filters('glm-member-db-front-members-detail-events', '', $member.id)}
-                        
+
                         {apply_filters('glm-member-db-front-members-detail-couponsBefore', '', $member.id)}
                         {if $settings.detail_show_coupons && $coupons}
                         <div id="glm-member-detail-coupons-toggle" class="glm-member-detail-content-toggle">Coupons</div>
@@ -255,7 +253,7 @@
                         </div>
                         {/if}
                         {apply_filters('glm-member-db-front-members-detail-couponsAfter', '', $member.id)}
-                        
+
                         {apply_filters('glm-member-db-front-members-detail-amenitiesBefore', '', $member.id)}
                         {if $member.amenities && $settings.detail_show_amenities}
                         <div id="glm-member-detail-amenities-toggle" class="glm-member-detail-content-toggle">Amenities & Services</div>
@@ -366,12 +364,12 @@
                         {/if}
 
                         {apply_filters('glm-member-db-front-members-detail-liveCamAfter', '', $member.id)}
-                        
+
                         {if !empty($customFields[0].field_data)}
                             <div id="glm-member-detail-hours-toggle" class="glm-member-detail-content-toggle">Hours</div>
                             <div id="glm-member-detail-hours-container" class="glm-member-detail-content-data">
                                 <div id="glm-member-detail-hours" >
-                                    
+
                                     {foreach $customFields as $field}
                                         {if $field.field_data}
                                             <div class="glm-member-detail-custom-field">
@@ -379,19 +377,19 @@
                                                     <span class="glm-member-detail-custom-field-name small-12 medium-5 columns" >{$field.field_name}</span>
                                                     <span class="glm-member-detail-custom-field-data small-12 medium-7 columns">{$field.field_data}</span>
                                                 </div>
-                                                
+
                                             </div>
                                         {/if}
                                     {/foreach}
                                 </div>
-                            
+
                                 <div class="glm-member-detail-sub-data-links row">
                                     <a class="glm-member-detail-content-toggle">Collapse</a>
                                     <a class="glm-member-detail-link-to-top">Back to top</a>
                                 </div>
                             </div>
                         {/if}
-                        
+
                         {apply_filters('glm-member-db-front-members-detail-imageGalleryBefore', '', $member.id)}
                         {if $settings.detail_show_imagegallery && $haveImageGallery}
                         <div id="glm-member-detail-images-toggle" class="glm-member-detail-content-toggle">Photos</div>
@@ -416,7 +414,7 @@
                         </div>
                         {/if}
                         {apply_filters('glm-member-db-front-members-detail-imageGalleryAfter', '', $member.id)}
-                    
+
                         {apply_filters('glm-member-db-front-members-detail-dataBottom','',$member.id)}
                     </div>
                 </div>
@@ -606,8 +604,8 @@
                 $(this).html(mapBtnTxt);
             });
 
-      {if $settings.selected_map_interface == 1}    
-            
+      {if $settings.selected_map_interface == 1}
+
             /*
              *  Leaflet Map
              *  API reference: https://leafletjs.com/reference-1.3.2.html
@@ -624,7 +622,7 @@
         {/if}
 
             function initMap() {
-            
+
                 var leafletMap = L.map('LeafletMapContainer').setView([memberLat, memberLon], {$settings.maps_default_zoom});
                 var leafletTileServer = '{$settings.leaflet_tile_server}/{$settings.leaflet_tile_server_key}/' + {literal}'{z}/{x}/{y}.png'{/literal};
                 var leafletMinZoom = 5;
@@ -645,16 +643,16 @@
                     delayIndicator: 500
                 });
                 leafletMap.addControl(loadingControl);
-                
+
                 // Marker
                 var leafletMarker = L.marker([memberLat, memberLon]).addTo(leafletMap);
-            
+
             }
-        
+
       {/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
@@ -694,9 +692,9 @@
             google.maps.event.addDomListener(window, 'load', initMap);
 
       {/if}
-          
+
     {/if} {*detail_show_map*}
-            
+
             $(window).load(function(){
                 initMap();
             });
-- 
2.17.1