New ability to show multiple shortcodes for search,map,list with parts separated.

diff --git a/models/front/members/list.php b/models/front/members/list.php
index af6683e..f093ef5 100755 (executable)
--- a/models/front/members/list.php
+++ b/models/front/members/list.php
@@ -204,6 +204,13 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
         $start         = 1;
         $limit         = $this->config['settings']['list_pagination_count']; // Now this is in management
 
+        // Pre-load settings array with management settings as default using the list above
+        $settings = array();
+        reset($GLOBALS['showOpts']);
+        while (list($key, $val) = each($GLOBALS['showOpts'])) {
+            $settings[$val] = $this->config['settings'][$val];
+        }
+
         if ( isset( $_REQUEST['limit'] ) && filter_var( $_REQUEST['limit'], FILTER_VALIDATE_INT ) ) {
             $limit = filter_var( $_REQUEST['limit'], FILTER_VALIDATE_INT );
         }
@@ -246,13 +253,24 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
 */
 
         $actionData = apply_filters( 'glm-member-db-front-search-request', $actionData );
+
+        /*
+         * Check for which view file to use, else default to list
+         */
+
+        $view = "list";
+        if (isset($actionData['request']['view']) && $actionData['request']['view'] != "" ) {
+            $view = strtolower($actionData['request']['view']);
+        }
+        if ( isset( $_REQUEST['view'] ) && $_REQUEST['view'] ) {
+            $view = $_REQUEST['view'];
+        }
+
         // Check for "show" shortcode parameter (what elements to show on the page)
-        $settings = array();
-        $showList = isset( $actionData['request']['show'] ) ? $actionData['request']['show'] : false;
-        if ($showList) {
+        if (isset($actionData['request']['show']) && trim($actionData['request']['show']) != '') {
 
             // Separate options and see if we have any
-            $show = explode(',', $showList);
+            $show = explode(',', $actionData['request']['show']);
             if (count($show) > 0) {
 
                 // For each option
@@ -263,14 +281,14 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
                     // If we're setting all
                     if ($s == 'all') {
 
-                        while (list($key, $val) = each($GLOBALS['showOpts'])) {
+                        foreach ($GLOBALS['showOpts'] as $key=>$val) {
                             $settings[$val] = true;
                         }
 
                     // Or we're clearing all
                     } elseif ($s == 'none') {
 
-                        while (list($key, $val) = each($GLOBALS['showOpts'])) {
+                        foreach ($GLOBALS['showOpts'] as $key=>$val) {
                             $settings[$val] = false;
                         }
 
@@ -306,6 +324,24 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
 
             }
         }
+// echo "<pre>Settings Before Button Checks".print_r($settings,1)."</pre>";
+
+        // Handle what to show when only certain things are included
+        $settings['list_map_show_button'] = true;
+        $settings['list_map_show_container'] = true;
+        $settings['list_search_show_button'] = true;
+        $settings['list_show_outer_container'] = true;
+        if ($settings['list_show_map'] && (!isset($settings['list_show_search']) || !$settings['list_show_search'])) {
+            $settings['list_map_show_opened'] = true;
+            $settings['list_map_show_button'] = false;
+            $settings['list_map_show_container'] = false;
+            $settings['list_show_outer_container'] = false;
+        }
+        if ($settings['list_show_search'] && (!isset($settings['list_show_map']) || !$settings['list_show_map'])) {
+            $settings['list_search_show_button'] = false;
+            $settings['list_show_search_filters_opened'] = true;
+            $settings['list_show_outer_container'] = false;
+        }
 
         // Apply any provided text search to name, description, short description, and street address
         if ( isset($actionData['request']['text-search']) && trim($actionData['request']['text-search']) != '') {
@@ -848,6 +884,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
         /*
          * Check for which view file to use, else default to list
          */
+/*
         $view = "list";
         if (isset($actionData['request']['view']) && $actionData['request']['view'] != "" ) {
             $view = strtolower($actionData['request']['view']);
@@ -855,6 +892,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
         if ( isset( $_REQUEST['view'] ) && $_REQUEST['view'] ) {
             $view = $_REQUEST['view'];
         }
+*/
 
         /*
          * Check for a blank start - No members selected, just search form
@@ -894,7 +932,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
 
         // Get a simplified full list of member data for the map. Limit by selected Alpha is used.
 //        require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/memberDataByLatLon.php';
-  //      $MapItems = new GlmMembersFront_members_memberDataByLatLon($this->wpdb, $this->config);
+//        $MapItems = new GlmMembersFront_members_memberDataByLatLon($this->wpdb, $this->config);
         $mapItems = $this->getSimpleMemberInfoList($where.$alphaWhere, true);
 
         /*
@@ -1048,8 +1086,11 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
             }
         }
 
+        // echo "<pre>Settings at End".print_r($settings,1)."</pre>";
+
         // Compile template data
         $templateData = array(
+            'showSettings'         => $settings,
             'haveMembers'          => $haveMembers,
             'members'              => $list,
             'membersFound'         => $membersFound,
@@ -1117,8 +1158,7 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo
             'menuItemRedirect' => false,
             'modelRedirect'    => false,
             'view'             => $viewFile,
-            'data'             => $templateData,
-            'settings'         => $settings
+            'data'             => $templateData
         );
 
     }

diff --git a/views/front/members/list.html b/views/front/members/list.html
index 60022f1..a305a44 100755 (executable)
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -1,41 +1,55 @@
-{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 $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>
-        <link rel="stylesheet" href="//unpkg.com/leaflet-gesture-handling/dist/leaflet-gesture-handling.min.css" type="text/css">
-        <script src="//unpkg.com/leaflet-gesture-handling"></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 $showSettings.list_show_outer_container}
 
+    {include file='front/members/header.html'}
+
+
+    <div class="glm-member-db-list glm-member-db-{$view}-view
+        {if $showSettings.list_map_show_opened || $view == 'map'}map-opened {else}map-closed {/if}
+        {if $showSettings.list_show_search_filters_opened}filters-opened{else}filters-closed{/if}
+    ">
 {/if}
-    {apply_filters('glm-member-db-front-members-list-pageTop', '')}
-    <div class="glm-member-list-inner-wrapper">
-    {if $settings.list_show_map}
-        <div id="glm-member-list-map-toggle" class="button glm-button">Map</div>
-    {/if}
-    {if $settings.list_show_search}
-        <div id="glm-member-list-filters-wrapper">
-            <div id="glm-member-list-filters-button" class="button glm-button glm-member-list-filters-toggle">
-                FILTERS
-            </div>
-            <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>
+        {apply_filters('glm-member-db-front-members-list-pageTop', '')}
+
+{if $showSettings.list_map_show_container}
+        <div class="glm-member-list-inner-wrapper">
+{/if}
+
+        {if $showSettings.list_show_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>
+                <link rel="stylesheet" href="//unpkg.com/leaflet-gesture-handling/dist/leaflet-gesture-handling.min.css" type="text/css">
+                <script src="//unpkg.com/leaflet-gesture-handling"></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 $showSettings.list_map_show_button}
+                <div id="glm-member-list-map-toggle" class="button glm-button">View Map</div>
+            {/if}
+
+        {/if} {* list_show_map *}
+
+        {if $showSettings.list_show_search}
+
+            <div id="glm-member-list-filters-wrapper">
+                {if $showSettings.list_search_show_button}
+                    <div id="glm-member-list-filters-button" class="button glm-button glm-member-list-filters-toggle">
+                        FILTERS
+                    </div>
+                {/if}
+                <div id="glm-member-list-filters-box">
+                    {if $showSettings.list_search_show_button}
+                        <div id="glm-member-list-filters-close" class="button glm-button glm-member-list-filters-toggle">Close</div>
+                    {/if}
                     <form action="{$thisUrl}?glm_action=list#glm-member-list-filters-button" method="post" enctype="multipart/form-data">
                         {if isset($smarty.request.s)}<input type="hidden" name="s" value="{$smarty.request.s|escape}">{/if}
                         <div class="glma-small-12 glma-columns glm-member-search glm-member-entry-container glm-member-container">
@@ -43,55 +57,56 @@
                             <div>
                                 <h3>Refine Search</h3>
                             </div>
-                            {if $settings.list_show_search_category}
+                            {if $showSettings.list_show_search_category}
                                 <div>
                                     By Category:
-
                                     <select name="categorySearch" id="categorySelect">
-                                    {if !$singleCategory}
-                                        <option value="">(all)</option>
-                                    {/if}
-                                    {foreach from=$categories item=v}
-                                        <option value="{$v.id}"{if $v.default} selected="selected"{/if}>
-                                            {if $v.parent}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
-                                        </option>
-                                    {/foreach}
-                                    </select>
-                                </div>
-                            {/if}
-                            {if $settings.list_show_search_amenities}
-                                {if $amenities|@count gt 0}
-                                <div>
-                                    By Amenities:
-                                    <select name="amenitySearch[]" id="amenitySelect" title="Click to Select Amenities" multiple="multiple">
-                                        {foreach from=$amenities item=v}
-                                            <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
-                                                {$v.name}
+                                        {if !$singleCategory}
+                                            <option value="">(all)</option>
+                                        {/if}
+                                        {foreach from=$categories item=v}
+                                            <option value="{$v.id}"{if $v.default} selected="selected"{/if}>
+                                                {if $v.parent}&nbsp;&nbsp;&nbsp;&nbsp;{/if}{$v.name}
                                             </option>
                                         {/foreach}
                                     </select>
                                 </div>
+                            {/if} {* list_show_search_category *}
+
+                            {if $showSettings.list_show_search_amenities}
+                                {if $amenities|@count gt 0}
+                                    <div>
+                                        By Amenities:
+                                        <select name="amenitySearch[]" id="amenitySelect" title="Click to Select Amenities" multiple="multiple">
+                                            {foreach from=$amenities item=v}
+                                                <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
+                                                    {$v.name}
+                                                </option>
+                                            {/foreach}
+                                        </select>
+                                    </div>
                                 {/if}
-                            {/if}
-                            {if $settings.list_show_search_region}
+                            {/if} {* list_show_search_amenities *}
+
+                            {if $showSettings.list_show_search_region}
                                 {if $regions|@count gt 0}
-                                <div>
-                                    By Regions:
-                                    <select name="regionUserSearch[]">
-                                        {if $regions|@count gt 1}
-                                            <option value"">(all)</option>
-                                        {/if}
-                                        {foreach from=$regions item=v}
-                                            <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
-                                                {$v.name}
-                                            </option>
-                                        {/foreach}
+                                    <div>
+                                        By Regions:
+                                        <select name="regionUserSearch[]">
+                                            {if $regions|@count gt 1}
+                                                <option value"">(all)</option>
+                                            {/if}
+                                            {foreach from=$regions item=v}
+                                                <option value="{$v.id}" {if $v.default} selected="selected"{/if}>
+                                                    {$v.name}
+                                                </option>
+                                            {/foreach}
                                         </select>
                                     </div>
                                 {/if}
-                            {/if}
+                            {/if} {* list_show_search_region *}
 
-                            {if $settings.list_show_search_city}
+                            {if $showSettings.list_show_search_city}
                                 {if $cities|@count gt 0}
                                     <div>
                                         By Cities:
@@ -107,165 +122,178 @@
                                         </select>
                                     </div>
                                 {/if}
-                            {/if}
+                            {/if} {* list_show_search_city *}
 
+                            {if $showSettings.list_show_search_text}
 
-                            {if $settings.list_show_search_text}
                                 <div>
                                     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> <!-- glm-member-list-filters-box -->
-        </div> <!-- glm-member-list-wrapper -->
-        {/if} {*list_show_search*}
-        {if $settings.list_show_map}
+                            <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-filters-wrapper *}
+
+        {/if} {* list_show_search *}
 
+        {if $showSettings.list_show_map}
             {apply_filters('glm-member-db-front-members-list-mapTop', '')}
             <div id="glm-locationMap-container">
-
                 {if $settings.selected_map_interface == 1}
-                    <!--  Leaflet Map -->
+                    {* Leaflet Map *}
                     <div id="LeafletMapContainer" style="height: 400px; width: 100%; border: 1px black solid; z-index: +0; margin: 0 auto;"></div>
                 {/if}
-
                 {if $settings.selected_map_interface == 2}
-                    <!-- Google Map -->
+                    {* Google Map *}
                     <div id="glm-locationMap" class="glm-map">(map loads here)</div>
                 {/if}
-
             </div>
             {apply_filters('glm-member-db-front-members-list-mapBottom', '')}
-        {/if}
-        {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
 
+            {* Member information displayed in map bubbles *}
 
-        <!-- Member information displayed in map bubbles -->
-        {foreach $mapItems as $m}
-            <div id="map_info_{$m.id}" class="glm-hidden">
-                {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.member)}
-                {if $m.logo && $settings.list_map_show_logo}
-                    <div class="glm-member-list-image">
-                        <img src="{$glmPluginMediaUrl}/images/{$settings.list_map_logo_size}/{$m.logo}">
-                    </div>
-                {/if}
-                <div class="glm-map-member-name">
-                    {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}
+            {foreach $mapItems as $m}
+                <div id="map_info_{$m.id}" class="glm-hidden">
+                    {apply_filters('glm-member-db-front-members-list-mapBubbleTop', '', $m.member)}
+                    {if $m.logo && $showSettings.list_map_show_logo}
+                        <div class="glm-member-list-image">
+                            <img src="{$glmPluginMediaUrl}/images/{$settings.list_map_logo_size}/{$m.logo}">
+                        </div>
                     {/if}
-                </div>
-                {if $settings.list_map_show_address}
-                    <p class="glm-map-member-address">
-                        {if $settings.list_map_show_street}
-                            {if $m.addr1}{$m.addr1}<br>{/if}
-                            {if $m.addr2}{$m.addr2}<br>{/if}
+                    <div class="glm-map-member-name">
+                        {if $showSettings.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}
                         {/if}
-                        {if $settings.memb_info_location && $settings.list_map_show_citystatezip}
-                            {if $m.city}{$m.city}{if $m.state}, {/if}{/if}{if $m.state}{$m.state}{/if}{if $m.zip} {$m.zip}{/if}
+                    </div>
+                    {if $showSettings.list_map_show_address}
+                        <p class="glm-map-member-address">
+                            {if $showSettings.list_map_show_street}
+                                {if $m.addr1}{$m.addr1}<br>{/if}
+                                {if $m.addr2}{$m.addr2}<br>{/if}
+                            {/if}
+                            {if $settings.memb_info_location && $showSettings.list_map_show_citystatezip}
+                                {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 && $showSettings.list_map_show_country}
+                                {$m.country}
+                            {/if}
+                        </p>
+                    {/if} {* list_map_show_address *}
+
+                    <div class="glm-member-list-info">
+                        <p class="glm-member-list-map-info">
+                            {if $m.phone && $showSettings.list_map_show_phone}<b>Phone:</b> <a href="tel:{apply_filters('glm_associate_phone_filter_tel', $m.phone)}">{apply_filters('glm_associate_phone_filter', $m.phone)}</a><br>{/if}
+                            {if $m.toll_free && $showSettings.list_map_show_tollfree}<a href="tel:{apply_filters('glm_associate_phone_filter_tel', $m.toll_free)}">{apply_filters('glm_associate_phone_filter', $m.toll_free)}</a><br>{/if}
+                            {if $m.email && $showSettings.list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$m.email}">{$m.email}</a><br>{/if}
+                            {if $m.region && $showSettings.list_map_show_region}<b>Region:</b> {$m.region}<br>{/if}
+                            {if $m.url && $showSettings.list_map_show_url}<a href="{$m.url}"{if $showSettings.list_map_show_url_newtarget} target="_blank"{/if}>Website</a><br>{/if}
+                        </p>
+                        {if isset($m.descr) && $showSettings.list_map_show_descr}{$m.descr|nl2br}<br>{/if}
+                        {if $m.short_descr && $showSettings.list_map_show_short_descr}{$m.short_descr|truncate:200}<br>{/if}
+                        {if $showSettings.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}">More Info</a>
                         {/if}
-                        {if $m.country && $settings.list_map_show_country}
-                            {$m.country}
+                        {if isset($m.categories) && $showSettings.list_map_show_categories}
+                            <div class="glm-member-list-items">
+                                <b>{$terms.term_member_cap} Categories</b>
+                                <ul>
+                                    {if isset($m.categories)}
+                                        {foreach $m.categories as $c}
+                                            <li>
+                                                {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
+                                            </li>
+                                        {/foreach}
+                                    {/if}
+                                </ul>
+                            </div>
+                        {/if} {* categories *}
+
+
+                        {* Not using credit cards for now  {literal}
+                            {if $m.cc_type && $showSettings.list_map_show_creditcards}
+                                <div class="glm-member-list-items">
+                                    <b>Credit Cards Accepted:</b>
+                                    <ul>
+                                {if isset($m.cc_type)}
+                                    {foreach $m.cc_type.names as $c}
+                                        <li>{$c}</li>
+                                    {/foreach}
+                                {/if}
+                                    </ul>
+                                </div>
+                            {/if}
+                        {/literal} *}
+
+
+                        {if $showSettings.list_map_show_amenities}
+                            <div class="glm-member-list-items">
+                                <b>Amenities:</b>
+                                <ul>
+                            {if isset($m.amenities)}
+                                {foreach $m.amenities as $a}
+                                    <li>{$a.name}</li>
+                                {/foreach}
+                            {/if}
+                                </ul>
+                            </div>
                         {/if}
-                    </p>
-                {/if} {*list_map_show_address*}
-                <div class="glm-member-list-info">
-                    <p class="glm-member-list-map-info">
-                        {if $m.phone && $settings.list_map_show_phone}<b>Phone:</b> <a href="tel:{apply_filters('glm_associate_phone_filter_tel', $m.phone)}">{apply_filters('glm_associate_phone_filter', $m.phone)}</a><br>{/if}
-                        {if $m.toll_free && $settings.list_map_show_tollfree}<a href="tel:{apply_filters('glm_associate_phone_filter_tel', $m.toll_free)}">{apply_filters('glm_associate_phone_filter', $m.toll_free)}</a><br>{/if}
-                        {if $m.email && $settings.list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$m.email}">{$m.email}</a><br>{/if}
-                        {if $m.region && $settings.list_map_show_region}<b>Region:</b> {$m.region}<br>{/if}
-                        {if $m.url && $settings.list_map_show_url}<a href="{$m.url}"{if $settings.list_map_show_url_newtarget} target="_blank"{/if}>Website</a><br>{/if}
-                    </p>
-                    {if isset($m.descr) && $settings.list_map_show_descr}{$m.descr|nl2br}<br>{/if}
-                    {if $m.short_descr && $settings.list_map_show_short_descr}{$m.short_descr|truncate:200}<br>{/if}
-                    {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}">More Info</a>
-                    {/if}
-                    {if isset($m.categories) && $settings.list_map_show_categories}
-                        <div class="glm-member-list-items">
-                            <b>{$terms.term_member_cap} Categories</b>
-                            <ul>
-                            {foreach $m.categories as $c}
-                                <li>
-                                    {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
-                                </li>
-                            {/foreach}
-                            </ul>
-                        </div>
-                    {/if}
-    <!-- Not using credit cards for now  {literal}
-                    {if $m.cc_type && $settings.list_map_show_creditcards}
-                        <div class="glm-member-list-items">
-                            <b>Credit Cards Accepted:</b>
-                            <ul>
-                            {foreach $m.cc_type.names as $c}
-                                <li>{$c}</li>
-                            {/foreach}
-                            </ul>
-                        </div>
-                    {/if}
-     {/literal} -->
-                    {if $settings.list_map_show_amenities}
-                        <div class="glm-member-list-items">
-                            <b>Amenities:</b>
-                            <ul>
-                            {foreach $m.amenities as $a}
-                                <li>{$a.name}</li>
-                            {/foreach}
-                            </ul>
-                        </div>
-                    {/if}
-                </div>
-                {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.member)}
-            </div> <!-- End of information displayed in map bubbles -->
-        {/foreach}
+                    </div>
+                    {apply_filters('glm-member-db-front-members-list-mapBubbleBottom', '', $m.member)}
+                </div> <!-- End of information displayed in map bubbles -->
+
+            {/foreach} {* mapItems *}
+
+        {/if} {* list_show_map *}
+
+        {apply_filters('glm-member-db-front-members-list-listHeaderTop', '')}
+
         {if $haveFeaturedMembers}
 
             <h3 id="glm-featured-members-title">Featured</h3>
 
             <ul id="glm-featured-members-grid" class="featured-grid glma-small-block-grid-1 glma-medium-block-grid-2 glma-large-block-grid-3">
-                {foreach $featuredMembers as $fm}
-                    <li class="featured-grid-item-wrapper">
-                        <a class="featured-grid-item" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$fm.member_slug}/">
-                            {if $fm.logo && $settings.list_show_logo}
-                                <div class="glm-member-list-has-image">
-                                    <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$fm.logo}">
-                                </div>
-                            {elseif $settings.list_show_logo_filler}
-                                <div class="glm-member-list-has-image">
-                                    <img class="glm-member-list-image-filler" src="{$assetsUrl}/filler_s.gif">
+            {foreach $featuredMembers as $fm}
+                <li class="featured-grid-item-wrapper">
+                    <a class="featured-grid-item" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$fm.member_slug}/">
+                {if $fm.logo && $showSettings.list_show_logo}
+                        <div class="glm-member-list-has-image">
+                            <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$fm.logo}">
+                        </div>
+                {elseif $showSettings.list_show_logo_filler}
+                        <div class="glm-member-list-has-image">
+                            <img class="glm-member-list-image-filler" src="{$assetsUrl}/filler_s.gif">
+                        </div>
+                {else}
+                        <div class="glm-member-list-missing-image"></div>
+                {/if}
+                        <div class="featured-grid-item-info">
+                            <h4 class="featured-member-title">{$fm.member_name}</h4>
+
+                            {if $fm.short_descr && $settings.list_show_short_descr}
+                                <div class="featured-member-description">
+                                    {$fm.short_descr|nl2br}
                                 </div>
-                            {else}
-                                <div class="glm-member-list-missing-image"></div>
                             {/if}
-                            <div class="featured-grid-item-info">
-                                <h4 class="featured-member-title">{$fm.member_name}</h4>
-
-                                {if $fm.short_descr && $settings.list_show_short_descr}
-                                    <div class="featured-member-description">
-                                        {$fm.short_descr|nl2br}
-                                    </div>
-                                {/if}
-                            </div>
-                        </a>
-                    </li>
-                {/foreach}
+                        </div>
+                    </a>
+                </li>
+            {/foreach} {* featuredMembers *}
             </ul>
-        {/if}
 
+        {/if} {* haveFeaturedMembers *}
 
-        {if $settings.list_show_list && !$blankStart}
+        {if $showSettings.list_show_list && !$blankStart}
             {if $settings.list_header_text}
-                <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
+            <h3 class="glm-member-db-list-header-title">{$settings.list_header_text}</h3>
             {elseif apply_filters('is_page', 'search')}
-                <h1 class="glm-member-db-list-header-title member-search-page-title">List of {$terms.term_member_plur_cap}</h1>
+            <h1 class="glm-member-db-list-header-title member-search-page-title">List of {$terms.term_member_plur_cap}</h1>
             {else}
-                <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
+            <h3 class="glm-member-db-list-header-title">List of {$terms.term_member_plur_cap}</h3>
             {/if}
             {if $haveMembers}
 
@@ -275,16 +303,20 @@
 
                 <!-- Member information displayed in list -->
 
-                <div class="glm-member-list-listing-container">
-                {if $settings.list_show_search_alpha && !apply_filters("is_page", 'search')}
+
+                {* Alpha List *}
+
+                {if $showSettings.list_show_search_alpha && !apply_filters("is_page", 'search')}
                     <div class="glm-alpha-links">
                         <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s) && $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}#glm-member-list-filters-button" class="glm-alpha-link{if !$alphaSelected} glm-alpha-link-selected{/if}">All</a>
-                {foreach $alphaList as $a}
-                        <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}{if isset($smarty.request.s) && $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}#glm-member-list-filters-button" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
-                {/foreach}
-                </div>
+                        {foreach $alphaList as $a}
+                            <a href="{$thisUrl}?glm_action=list&alpha={$a.alpha}&textSearch={$textSearch}{if isset($smarty.request.s) && $smarty.request.s}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}#glm-member-list-filters-button" class="glm-alpha-link{if $a.default} glm-alpha-link-selected{/if}">{$a.alpha}</a>
+                        {/foreach}
+                    </div>
                 {/if}
 
+                {* Page selection top *}
+
                 {if $paging}
                     {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}
                         <br>
@@ -296,134 +328,153 @@
                     {/if}
                     <br>
                     <div class="glm-members-found">
-                    showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
+                        showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
                     </div>
                 {/if}
 
+                {* Members List *}
 
-                {* Loading members with ajax *}
                 {if $settings.list_ajax_pagination}
-                <div id="glm-ajax-list">
-                    loading...
-                </div>
+                    <div id="glm-ajax-list">
+                        loading...
+                    </div>
                 {else}
-                    {include file='front/members/listContainer.html'}
+                    {if $view == list}
+                        {include file='front/members/listTypeList.html'}
+                    {/if}
+                    {if $view == grid}
+                        {include file='front/members/listTypeGrid.html'}
+                    {/if}
                 {/if}
 
+                {* Page selection bottom *}
 
-        {if $paging}
-            {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}
-                <br>
                 <div class="paging-container">
-                    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}#glm-member-list-filters-button" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>< Previous page</a>
-                    <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}#glm-member-list-filters-button" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page ></a>
+                    {if $paging}
+                        {if ( $prevStart || $nextStart ) && !$settings.list_ajax_pagination}
+                            <br>
+                            <div class="paging-container">
+                                <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Previous&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}#glm-member-list-filters-button" class="glm-alpha-link" {if !$prevStart} style="pointer-events: none; opacity: 0.5;"{/if}>< Previous page</a>
+                                <a href="{$thisUrl}?glm_action=list&textSearch={$textSearch}{if isset($smarty.request.s)}&s={$smarty.request.s|escape}{/if}&categorySearch={$catSearchSelected}&regionSearch={$regionSearchSelected}&citySearch={$citySearchSelected}&pageSelect=Next&prevStart={$prevStart}&nextStart={$nextStart}&limit={$limit}&alpha={$alphaSelected}#glm-member-list-filters-button" class="glm-alpha-link" {if !$nextStart} style="pointer-events: none; opacity: 0.5;"{/if}>Next page ></a>
+                            </div>
+                            <br>
+                        {/if}
+                        {if $nextStart && $settings.list_ajax_pagination}
+                            <a href="#" class="glm-show-more test" data-next="{$nextStart}">[ Load More ]</a>
+                        {/if}
+                        <br>
+                        <div class="glm-members-found">
+                            showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
+                        </div>
+                    {/if}
                 </div>
-                <br>
-            {/if}
-            {if $nextStart && $settings.list_ajax_pagination}
-                <a href="#" class="glm-show-more test" data-next="{$nextStart}">[ Load More ]</a>
+                {apply_filters('glm-member-db-front-members-list-pageBottom', '')}
+
+            {else}
+                <div>(no {$terms.term_member_plur} listed)</div>
             {/if}
-            <br>
-            <div class="glm-members-found">
-                showing <span class="aStart">{$start}</span> through <span class="aLastDisplayed">{$lastDisplayed}</span> of <span class="aTotal">{$filteredMembersFound}</span>
-            </div>
-        {/if}
-        {apply_filters('glm-member-db-front-members-list-pageBottom', '')}
- {else}
-        <div>(no {$terms.term_member_plur} listed)</div>
- {/if}
 
-    {/if} {*list_show_list*}
+        {/if} {* list_show_list *}
 
-    <script>
-        jQuery(document).ready(function($) {
-            {if $settings.list_ajax_pagination}
-                var nextStart    = {if $nextStart}{$nextStart}{else}0{/if};
-                var numberShown  = 0;
-                var totalMembers = {$filteredMembersFound};
+{if $showSettings.list_map_show_container}
+    </div> {* glm-member-list-inner-wrapper *}
+{/if}
+{if $showSettings.list_show_outer_container}
+    </div> {* glm-member-db-list *}
+{/if}
+
+<script type="text/javascript">
+
+    jQuery(document).ready(function($) {
+
+        {if $settings.list_ajax_pagination}
+            var nextStart    = {if $nextStart}{$nextStart}{else}0{/if};
+            var numberShown  = 0;
+            var totalMembers = {$filteredMembersFound};
+
+            jQuery.ajax({
+                url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersList&limit={$settings.list_pagination_count}{$ajaxRequest}&alpha={$alphaSelected}',
+                cache: false,
+                async: true,
+                dataType: 'html',
+                success: function( html ){
+                    $('#glm-ajax-list').html( html );
+                    numberShown += {$settings.list_pagination_count};
+                },
+            });
 
+            // Show More link
+            $(document).on('click', 'a.glm-show-more', function(e){
+                e.preventDefault();
+                // var nextStart = $(this).data('next');
+                var showMoreButton = $(this);
                 jQuery.ajax({
-                    url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersList&limit={$settings.list_pagination_count}{$ajaxRequest}&alpha={$alphaSelected}',
+                    url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersList&limit={$settings.list_pagination_count}{$ajaxRequest}&pageSelect=Next&nextStart=' + nextStart + '&ajaxNext=1&alpha={$alphaSelected}',
                     cache: false,
                     async: true,
                     dataType: 'html',
                     success: function( html ){
-                        $('#glm-ajax-list').html( html );
+                        $('#glm-ajax-list').append( html );
+                        // $('.aStart').html(nextStart + 1);
+                        nextStart += {$settings.list_pagination_count};
+                        if ( nextStart > totalMembers ) {
+                            nextStart = totalMembers;
+                            $('.aLastDisplayed').html(nextStart);
+                        } else {
+                            $('.aLastDisplayed').html(nextStart - 1);
+                        }
                         numberShown += {$settings.list_pagination_count};
+                        console.log('shown: ', numberShown);
+                        console.log( 'nextStart', nextStart);
+                        console.log( 'totalMembers', totalMembers);
+                        if ( numberShown >= totalMembers ) {
+                            showMoreButton.remove();
+                        }
                     },
                 });
+            });
+        {/if} {* list_ajax_pagination *}
 
-                // Show More link
-                $(document).on('click', 'a.glm-show-more', function(e){
-                    e.preventDefault();
-                    // var nextStart = $(this).data('next');
-                    var showMoreButton = $(this);
-                    jQuery.ajax({
-                        url: '{$ajaxUrl}?action=glm_members_admin_ajax&glm_action=membersList&limit={$settings.list_pagination_count}{$ajaxRequest}&pageSelect=Next&nextStart=' + nextStart + '&ajaxNext=1&alpha={$alphaSelected}',
-                        cache: false,
-                        async: true,
-                        dataType: 'html',
-                        success: function( html ){
-                            $('#glm-ajax-list').append( html );
-                            // $('.aStart').html(nextStart + 1);
-                            nextStart += {$settings.list_pagination_count};
-                            if ( nextStart > totalMembers ) {
-                                nextStart = totalMembers;
-                                $('.aLastDisplayed').html(nextStart);
-                            } else {
-                                $('.aLastDisplayed').html(nextStart - 1);
-                            }
-                            numberShown += {$settings.list_pagination_count};
-                            console.log('shown: ', numberShown);
-                            console.log( 'nextStart', nextStart);
-                            console.log( 'totalMembers', totalMembers);
-                            if ( numberShown >= totalMembers ) {
-                                showMoreButton.remove();
-                            }
-                        },
-                    });
-                });
-            {/if}
-
-            jQuery('select[multiple]').asmSelect();
-
-            // Show search filters box
-            {if $settings.list_show_search}
-
-                // Float filter box
+        jQuery('select[multiple]').asmSelect();
 
-                    var fixmeTop = $('#glm-member-list-filters-button').offset().top;
-                    $(window).scroll(function() {
+        // Show search filters box
+        {if $showSettings.list_show_search && $showSettings.list_search_show_button}
 
-                        var currentScroll = $(window).scrollTop();
-                        if (currentScroll >= fixmeTop-{$settings.list_floating_search_distance_top} && {$settings.list_floating_search}) {
-                            $('#glm-member-list-filters-wrapper').css({
-                                position: 'fixed',
-                                top: '{$settings.list_floating_search_distance_top}px',
-                                transform: 'translateX(0%)'
-                            });
-                        } else {
-                            $('#glm-member-list-filters-wrapper').css({
-                                position: 'relative',
-                                top: '0',
-                                transform: 'translateX(0%)'
-                            });
-                        }
+            // Float filter box
+            var fixmeTop = $('#glm-member-list-filters-button').offset().top;
+            $(window).scroll(function() {
 
+                var currentScroll = $(window).scrollTop();
+                if (currentScroll >= fixmeTop-{$settings.list_floating_search_distance_top} && {$settings.list_floating_search}) {
+                    $('#glm-member-list-filters-wrapper').css({
+                        position: 'fixed',
+                        top: '{$settings.list_floating_search_distance_top}px',
+                        transform: 'translateX(0%)'
                     });
-                $(".glm-member-list-filters-toggle").click( function() {
-                    $(".glm-member-db-{$view}-view").toggleClass("filters-opened");
-                    $(".glm-member-db-{$view}-view").toggleClass("filters-closed");
-                    $("#glm-locationMap-container").one("webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend",
-                        function() {
-                            var center = map.getCenter();
-                            google.maps.event.trigger(map, "resize");
-                            map.setCenter(center);
-                        });
+                } else {
+                    $('#glm-member-list-filters-wrapper').css({
+                        position: 'relative',
+                        top: '0',
+                        transform: 'translateX(0%)'
                     });
-            {/if} // settings.list_show_search
+                }
+
+            });
+            $(".glm-member-list-filters-toggle").click( function() {
+                $(".glm-member-db-{$view}-view").toggleClass("filters-opened");
+                $(".glm-member-db-{$view}-view").toggleClass("filters-closed");
+/* NEED TO FIX THIS FOR LEAFLET
+                $("#glm-locationMap-container").one("webkitTransitionEnd otransitionend oTransitionEnd msTransitionEnd transitionend",
+                    function() {
+                        var center = map.getCenter();
+                        google.maps.event.trigger(map, "resize");
+                        map.setCenter(center);
+                    });
+                });
+*/
+        {/if} // settings.list_show_search
 
-    {if $settings.list_show_map}
+        {if $showSettings.list_show_map}
 
             /*
              * Map operations
@@ -433,224 +484,191 @@
             var startLon = $('#glmLng').val();
             var defZoom = Number({$settings.maps_default_zoom});
 
-      {if $settings.selected_map_interface == 1}
-
-            /*
-             *  Leaflet Map
-             *  API reference: https://leafletjs.com/reference-1.3.2.html
-             */
-
-            function initMap() {
-
-                var leafletMap = L.map('LeafletMapContainer', {
-                    gestureHandling: true
-                });
-                leafletMap.setView([{$settings.maps_default_lat}, {$settings.maps_default_lon}], defZoom);
-                var leafletTileServer = '{$settings.leaflet_tile_server}/{$settings.leaflet_tile_server_key}/' + {literal}'{z}/{x}/{y}.png'{/literal};
-                var leafletMinZoom = 3;
-                var leafletMaxZoom = 19;
-                var clusterRadiusMax = 40;
-                var geocoder;
-
-                // Loading features
-                var loadingControl = L.Control.loading({
-                    separate: true,
-                    delayIndicator: 500
-                });
-                leafletMap.addControl(loadingControl);
+            {if $settings.selected_map_interface == 1}
 
-                // 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>',
-                   minZoom: leafletMinZoom,
-                   maxZoom: leafletMaxZoom,
-                   id: 'nothot'
-                }).addTo(leafletMap);
+                {*
+                 *  Leaflet Map
+                 *  API reference: https://leafletjs.com/reference-1.3.2.html
+                 *}
 
+                function initMap() {
 
-            {if $mapItems}
+                    var leafletMap = L.map('LeafletMapContainer', {
+                        gestureHandling: true
+                    });
+                    leafletMap.setView([{$settings.maps_default_lat}, {$settings.maps_default_lon}], defZoom);
+                    var leafletTileServer = '{$settings.leaflet_tile_server}/{$settings.leaflet_tile_server_key}/' + {literal}'{z}/{x}/{y}.png'{/literal};
+                    var leafletMinZoom = 3;
+                    var leafletMaxZoom = 19;
+                    var clusterRadiusMax = 40;
+                    var geocoder;
+
+                    // Loading features
+                    var loadingControl = L.Control.loading({
+                        separate: true,
+                        delayIndicator: 500
+                    });
+                    leafletMap.addControl(loadingControl);
 
-              {if $settings.use_cluster_markers}
-                var markerGroup = L.markerClusterGroup({
-                    maxClusterRadius: clusterRadiusMax
-                });
-              {else}
-                var markerGroup = L.featureGroup({
-                    maxClusterRadius: clusterRadiusMax
-                });
-              {/if}
+                    // 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>',
+                       minZoom: leafletMinZoom,
+                       maxZoom: leafletMaxZoom,
+                       id: 'nothot'
+                    }).addTo(leafletMap);
 
-                var mapContainerWidth = Number(leafletMap._container.clientWidth);
-                var maxPopupWidth = .65 * mapContainerWidth;
-                if (maxPopupWidth > 600) {
-                    maxPopupWidth = 600;
-                }
-                var mapContainerHeight = Number(leafletMap._container.clientHeight);
-                var maxPopupHeight = .7 * mapContainerHeight;
 
-              {foreach $mapItems as $m}
-                {if $m.lat != 0 && $m.lon != 0}
+                    {if $mapItems}
 
-                // 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 $settings.use_cluster_markers}
+                            var markerGroup = L.markerClusterGroup({
+                                maxClusterRadius: clusterRadiusMax
+                            });
+                        {else}
+                            var markerGroup = L.featureGroup({
+                                maxClusterRadius: clusterRadiusMax
+                            });
+                        {/if}
 
-                {/if}
-              {/foreach}
+                        var mapContainerWidth = Number(leafletMap._container.clientWidth);
+                        var maxPopupWidth = .65 * mapContainerWidth;
+                        if (maxPopupWidth > 600) {
+                            maxPopupWidth = 600;
+                        }
+                        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
+                                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}
 
-                leafletMap.addLayer(markerGroup);
+                        leafletMap.addLayer(markerGroup);
 
-                // Get outer bounds of all markers in the Feature Group
-                leafletMap.fitBounds(markerGroup.getBounds());
+                        // Get outer bounds of all markers in the Feature Group
+                        leafletMap.fitBounds(markerGroup.getBounds());
 
-            {/if} // havemembers
+                    {/if} {* mapItems *}
 
-                // When a marker is clicked, display the pop-up near the center of the map.
+                    // 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 });
-                });
+                    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} {* Map interface 1 *}
 
-      {/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
+                 *}
 
-            /*
-             * Google Maps
-             *  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'), {
+                            center: new google.maps.LatLng({$settings.maps_default_lat}, {$settings.maps_default_lon}),
+                            zoom: {$settings.maps_default_zoom},
+                        disableDefaultUI: false,
+                        mapTypeId: google.maps.MapTypeId.MAP,
+                    });
 
-                // 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}),
-                        zoom: {$settings.maps_default_zoom},
-                    disableDefaultUI: false,
-                    mapTypeId: google.maps.MapTypeId.MAP,
-                });
+                    var center = map.getCenter();
+                    google.maps.event.trigger(map, "resize");
+                    map.setCenter(center);
 
-                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}
-                if (currentScroll >= mapTop) {
-                    $('body,html').animate({
-                    scrollTop: $("#glm-locationMap-container").offset().top-100
-                    }, 50);
-                } else {
-                    $('body,html').animate({
+                    var currentScroll = $(window).scrollTop(); // get current position
+                    var mapTop = $("#glm-locationMap-container").offset().top-10;
+                    {if $showSettings.list_show_search}fixmeTop = $('#glm-member-list-filters-button').offset().top;{/if}
+                    if (currentScroll >= mapTop) {
+                        $('body,html').animate({
                         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) {
-                        //var myLocation = new google.maps.LatLng(position.coords.latitude, position.coords.longitude);
-                        //var pinIcon = new google.maps.MarkerImage(
-                                //'https://maps.google.com/mapfiles/kml/shapes/man.png',
-                            //null, /* size is determined at runtime */
-                            //null, /* origin is 0,0 */
-                            //null, /* anchor is bottom center of the scaled image */
-                            //new google.maps.Size(30, 30)
-                        //);
-                        //var myMarker = new google.maps.Marker({
-                            //map: map,
-                            //position: myLocation,
-                            //draggable: false,
-                            //animation: google.maps.Animation.DROP,
-                            //title: 'My Location',
-                            //icon: pinIcon,
-                            //zIndex: 100
-                        //});
-                    //});
-                //}
-
-
-                {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}
-                            });
+                        }, 50);
+                    } else {
+                        $('body,html').animate({
+                            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();
+
+                    {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
+                                        });
+                                    infowindow.open(map,this);
+                                });
+
+                                markers.push(marker);
+
+                                // Extend the map bounds to include this marker
+                                bounds.extend(marker.position);
 
-                            // Add a click listener for this marker
-                            marker.addListener('click', function() {
-                                    infowindow.setOptions({
-                                            content: this.descr
-                                    });
-                                infowindow.open(map,this);
+                            {/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
                             });
-
-                            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);
-
-                    // Check for first map idle (completely loaded) - Check max zoom
-                    var mapLoadedListener = google.maps.event.addListener(map, 'idle', function() {
-                        if (map.getZoom() > 14) {
-                            this.setZoom(14);
-                        }
-                        google.maps.event.removeListener(mapLoadedListener);
-                    });
 
-            } // initMap
-
-        {else}
+                        // 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) {
+                                this.setZoom(14);
+                            }
+                            google.maps.event.removeListener(mapLoadedListener);
+                        });
 
-        {/if} // havemembers
+                    {/if} {* mapItems *}
 
-      {/if}
+                } {* initMap *}
 
-    {/if}   // settings.list_show_map
+            {/if} {* Map interface 2 *}
 
-         // 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");
@@ -659,8 +677,8 @@
                     mapInitialized = true;
                 }
             });
-            {if $view != 'no-map'}
-                {if $settings.list_map_show_opened || $view == 'map'}
+            {if $showSettings.list_show_map}
+                {if $showSettings.list_map_show_opened || $view == 'map'}
                     // Start with map opened
                     initMap();
                     mapInitialized = true;
@@ -680,9 +698,12 @@
                 });
 
             });
-        });
-            </script>
 
-        </div><!-- glm-member-list-inner-wrapper-->
-    </div><!-- glm-member-db-list-view -->
-{include file='front/footer.html'}
+        {/if}   // settings.list_show_map
+
+    });
+</script>
+
+{if $showSettings.list_show_outer_container}
+    {include file='front/footer.html'}
+{/if}

diff --git a/views/front/members/listContainer.html b/views/front/members/listContainer.html
deleted file mode 100644 (file)
index fa1f2fd..0000000
--- a/views/front/members/listContainer.html
+++ /dev/null
@@ -1,214 +0,0 @@
-{if $view == grid}
-    <ul class="glma-small-block-grid-1 glma-medium-block-grid-2 glma-large-block-grid-3">
-    {foreach $members as $member}
-        <li class="glm-member-list-record">
-            {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
-            <div class="glm-member-db-border-wrap">
-                {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
-
-                {if $settings.list_show_detail_link && !$member.has_no_profile.value}
-                <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
-                {/if}
-
-                {if $member.featured}
-                <div class="glm-member-list-featured-tag">
-                    featured
-                </div>
-                {/if}
-
-                {if $member.logo && $settings.list_show_logo}
-                    <div class="glm-member-list-has-image">
-                        <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$member.logo}">
-                    </div>
-                {elseif $settings.list_show_logo_filler}
-                    <div class="glm-member-list-has-image">
-                        <img class="glm-member-list-image-filler" src="{$assetsUrl}/filler_s.gif">
-                    </div>
-                {else}
-                    <div class="glm-member-list-missing-image"></div>
-                {/if}
-                {if $settings.list_show_detail_link && !$member.has_no_profile.value}
-                </a>
-                {/if}
-                <div class="glm-member-list-info-wrapper">
-                    <h4 class="glm-member-title">
-                        {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}
-                        {/if}
-
-                    </h4>
-
-                    <div class="glm-member-list-sub-links">
-                        <ul>
-                            {if $member.url && $settings.list_show_url}<li><a href="{$member.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if}>Website</a></li>{/if}
-                            {* {if $member.phone && $settings.list_map_show_phone}<a href="tel:+{$member.phone}">Phone</a>{/if} *}
-                            {$packageLink = apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
-                            {if $packageLink}<li>{$packageLink}</li>{/if}
-                            {if $member.reservation_url}<li><a target="_blank" href="{$member.reservation_url}">Reserve Now</a></li>{/if}
-
-                            {if $settings.list_show_live_cam}
-                                {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam}
-                                    <li><a target="_blank" href="{$member.live_cam_url}">{$terms.term_webcam_cap}</a></li>
-                                {else if $member.live_cam_type.name == "Camera Image"}
-                                    <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?expanded=live-cam">{$terms.term_webcam_cap}</a></li>
-                                {/if}
-                            {/if}
-
-                            <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">View&nbsp;More</a></li>
-                            {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
-                        </ul>
-                    </div>
-                </div>
-            </div> <!-- End of glm-member-db-border-wrap -->
-        </li> <!-- end of li.glm-member-list-record -->
-    {/foreach} {*$members*}
-    </ul>
-                <!-- Grid view above -->
-
-{else}
-
-    <!-- List view below -->
-    {foreach $members as $member}
-    {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
-         <div class="glm-member-list-container glm-member-container glma-small-12 glma-columns {if $member.featured}featured{/if}">
-            {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
-
-            {if $member.featured}
-            <div class="glm-member-list-featured-tag">
-                featured
-            </div>
-            {/if}
-
-             <!-- Member Logo - Medium and up-->
-
-            <div class="glm-member-list-data glma-small-12 glma-columns">
-            {if $member.logo && $settings.list_show_logo}
-                <div class="glm-member-list-image-wrapper glma-right glma-small-12 glma-medium-4 glma-columns {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
-                    <div class="glm-member-list-image-border clearfix">
-                        <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$member.logo}">
-                    </div>
-               </div>
-            {/if}
-            <div class="glm-member-list-active-info glma-small-12 glma-medium-8 glma-columns glma-small-right glma-medium-left ">
-<!-- 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 && !$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}
-                    {/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>
-                                {/if}
-                                {if $member.state.value}
-                                    <span>{$member.state.value}</span>
-                                {/if}
-                                {if $member.zip}
-                                    {$member.zip}
-                                {/if}
-                            </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)}
-                    <div>
-                        {if $member.phone && $settings.list_show_phone}<span class="glm-member-db-phone">Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} </span>{/if}
-                        {if $member.toll_free && $settings.list_show_tollfree}<span class="glm-member-db-phone-tollfree">{apply_filters('glm_associate_phone_filter', $member.toll_free)}</span>{/if}
-                    </div>
-                {/if}
-                {if $settings.memb_info_location && $member.region && $settings.list_show_region}<div><b>Region:</b> {$member.region}</div>{/if}
-
-                <div class="glm-member-list-links">
-                    {apply_filters('glm-member-db-front-members-list-memberLinksTop', '', $member.member_pointer)}
-                    {if $member.url && $settings.list_show_url}<a class='glm-member-list-website-link' data-member-id="{$member.member_pointer}" data-member-slug="{$member.member_slug}" href="{$member.url}"{if $settings.list_show_url_newtarget} target="_blank"{/if} >Visit Website</a>{/if}
-                    {if $member.email && $settings.list_show_email}<a href="mailto:{$member.email}">Email</a>{/if}
-                    {if $member.reservation_url}<a target="_blank" href="{$member.reservation_url}">Reserve Now</a>{/if}
-                    {if $settings.list_show_live_cam}
-                        {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam}
-                            <a target="_blank" href="{$member.live_cam_url}">{$terms.term_webcam_cap}</a>
-                        {else if $member.live_cam_type.name == "Camera Image"}
-                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?expanded=live-cam">{$terms.term_webcam_cap}</a>
-                        {/if}
-                    {/if}
-                    {apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
-                </div>
-                <div class="glm-member-db-socials">
-                   {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)}
-                </div>
-
-                <div class="glm-member-list-description glma-small-12 glma-columns">
-                    <div>
-                    {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
-                    {if $member.short_descr && $settings.list_show_short_descr}
-                        {$member.short_descr|nl2br}
-                        {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}">More</a>
-                        {/if}
-                    {/if}
-                    {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)}
-                    </div>
-                    {if $member.categories && $settings.list_show_categories}
-                    <div class="glm-member-list-items">
-                        <b>{$terms.term_member_cap} Categories</b>
-                        <ul>
-                            {foreach $member.categories as $c}
-                                <li>
-                                    {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
-                                </li>
-                            {/foreach}
-                        </ul>
-                    {/if}
-                    {if $member.cc_type && $settings.list_show_creditcards}
-                        <b>Credit Cards Accepted:</b>
-                        <ul>
-                            {foreach $member.cc_type.names as $c}
-                                <li>{$c}</li>
-                            {/foreach}
-                        </ul>
-                    {/if}
-                    {if $member.amenities && $settings.list_show_amenities}
-                        <b>{$terms.term_member_cap} Amenities</b>
-                        <ul>
-                            {foreach $member.amenities as $A}
-                                <li>
-                                    {$A.name}
-                                </li>
-                            {/foreach}
-                        </ul>
-                    {/if}
-                    </div>
-                </div>
-                {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.member_pointer)}
-            </div>
-
-
-            {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 -->
-
-        </div>
-    {/foreach} {*$members*}
-
-{/if} {*end grid view check*}

diff --git a/views/front/members/listTypeGrid.html b/views/front/members/listTypeGrid.html
new file mode 100644 (file)
index 0000000..aef1387
--- /dev/null
+++ b/views/front/members/listTypeGrid.html
@@ -0,0 +1,70 @@
+{* List Type Grid *}
+
+<ul class="glma-small-block-grid-1 glma-medium-block-grid-2 glma-large-block-grid-3">
+    {foreach $members as $member}
+        <li class="glm-member-list-record">
+            {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
+            <div class="glm-member-db-border-wrap">
+                {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
+
+                {if $showSettings.list_show_detail_link && !$member.has_no_profile.value}
+                <a class="glm-member-list-image-wrapper" href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/">
+                {/if}
+
+                {if $member.featured}
+                <div class="glm-member-list-featured-tag">
+                    featured
+                </div>
+                {/if}
+
+                {if $member.logo && $showSettings.list_show_logo}
+                    <div class="glm-member-list-has-image">
+                        <img class="glm-member-list-image" src="{$glmPluginMediaUrl}/images/grid/{$member.logo}">
+                    </div>
+                {elseif $showSettings.list_show_logo_filler}
+                    <div class="glm-member-list-has-image">
+                        <img class="glm-member-list-image-filler" src="{$assetsUrl}/filler_s.gif">
+                    </div>
+                {else}
+                    <div class="glm-member-list-missing-image"></div>
+                {/if}
+                {if $set$showSettingst_show_detail_link && !$member.has_no_profile.value}
+                </a>
+                {/if}
+                <div class="glm-member-list-info-wrapper">
+                    <h4 class="glm-member-title">
+                        {if $showSettings.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}
+                        {/if}
+
+                    </h4>
+
+                    <div class="glm-member-list-sub-links">
+                        <ul>
+                            {if $member.url && $showSettings.list_show_url}<li><a href="{$member.url}"{if $showSettings.list_show_url_newtarget} target="_blank"{/if}>Website</a></li>{/if}
+                            {* {if $member.phone && $showSettings.list_map_show_phone}<a href="tel:+{$member.phone}">Phone</a>{/if} *}
+                            {$packageLink = apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
+                            {if $packageLink}<li>{$packageLink}</li>{/if}
+                            {if $member.reservation_url}<li><a target="_blank" href="{$member.reservation_url}">Reserve Now</a></li>{/if}
+
+                            {if $settings.list_show_live_cam}
+                                {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam}
+                                    <li><a target="_blank" href="{$member.live_cam_url}">{$terms.term_webcam_cap}</a></li>
+                                {else if $member.live_cam_type.name == "Camera Image"}
+                                    <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?expanded=live-cam">{$terms.term_webcam_cap}</a></li>
+                                {/if}
+                            {/if}
+
+                            <li><a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}">View&nbsp;More</a></li>
+                            {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
+                        </ul>
+                    </div>
+                </div>
+            </div> <!-- End of glm-member-db-border-wrap -->
+        </li> <!-- end of li.glm-member-list-record -->
+    {/foreach} {*$members*}
+</ul>

diff --git a/views/front/members/listTypeList.html b/views/front/members/listTypeList.html
new file mode 100644 (file)
index 0000000..867d0c6
--- /dev/null
+++ b/views/front/members/listTypeList.html
@@ -0,0 +1,162 @@
+{* List Type View *}
+
+{foreach $members as $member}
+
+    {apply_filters('glm-member-db-front-members-list-memberAbove', '', $member.member_pointer)}
+    <div class="glm-member-list-container glm-member-container glma-small-12 glma-columns {if $member.featured}featured{/if}">
+
+        {apply_filters('glm-member-db-front-members-list-memberTop', '', $member.member_pointer)}
+        {if $member.featured}
+            <div class="glm-member-list-featured-tag">
+                featured
+            </div>
+        {/if}
+
+        {* Member Logo - Medium and up *}
+
+        <div class="glm-member-list-data glma-small-12 glma-columns">
+            {if $member.logo && $showSettings.list_show_logo}
+                <div class="glm-member-list-image-wrapper glma-right glma-small-12 glma-medium-4 glma-columns {if !$settings.list_logo_for_mobile}mobile-hide{/if}">
+                    <div class="glm-member-list-image-border clearfix">
+                        <img src="{$glmPluginMediaUrl}/images/{$settings.list_logo_size}/{$member.logo}">
+                    </div>
+               </div>
+            {/if}
+            <div class="glm-member-list-active-info glma-small-12 glma-medium-8 glma-columns glma-small-right glma-medium-left ">
+
+                {apply_filters('glm-member-db-front-members-list-memberInfoTop', '', $member.member_pointer)}
+
+                <h4 class="glm-member-title">
+                    {if $showSettings.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}
+                    {/if}
+                </h4>
+                {if $showSettings.list_show_address}
+                    <div class="glm-member-list-address-wrapper">
+
+                        {apply_filters('glm-member-db-front-members-list-memberAddressTop', '', $member.member_pointer)}
+
+                        {if $showSettings.list_show_street}
+                            {if $member.addr1 && $showSettings.list_show_address}<div>{$member.addr1}</div>{/if}
+                            {if $member.addr2 && $showSettings.list_show_address}<div>{$member.addr2}</div>{/if}
+                        {/if}
+                        {if $settings.memb_info_location && $showSettings.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.country.name && $showSettings.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 && $showSettings.list_show_phone) || ($settings.memb_info_contact && $member.toll_free && $showSettings.list_show_tollfree)}
+                    <div>
+                        {if $member.phone && $showSettings.list_show_phone}<span class="glm-member-db-phone">Phone: {apply_filters('glm_associate_phone_filter', $member.phone)} </span>{/if}
+                        {if $member.toll_free && $showSettings.list_show_tollfree}<span class="glm-member-db-phone-tollfree">{apply_filters('glm_associate_phone_filter', $member.toll_free)}</span>{/if}
+                    </div>
+                {/if}
+                {if $settings.memb_info_location && $member.region && $showSettings.list_show_region}<div><b>Region:</b> {$member.region}</div>{/if}
+
+                <div class="glm-member-list-links">
+
+                    {apply_filters('glm-member-db-front-members-list-memberLinksTop', '', $member.member_pointer)}
+
+                    {if $member.url && $showSettings.list_show_url}<a class='glm-member-list-website-link' data-member-id="{$member.member_pointer}" data-member-slug="{$member.member_slug}" href="{$member.url}"{if $showSettings.list_show_url_newtarget} target="_blank"{/if} >Visit Website</a>{/if}
+                    {if $member.email && $showSettings.list_show_email}<a href="mailto:{$member.email}">Email</a>{/if}
+                    {if $member.reservation_url}<a target="_blank" href="{$member.reservation_url}">Reserve Now</a>{/if}
+                    {if $settings.list_show_live_cam}
+                        {if $member.live_cam_type.name == "Web Page" && $member.live_cam_url && $settings.list_show_live_cam}
+                            <a target="_blank" href="{$member.live_cam_url}">{$terms.term_webcam_cap}</a>
+                        {else if $member.live_cam_type.name == "Camera Image"}
+                            <a href="{$siteBaseUrl}{$settings.canonical_member_page}/{$member.member_slug}/{if $settings.enable_multiple_profiles}{$member.id}/{/if}?expanded=live-cam">{$terms.term_webcam_cap}</a>
+                        {/if}
+                    {/if}
+
+                    {apply_filters('glm-member-db-front-members-list-linksBottom', '', $member.member_pointer)}
+
+                </div>
+                <div class="glm-member-db-socials">
+
+                   {apply_filters('glm-member-db-front-members-social-list', '', $member.member_pointer)}
+
+                </div>
+
+                <div class="glm-member-list-description glma-small-12 glma-columns">
+                    <div>
+
+                    {apply_filters('glm-member-db-front-members-list-memberDescriptionTop', '', $member.member_pointer)}
+
+                    {if $member.short_descr && $showSettings.list_show_short_descr}
+                        {$member.short_descr|nl2br}
+                        {if $showSettings.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}">More</a>
+                        {/if}
+                    {/if}
+
+                    {apply_filters('glm-member-db-front-members-list-memberDescriptionBottom', '', $member.member_pointer)}
+
+                    </div>
+                    <div class="glm-member-list-items">
+                        {if $member.categories && $showSettings.list_show_categories}
+                            <b>{$terms.term_member_cap} Categories</b>
+                            <ul>
+                                {foreach $member.categories as $c}
+                                    <li>
+                                        {if $c.parent_name}{$c.parent_name}: {/if}{$c.name}
+                                    </li>
+                                {/foreach}
+                            </ul>
+                        {/if}
+                        {if $member.cc_type && $showSettings.list_show_creditcards}
+                            <b>Credit Cards Accepted:</b>
+                            <ul>
+                                {foreach $member.cc_type.names as $c}
+                                    <li>{$c}</li>
+                                {/foreach}
+                            </ul>
+                        {/if}
+                        {if $member.amenities && $showSettings.list_show_amenities}
+                            <b>{$terms.term_member_cap} Amenities</b>
+                            <ul>
+                                {foreach $member.amenities as $A}
+                                    <li>
+                                        {$A.name}
+                                    </li>
+                                {/foreach}
+                            </ul>
+                        {/if}
+                    </div>
+                </div>
+
+                {apply_filters('glm-member-db-front-members-list-memberDetailBottom', '', $member.member_pointer)}
+
+            </div>
+
+            {apply_filters('glm-member-db-front-members-list-memberDataBelow', '', $member.member_pointer)}
+
+        </div>
+
+        {apply_filters('glm-member-db-front-members-list-memberBelow', '', $member.member_pointer)}
+
+    </div>
+
+{/foreach} {* members *}
+
+{apply_filters('glm-member-db-front-members-list-memberBottom', '', $member.member_pointer)}