From: Laury GvR <laury@gaslightmedia.com>
Date: Fri, 16 Nov 2018 21:00:14 +0000 (-0500)
Subject: Front list view changes based on discoverkalamazoo
X-Git-Tag: v2.11.0^2~54^2~16
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=b9b1b2a3fb2e7ee8fef3ec9abb91305c7843d86e;p=WP-Plugins%2Fglm-member-db.git

Front list view changes based on discoverkalamazoo
---

diff --git a/views/front/members/list.html b/views/front/members/list.html
index 32bc440c..debd725f 100755
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -1,26 +1,27 @@
+{include file='front/members/header.html'}
+
 <div class="glm-member-db-list glm-member-db-{$view}-view
     {if $settings.list_map_show_opened || $view == 'map'}map-opened{else}map-closed{/if}
     {if $settings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if}
 ">
 
-            {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>
-                <link rel="stylesheet" href="{$jsUrl}/LeafletMarkerCluster/dist/MarkerCluster.Default.css" />
-                <script src="{$jsUrl}/LeafletMarkerCluster/dist/leaflet.markercluster-src.js"></script>
-                <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}
-                <!-- Google Map -->
-                <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
-            {/if}
-
+{if $view != 'no-map'}
+    {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>
+        <link rel="stylesheet" href="{$jsUrl}/LeafletMarkerCluster/dist/MarkerCluster.Default.css" />
+        <script src="{$jsUrl}/LeafletMarkerCluster/dist/leaflet.markercluster-src.js"></script>
+        <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}
+        <!-- Google Map -->
+        <script src="//maps.googleapis.com/maps/api/js?&key={$settings.google_maps_api_key}"></script>
+    {/if}
 
-{include file='front/members/header.html'}
+{/if}
 {apply_filters('glm-member-db-front-members-list-pageTop', '')}
 <div class="glm-member-list-inner-wrapper">
     {if $settings.list_show_map}
@@ -34,7 +35,7 @@
             <div id="glm-member-list-filters-box">
                 <div id="glm-member-list-filters-close" class="button glm-button glm-member-list-filters-toggle">Close</div>
                     <form action="{$thisUrl}?glm_action=list#glm-member-list-filters-button" method="post" enctype="multipart/form-data">
-                        <div class="glm-member-search glm-member-entry-container glm-member-container">
+                        <div class="small-12 columns glm-member-search glm-member-entry-container glm-member-container">
                             {apply_filters('glm-member-db-front-members-list-searchFormTop', '')}
                             <div>
                                 <h3>Refine Search</h3>
@@ -42,6 +43,7 @@
                             {if $settings.list_show_search_category}
                                 <div>
                                     By Category:
+
                                     <select name="categorySearch" id="categorySelect">
                                     {if !$singleCategory}
                                         <option value="">(all)</option>
@@ -52,7 +54,6 @@
                                         </option>
                                     {/foreach}
                                     </select>
-
                                 </div>
                             {/if}
                             {if $settings.list_show_search_amenities}
@@ -82,8 +83,8 @@
                                                 {$v.name}
                                             </option>
                                         {/foreach}
-                                    </select>
-                                </div>
+                                        </select>
+                                    </div>
                                 {/if}
                             {/if}
 
@@ -92,10 +93,10 @@
                                     By Name: <input type="text" name="textSearch" value="{$textSearch}" class="glm-form-text-input">
                                 </div>
                             {/if}
-                            <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
-                            {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
-                        </div>
-                    </form>
+                        <div><input class="button glm-member-button centered" type="submit" value="Search"></div>
+                        {apply_filters('glm-member-db-front-members-list-searchFormBottom', '')}
+                    </div>
+                </form>
             </div> <!-- glm-member-list-filters-box -->
         </div> <!-- glm-member-list-wrapper -->
         {/if} {*list_show_search*}
@@ -244,7 +245,6 @@
             {/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', '')}
@@ -274,7 +274,6 @@
                     showing {$start} through {$lastDisplayed} of {$filteredMembersFound}
                 {/if}
 
-
                 {if $view == grid}
                     <ul class="small-block-grid-1 medium-block-grid-2 large-block-grid-3">
                     {foreach $members as $member}
@@ -368,7 +367,7 @@
                             <div class="glm-member-list-image-border clearfix">
                                 <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$member.logo}">
                             </div>
-                        </div>
+                       </div>
                     {/if}
                     <div class="glm-member-list-active-info small-12 medium-8 columns small-right medium-left ">
      <!-- Member name, address, and basic information -->
@@ -381,30 +380,30 @@
                         {/if}
                     </h4>
                     {if $settings.list_show_address}
-                    <div class="glm-member-list-address-wrapper">
-                        {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)}
-                        {if $settings.list_show_street}
-                        {if $member.addr1 && $settings.list_show_address}<div>{$member.addr1}</div>{/if}
-                        {if $member.addr2 && $settings.list_show_address}<div>{$member.addr2}</div>{/if}
-                        {/if}
-                        {if $settings.memb_info_location && $settings.list_show_citystatezip}
-                        <div>
-                            {if $member.city}
-                            <span>{$member.city}{if $member.state.value}, {/if}</span>
+                        <div class="glm-member-list-address-wrapper">
+                            {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)}
+                            {if $settings.list_show_street}
+                            {if $member.addr1 && $settings.list_show_address}<div>{$member.addr1}</div>{/if}
+                            {if $member.addr2 && $settings.list_show_address}<div>{$member.addr2}</div>{/if}
                             {/if}
-                            {if $member.state.value}
-                            <span>{$member.state.value}</span>
+                            {if $settings.memb_info_location && $settings.list_show_citystatezip}
+                                <div>
+                                    {if $member.city}
+                                        <span>{$member.city}{if $member.state.value}, {/if}</span>
+                                    {/if}
+                                    {if $member.state.value}
+                                        <span>{$member.state.value}</span>
+                                    {/if}
+                                    {if $member.zip}
+                                        {$member.zip}
+                                    {/if}
+                                </div>
                             {/if}
-                            {if $member.zip}
-                                {$member.zip}
+                            {if $member.country.name && $settings.list_show_country}
+                                <div>{$member.country.name}</div>
                             {/if}
+                            {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $member.member_pointer)}
                         </div>
-                        {/if}
-                        {if $member.country.name && $settings.list_show_country}
-                        <div>{$member.country.name}</div>
-                        {/if}
-                        {apply_filters('glm-member-db-front-members-list-memberAddressBottom', '', $member.member_pointer)}
-                    </div>
                     {/if}
                     {apply_filters('glm-member-db-front-members-list-memberDetailTop', '', $member.member_pointer)}
                     {if ($settings.memb_info_contact && $member.phone && $settings.list_show_phone) || ($settings.memb_info_contact && $member.toll_free && $settings.list_show_tollfree)}
@@ -479,11 +478,10 @@
                  </div>
 
 
-                        <!-- Laury - This is the one that should go underneath all the address and description area -->
-            {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
-            {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
-            </div>
-            {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
+                {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
+                {apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}
+                </div>
+                {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
     <!-- Member Description -->
 
      {/foreach} {*$members*}
@@ -551,7 +549,7 @@
                     });
             {/if} // settings.list_show_search
 
-    {if $settings.list_show_map}
+            {if $settings.list_show_map}
 
             /*
              * Map operations
@@ -655,7 +653,7 @@
              *  API reference: https://developers.google.com/maps/documentation/javascript/reference
              */
 
-             function initMap() {
+            function initMap() {
 
                 // Create a Google Map object
                 var map = new google.maps.Map(document.getElementById('glm-locationMap'), {
@@ -710,47 +708,47 @@
                 //}
 
 
-            {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,
-                        position: new google.maps.LatLng({$m.lat}, {$m.lon}),
-                        draggable: false,
-                        animation: google.maps.Animation.DROP,
-                        title: '{$m.member_name|escape:quotes}',
-                        descr: $('#map_info_' + {$m.id}).html(),
-                        memberID: {$m.member}
-                    });
+                {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,
+                                position: new google.maps.LatLng({$m.lat}, {$m.lon}),
+                                draggable: false,
+                                animation: google.maps.Animation.DROP,
+                                title: '{$m.member_name|escape:quotes}',
+                                descr: $('#map_info_' + {$m.id}).html(),
+                                memberID: {$m.member}
+                            });
 
-                    // Add a click listener for this marker
-                    marker.addListener('click', function() {
-                            infowindow.setOptions({
-                                    content: this.descr
+                            // Add a click listener for this marker
+                            marker.addListener('click', function() {
+                                    infowindow.setOptions({
+                                            content: this.descr
+                                    });
+                                infowindow.open(map,this);
                             });
-                        infowindow.open(map,this);
-                    });
 
-                    markers.push(marker);
+                            markers.push(marker);
 
-                    // Extend the map bounds to include this marker
-                    bounds.extend(marker.position);
+                            // 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}
+                        {/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);
@@ -762,8 +760,9 @@
                         }
                         google.maps.event.removeListener(mapLoadedListener);
                     });
+                {/if}
 
-             } // initMap
+            } // initMap
 
         {else}
 
@@ -774,8 +773,8 @@
 
     {/if}   // settings.list_show_map
 
-            // Handle Map View/Hide
-            var mapInitialized = false;
+         // Handle Map View/Hide
+         var mapInitialized = false;
             $("#glm-member-list-map-toggle").click( function() {
                 $(".glm-member-db-{$view}-view").toggleClass("map-opened");
                 $(".glm-member-db-{$view}-view").toggleClass("map-closed");
@@ -784,11 +783,14 @@
                     mapInitialized = true;
                 }
             });
-        {if $settings.list_map_show_opened}
-            // Start with map opened
-            initMap();
-            mapInitialized = true;
-        {/if}
+            {if $view != 'no-map'}
+                {if $settings.list_map_show_opened }
+                    // Start with map opened
+                    initMap();
+                    mapInitialized = true;
+                {/if}
+                initMap();
+            {/if}
 
             // Processes click-through counts for website links
             $('.glm-member-list-website-link').on('click', function() {